From cb529b713f4882ac65a074ae8d87faa41d19168e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 11 May 2018 23:40:58 +0200 Subject: checksrc: make sure sizeof() is used *with* parentheses ... and unify the source code to adhere. Closes #2563 --- tests/libtest/lib544.c | 2 +- tests/libtest/lib552.c | 4 ++-- tests/libtest/lib650.c | 4 ++-- tests/libtest/lib652.c | 4 ++-- tests/unit/unit1604.c | 4 ++-- tests/unit/unit1607.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index cb1aefc87..60de7fc67 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -61,7 +61,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_URL, URL); #ifdef LIB545 - test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) sizeof teststring); + test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) sizeof(teststring)); #endif test_setopt(curl, CURLOPT_COPYPOSTFIELDS, teststring); diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 83797f3c2..7a960417d 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -185,7 +185,7 @@ int test(char *URL) /* setup repeated data string */ for(i = 0; i < sizeof(databuf); ++i) - databuf[i] = fill[i % sizeof fill]; + databuf[i] = fill[i % sizeof(fill)]; /* Post */ test_setopt(curl, CURLOPT_POST, 1L); diff --git a/tests/libtest/lib650.c b/tests/libtest/lib650.c index da1fd5672..056270cfb 100644 --- a/tests/libtest/lib650.c +++ b/tests/libtest/lib650.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -153,7 +153,7 @@ int test(char *URL) curl_formget(formpost, (void *) &formlength, count_chars); /* Include length in data for external check. */ - curl_msnprintf(flbuf, sizeof flbuf, "%lu", (unsigned long) formlength); + curl_msnprintf(flbuf, sizeof(flbuf), "%lu", (unsigned long) formlength); formrc = curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "formlength", diff --git a/tests/libtest/lib652.c b/tests/libtest/lib652.c index d60390b2f..5c9cba5fb 100644 --- a/tests/libtest/lib652.c +++ b/tests/libtest/lib652.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -75,7 +75,7 @@ int test(char *URL) fprintf(stderr, "curl_mime_type() failed\n"); goto test_cleanup; } - res = curl_mime_data(part, buffer, sizeof buffer); + res = curl_mime_data(part, buffer, sizeof(buffer)); if(res) { fprintf(stderr, "curl_mime_data() failed\n"); goto test_cleanup; diff --git a/tests/unit/unit1604.c b/tests/unit/unit1604.c index b414e03e5..fbfd2c423 100644 --- a/tests/unit/unit1604.c +++ b/tests/unit/unit1604.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -295,7 +295,7 @@ UNITTEST_START size_t i; - for(i = 0; i < sizeof data / sizeof data[0]; ++i) { + for(i = 0; i < sizeof(data) / sizeof(data[0]); ++i) { char *output = NULL; char *flagstr = NULL; char *received_ccstr = NULL; diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c index 71c59939b..697b8b5c4 100644 --- a/tests/unit/unit1607.c +++ b/tests/unit/unit1607.c @@ -120,7 +120,7 @@ UNITTEST_START for(i = 0; i < testnum; ++i, curl_easy_reset(easy)) { int j; - int addressnum = sizeof tests[i].address / sizeof *tests[i].address; + int addressnum = sizeof(tests[i].address) / sizeof(*tests[i].address); struct Curl_addrinfo *addr; struct Curl_dns_entry *dns; struct curl_slist *list; -- cgit v1.2.3