* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
int counter;
};
-int lock[3];
+static int locks[3];
/* lock callback */
static void my_lock(CURL *handle, curl_lock_data data,
(void)handle;
(void)laccess;
- switch (data) {
+ switch(data) {
case CURL_LOCK_DATA_SHARE:
what = "share";
locknum = 0;
}
/* detect locking of locked locks */
- if(lock[locknum]) {
+ if(locks[locknum]) {
printf("lock: double locked %s\n", what);
return;
}
- lock[locknum]++;
+ locks[locknum]++;
printf("lock: %-6s [%s]: %d\n", what, user->text, user->counter);
user->counter++;
struct userdata *user = (struct userdata *)useptr;
int locknum;
(void)handle;
- switch (data) {
+ switch(data) {
case CURL_LOCK_DATA_SHARE:
what = "share";
locknum = 0;
}
/* detect unlocking of unlocked locks */
- if(!lock[locknum]) {
+ if(!locks[locknum]) {
printf("unlock: double unlocked %s\n", what);
return;
}
- lock[locknum]--;
+ locks[locknum]--;
printf("unlock: %-6s [%s]: %d\n", what, user->text, user->counter);
user->counter++;
/* prepare share */
printf("SHARE_INIT\n");
- if((share = curl_share_init()) == NULL) {
+ share = curl_share_init();
+ if(!share) {
fprintf(stderr, "curl_share_init() failed\n");
curl_global_cleanup();
return TEST_ERR_MAJOR_BAD;
}
/* initial cookie manipulation */
- if((curl = curl_easy_init()) == NULL) {
+ curl = curl_easy_init();
+ if(!curl) {
fprintf(stderr, "curl_easy_init() failed\n");
curl_share_cleanup(share);
curl_global_cleanup();
/* fetch a another one and save cookies */
printf("*** run %d\n", i);
- if((curl = curl_easy_init()) == NULL) {
+ curl = curl_easy_init();
+ if(!curl) {
fprintf(stderr, "curl_easy_init() failed\n");
curl_share_cleanup(share);
curl_global_cleanup();
curl_slist_free_all(headers);
/* load cookies */
- if((curl = curl_easy_init()) == NULL) {
+ curl = curl_easy_init();
+ if(!curl) {
fprintf(stderr, "curl_easy_init() failed\n");
curl_share_cleanup(share);
curl_global_cleanup();