From 7dd89c1cdcda16945610c4cdef89b5cdb2c183a8 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Mon, 1 May 2017 12:55:09 +0200 Subject: [PATCH] tests: declare TU-local variables static This fixes missing-variable-declarations warnings when building with clang. --- tests/libtest/lib1509.c | 2 +- tests/libtest/lib1531.c | 4 ++-- tests/libtest/lib1900.c | 16 ++++++++-------- tests/libtest/lib509.c | 10 +++++----- tests/libtest/lib540.c | 2 +- tests/unit/unit1396.c | 2 +- tests/unit/unit1600.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/libtest/lib1509.c b/tests/libtest/lib1509.c index df428a0d0..ccb668304 100644 --- a/tests/libtest/lib1509.c +++ b/tests/libtest/lib1509.c @@ -28,7 +28,7 @@ size_t WriteOutput(void *ptr, size_t size, size_t nmemb, void *stream); size_t WriteHeader(void *ptr, size_t size, size_t nmemb, void *stream); -unsigned long realHeaderSize = 0; +static unsigned long realHeaderSize = 0; int test(char *URL) { diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c index b21d06733..e6386b264 100644 --- a/tests/libtest/lib1531.c +++ b/tests/libtest/lib1531.c @@ -27,8 +27,8 @@ #define TEST_HANG_TIMEOUT 60 * 1000 -char const testData[] = ".abc\0xyz"; -off_t const testDataSize = sizeof(testData) - 1; +static char const testData[] = ".abc\0xyz"; +static off_t const testDataSize = sizeof(testData) - 1; int test(char *URL) { diff --git a/tests/libtest/lib1900.c b/tests/libtest/lib1900.c index 4502fc0d6..d72e3e6a2 100644 --- a/tests/libtest/lib1900.c +++ b/tests/libtest/lib1900.c @@ -29,14 +29,14 @@ #define MAX_URLS 200 #define MAX_BLACKLIST 20 -int urltime[MAX_URLS]; -char *urlstring[MAX_URLS]; -CURL *handles[MAX_URLS]; -char *site_blacklist[MAX_BLACKLIST]; -char *server_blacklist[MAX_BLACKLIST]; -int num_handles; -int blacklist_num_servers; -int blacklist_num_sites; +static int urltime[MAX_URLS]; +static char *urlstring[MAX_URLS]; +static CURL *handles[MAX_URLS]; +static char *site_blacklist[MAX_BLACKLIST]; +static char *server_blacklist[MAX_BLACKLIST]; +static int num_handles; +static int blacklist_num_servers; +static int blacklist_num_sites; static size_t write_callback(void *contents, size_t size, size_t nmemb, void *userp) diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index 941ef7206..4f3e072ae 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -36,11 +36,11 @@ #include "memdebug.h" */ -int seen_malloc = 0; -int seen_free = 0; -int seen_realloc = 0; -int seen_strdup = 0; -int seen_calloc = 0; +static int seen_malloc = 0; +static int seen_free = 0; +static int seen_realloc = 0; +static int seen_strdup = 0; +static int seen_calloc = 0; void *custom_malloc(size_t size); void custom_free(void *ptr); diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index f5d89c41d..ac862092f 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -46,7 +46,7 @@ #define NUM_HANDLES 2 -CURL *eh[NUM_HANDLES]; +static CURL *eh[NUM_HANDLES]; static int init(int num, CURLM *cm, const char *url, const char *userpwd, struct curl_slist *headers) diff --git a/tests/unit/unit1396.c b/tests/unit/unit1396.c index 84a5162dd..f3275fdb6 100644 --- a/tests/unit/unit1396.c +++ b/tests/unit/unit1396.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -CURL *hnd; +static CURL *hnd; static CURLcode unit_setup(void) { diff --git a/tests/unit/unit1600.c b/tests/unit/unit1600.c index af0ad8435..11d718d35 100644 --- a/tests/unit/unit1600.c +++ b/tests/unit/unit1600.c @@ -24,7 +24,7 @@ #include "urldata.h" #include "curl_ntlm_core.h" -CURL *easy; +static CURL *easy; static CURLcode unit_setup(void) {