From a71012c03ef6a7cbfba69bcafb559fa417c49af0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 3 Apr 2016 20:28:34 +0200 Subject: code: style updates --- tests/libtest/Makefile.am | 2 +- tests/libtest/first.c | 6 ++-- tests/libtest/lib506.c | 6 ++-- tests/libtest/lib513.c | 2 +- tests/libtest/lib514.c | 2 +- tests/libtest/lib515.c | 2 +- tests/libtest/lib516.c | 2 +- tests/libtest/lib519.c | 2 +- tests/libtest/lib520.c | 2 +- tests/libtest/lib521.c | 2 +- tests/libtest/lib523.c | 2 +- tests/libtest/lib524.c | 2 +- tests/libtest/lib525.c | 2 +- tests/libtest/lib537.c | 2 +- tests/libtest/lib539.c | 2 +- tests/libtest/lib541.c | 2 +- tests/libtest/lib542.c | 2 +- tests/libtest/lib543.c | 2 +- tests/libtest/lib544.c | 2 +- tests/libtest/lib549.c | 2 +- tests/libtest/lib552.c | 2 +- tests/libtest/lib555.c | 2 +- tests/libtest/lib556.c | 2 +- tests/libtest/lib558.c | 2 +- tests/libtest/lib566.c | 2 +- tests/libtest/lib567.c | 2 +- tests/libtest/lib569.c | 2 +- tests/libtest/lib570.c | 2 +- tests/libtest/lib571.c | 2 +- tests/libtest/lib572.c | 2 +- tests/libtest/lib573.c | 2 +- tests/libtest/lib574.c | 2 +- tests/libtest/lib576.c | 2 +- tests/libtest/lib578.c | 2 +- tests/libtest/lib579.c | 2 +- tests/libtest/lib586.c | 82 +++++++++++++++++++++++------------------------ tests/libtest/lib590.c | 6 ++-- tests/libtest/lib598.c | 2 +- tests/libtest/lib599.c | 2 +- tests/unit/unit1301.c | 20 ++++++------ tests/unit/unit1302.c | 20 ++++++------ tests/unit/unit1303.c | 4 +-- tests/unit/unit1305.c | 4 +-- tests/unit/unit1307.c | 8 ++--- tests/unit/unit1397.c | 18 +++++------ tests/unit/unit1398.c | 26 +++++++-------- tests/unit/unit1602.c | 4 +-- tests/unit/unit1603.c | 6 ++-- 48 files changed, 140 insertions(+), 140 deletions(-) (limited to 'tests') diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index e396af4da..de83fcd23 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2013, 2016, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/first.c b/tests/libtest/first.c index 4714395ea..231ae368c 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 @@ -69,7 +69,7 @@ void wait_ms(int ms) t.tv_sec = ms/1000; ms -= (int)t.tv_sec * 1000; t.tv_usec = ms * 1000; - select_wrapper(0, NULL, NULL , NULL, &t); + select_wrapper(0, NULL, NULL, NULL, &t); } char *libtest_arg2=NULL; @@ -153,7 +153,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); #endif - if(argc< 2 ) { + if(argc< 2) { fprintf(stderr, "Pass URL as argument please\n"); return 1; } diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 265b1ed5c..8de30c20b 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -80,7 +80,7 @@ static void my_lock(CURL *handle, curl_lock_data data, } /* unlock callback */ -static void my_unlock(CURL *handle, curl_lock_data data, void *useptr ) +static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) { const char *what; struct userdata *user = (struct userdata *)useptr; @@ -345,7 +345,7 @@ int test(char *URL) /* try to free share, expect to fail because share is in use*/ printf("try SHARE_CLEANUP...\n"); scode = curl_share_cleanup(share); - if(scode==CURLSHE_OK ) { + if(scode==CURLSHE_OK) { fprintf(stderr, "curl_share_cleanup succeed but error expected\n"); share = NULL; } @@ -364,7 +364,7 @@ test_cleanup: /* free share */ printf("SHARE_CLEANUP\n"); scode = curl_share_cleanup(share); - if(scode!=CURLSHE_OK ) + if(scode!=CURLSHE_OK) fprintf(stderr, "curl_share_cleanup failed, code errno %d\n", (int)scode); diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index b2f1d7788..58091ef6a 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index 75c5acc4a..f516d0942 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index f9ace04ee..d3e6e446a 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index 13b3b3d17..9faf262c6 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index 730d42a3c..6e3059892 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index 7e54cd180..b5a71da27 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index e6d6b2387..40f4def4f 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index f94738205..f3264690d 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index 77d486b00..3440562b2 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index 2daa1ef31..4bf259d21 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 4efb5387c..c1561419a 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index 34dee9245..9f0f8fabf 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 9992da7f5..604446a2e 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index 2ce67b944..c82ccd5b7 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index 6001e8f1c..8fec052d2 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index 736744425..4b08a0a76 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index 4b35c26ca..137029548 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index e63cebc49..9fe4a7168 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -150,7 +150,7 @@ static size_t write_callback(void *ptr, size_t size, size_t nmemb, static curlioerr ioctl_callback(CURL * handle, int cmd, void *clientp) { (void)clientp; - if(cmd == CURLIOCMD_RESTARTREAD ) { + if(cmd == CURLIOCMD_RESTARTREAD) { printf("APPLICATION: recieved a CURLIOCMD_RESTARTREAD request\n"); printf("APPLICATION: ** REWINDING! **\n"); current_offset = 0; diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 6083c0237..e84af87e5 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index a0b360b33..527935396 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index 05353aa97..09a50d6b6 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c index 59edb54f4..94a91d5dd 100644 --- a/tests/libtest/lib566.c +++ b/tests/libtest/lib566.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c index b71778d7c..38e0c0b78 100644 --- a/tests/libtest/lib567.c +++ b/tests/libtest/lib567.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c index e8578fd3f..55282b69b 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c index 511a0a99f..2dc57b761 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index 1a4b9d75e..ad6c366b4 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c index bab9bae1a..3475e8060 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c index 78840b745..dce198b50 100644 --- a/tests/libtest/lib573.c +++ b/tests/libtest/lib573.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c index b29bd2ad5..9f9222b39 100644 --- a/tests/libtest/lib574.c +++ b/tests/libtest/lib574.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index 7bf5ab029..3b9a9001d 100644 --- a/tests/libtest/lib576.c +++ b/tests/libtest/lib576.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index 8d79dc0cc..5e01d36e0 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index 63f3f0521..aae299ccc 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 55ab6b655..eb7cfa0a9 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -45,7 +45,7 @@ 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"; break; @@ -67,12 +67,12 @@ static void my_lock(CURL *handle, curl_lock_data data, } /* unlock callback */ -static void my_unlock(CURL *handle, curl_lock_data data, void *useptr ) +static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) { const char *what; struct userdata *user = (struct userdata *)useptr; (void)handle; - switch ( data ) { + switch ( data) { case CURL_LOCK_DATA_SHARE: what = "share"; break; @@ -109,17 +109,17 @@ static void *fire(void *ptr) curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); curl_easy_setopt(curl, CURLOPT_URL, tdata->url); - printf( "CURLOPT_SHARE\n" ); + printf("CURLOPT_SHARE\n"); curl_easy_setopt(curl, CURLOPT_SHARE, tdata->share); - printf( "PERFORM\n" ); + printf("PERFORM\n"); code = curl_easy_perform(curl); - if(code != CURLE_OK ) { + if(code != CURLE_OK) { fprintf(stderr, "perform url '%s' repeat %d failed, curlcode %d\n", tdata->url, i, (int)code); } - printf( "CLEANUP\n" ); + printf("CLEANUP\n"); curl_easy_cleanup(curl); return NULL; @@ -140,39 +140,39 @@ int test(char *URL) user.text = (char *)"Pigs in space"; user.counter = 0; - printf( "GLOBAL_INIT\n" ); + printf("GLOBAL_INIT\n"); if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { fprintf(stderr, "curl_global_init() failed\n"); return TEST_ERR_MAJOR_BAD; } /* prepare share */ - printf( "SHARE_INIT\n" ); + printf("SHARE_INIT\n"); if((share = curl_share_init()) == NULL) { fprintf(stderr, "curl_share_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; } - if(CURLSHE_OK == scode ) { - printf( "CURLSHOPT_LOCKFUNC\n" ); - scode = curl_share_setopt( share, CURLSHOPT_LOCKFUNC, my_lock); + if(CURLSHE_OK == scode) { + printf("CURLSHOPT_LOCKFUNC\n"); + scode = curl_share_setopt(share, CURLSHOPT_LOCKFUNC, my_lock); } - if(CURLSHE_OK == scode ) { - printf( "CURLSHOPT_UNLOCKFUNC\n" ); - scode = curl_share_setopt( share, CURLSHOPT_UNLOCKFUNC, my_unlock); + if(CURLSHE_OK == scode) { + printf("CURLSHOPT_UNLOCKFUNC\n"); + scode = curl_share_setopt(share, CURLSHOPT_UNLOCKFUNC, my_unlock); } - if(CURLSHE_OK == scode ) { - printf( "CURLSHOPT_USERDATA\n" ); - scode = curl_share_setopt( share, CURLSHOPT_USERDATA, &user); + if(CURLSHE_OK == scode) { + printf("CURLSHOPT_USERDATA\n"); + scode = curl_share_setopt(share, CURLSHOPT_USERDATA, &user); } - if(CURLSHE_OK == scode ) { - printf( "CURL_LOCK_DATA_SSL_SESSION\n" ); - scode = curl_share_setopt( share, CURLSHOPT_SHARE, - CURL_LOCK_DATA_SSL_SESSION); + if(CURLSHE_OK == scode) { + printf("CURL_LOCK_DATA_SSL_SESSION\n"); + scode = curl_share_setopt(share, CURLSHOPT_SHARE, + CURL_LOCK_DATA_SSL_SESSION); } - if(CURLSHE_OK != scode ) { + if(CURLSHE_OK != scode) { fprintf(stderr, "curl_share_setopt() failed\n"); curl_share_cleanup(share); curl_global_cleanup(); @@ -183,20 +183,20 @@ int test(char *URL) res = 0; /* start treads */ - for(i=1; i<=THREADS; i++ ) { + for(i=1; i<=THREADS; i++) { /* set thread data */ tdata.url = URL; tdata.share = share; /* simulate thread, direct call of "thread" function */ - printf( "*** run %d\n",i ); - fire( &tdata ); + printf("*** run %d\n",i); + fire(&tdata); } /* fetch a another one */ - printf( "*** run %d\n", i ); + printf("*** run %d\n", i); if((curl = curl_easy_init()) == NULL) { fprintf(stderr, "curl_easy_init() failed\n"); curl_share_cleanup(share); @@ -205,38 +205,38 @@ int test(char *URL) } url = URL; - test_setopt( curl, CURLOPT_URL, url ); - printf( "CURLOPT_SHARE\n" ); - test_setopt( curl, CURLOPT_SHARE, share ); + test_setopt(curl, CURLOPT_URL, url); + printf("CURLOPT_SHARE\n"); + test_setopt(curl, CURLOPT_SHARE, share); - printf( "PERFORM\n" ); - curl_easy_perform( curl ); + printf("PERFORM\n"); + curl_easy_perform(curl); /* try to free share, expect to fail because share is in use*/ - printf( "try SHARE_CLEANUP...\n" ); - scode = curl_share_cleanup( share ); + printf("try SHARE_CLEANUP...\n"); + scode = curl_share_cleanup(share); if(scode==CURLSHE_OK) { fprintf(stderr, "curl_share_cleanup succeed but error expected\n"); share = NULL; } else { - printf( "SHARE_CLEANUP failed, correct\n" ); + printf("SHARE_CLEANUP failed, correct\n"); } test_cleanup: /* clean up last handle */ - printf( "CLEANUP\n" ); - curl_easy_cleanup( curl ); + printf("CLEANUP\n"); + curl_easy_cleanup(curl); /* free share */ - printf( "SHARE_CLEANUP\n" ); - scode = curl_share_cleanup( share ); - if(scode!=CURLSHE_OK ) + printf("SHARE_CLEANUP\n"); + scode = curl_share_cleanup(share); + if(scode!=CURLSHE_OK) fprintf(stderr, "curl_share_cleanup failed, code errno %d\n", (int)scode); - printf( "GLOBAL_CLEANUP\n" ); + printf("GLOBAL_CLEANUP\n"); curl_global_cleanup(); return res; diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 3d4d0bddf..7b863cc3f 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 @@ -28,9 +28,9 @@ It is reproducible by the following steps: - Use a proxy that offers NTLM and Negotiate ( CURLOPT_PROXY and - CURLOPT_PROXYPORT ) + CURLOPT_PROXYPORT) - Tell libcurl NOT to use Negotiate CURL_EASY_SETOPT(CURLOPT_PROXYAUTH, - CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM ) + CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM) - Start the request */ diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c index 12d4decb8..b107f29d4 100644 --- a/tests/libtest/lib598.c +++ b/tests/libtest/lib598.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c index f917f51a3..1dee0b978 100644 --- a/tests/libtest/lib599.c +++ b/tests/libtest/lib599.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, 2016, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c index a50fc67d6..928076e29 100644 --- a/tests/unit/unit1301.c +++ b/tests/unit/unit1301.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 @@ -23,32 +23,32 @@ #include "strequal.h" -static CURLcode unit_setup( void ) {return CURLE_OK;} -static void unit_stop( void ) {} +static CURLcode unit_setup(void) {return CURLE_OK;} +static void unit_stop(void) {} UNITTEST_START int rc; rc = curl_strequal("iii", "III"); -fail_unless( rc != 0 , "return code should be zero" ); +fail_unless(rc != 0, "return code should be zero"); rc = curl_strequal("iiia", "III"); -fail_unless( rc == 0 , "return code should be zero" ); +fail_unless(rc == 0, "return code should be zero"); rc = curl_strequal("iii", "IIIa"); -fail_unless( rc == 0 , "return code should be zero" ); +fail_unless(rc == 0, "return code should be zero"); rc = curl_strequal("iiiA", "IIIa"); -fail_unless( rc != 0 , "return code should be non-zero" ); +fail_unless(rc != 0, "return code should be non-zero"); rc = curl_strnequal("iii", "III", 3); -fail_unless( rc != 0 , "return code should be non-zero" ); +fail_unless(rc != 0, "return code should be non-zero"); rc = curl_strnequal("iiiABC", "IIIcba", 3); -fail_unless( rc != 0 , "return code should be non-zero" ); +fail_unless(rc != 0, "return code should be non-zero"); rc = curl_strnequal("ii", "II", 3); -fail_unless( rc != 0 , "return code should be non-zero" ); +fail_unless(rc != 0, "return code should be non-zero"); UNITTEST_STOP diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c index bc180f77d..66054da57 100644 --- a/tests/unit/unit1302.c +++ b/tests/unit/unit1302.c @@ -28,7 +28,7 @@ static struct SessionHandle *data; -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { data = curl_easy_init(); if(!data) @@ -36,7 +36,7 @@ static CURLcode unit_setup( void ) return CURLE_OK; } -static void unit_stop( void ) +static void unit_stop(void) { curl_easy_cleanup(data); } @@ -52,50 +52,50 @@ CURLcode rc; rc = Curl_base64_encode(data, "i", 1, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 4, "size should be 4"); -verify_memory( output, "aQ==", 4); +verify_memory(output, "aQ==", 4); Curl_safefree(output); rc = Curl_base64_encode(data, "ii", 2, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 4, "size should be 4"); -verify_memory( output, "aWk=", 4); +verify_memory(output, "aWk=", 4); Curl_safefree(output); rc = Curl_base64_encode(data, "iii", 3, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 4, "size should be 4"); -verify_memory( output, "aWlp", 4); +verify_memory(output, "aWlp", 4); Curl_safefree(output); rc = Curl_base64_encode(data, "iiii", 4, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 8, "size should be 8"); -verify_memory( output, "aWlpaQ==", 8); +verify_memory(output, "aWlpaQ==", 8); Curl_safefree(output); rc = Curl_base64_encode(data, "\xff\x01\xfe\x02", 4, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 8, "size should be 8"); -verify_memory( output, "/wH+Ag==", 8); +verify_memory(output, "/wH+Ag==", 8); Curl_safefree(output); rc = Curl_base64url_encode(data, "\xff\x01\xfe\x02", 4, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 8, "size should be 8"); -verify_memory( output, "_wH-Ag==", 8); +verify_memory(output, "_wH-Ag==", 8); Curl_safefree(output); rc = Curl_base64url_encode(data, "iiii", 4, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 8, "size should be 8"); -verify_memory( output, "aWlpaQ==", 8); +verify_memory(output, "aWlpaQ==", 8); Curl_safefree(output); /* 0 length makes it do strlen() */ rc = Curl_base64_encode(data, "iiii", 0, &output, &size); fail_unless(rc == CURLE_OK, "return code should be CURLE_OK"); fail_unless(size == 8, "size should be 8"); -verify_memory( output, "aWlpaQ==", 8); +verify_memory(output, "aWlpaQ==", 8); Curl_safefree(output); rc = Curl_base64_decode("aWlpaQ==", &decoded, &size); diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 0d655b7bf..7c0731a47 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -27,7 +27,7 @@ static struct SessionHandle *data; -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { data = curl_easy_init(); if(!data) @@ -35,7 +35,7 @@ static CURLcode unit_setup( void ) return CURLE_OK; } -static void unit_stop( void ) +static void unit_stop(void) { curl_easy_cleanup(data); } diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c index 093333a79..95cfe2b5d 100644 --- a/tests/unit/unit1305.c +++ b/tests/unit/unit1305.c @@ -44,7 +44,7 @@ static struct curl_hash hp; static char *data_key; static struct Curl_dns_entry *data_node; -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { int rc; data = curl_easy_init(); @@ -60,7 +60,7 @@ static CURLcode unit_setup( void ) return CURLE_OK; } -static void unit_stop( void ) +static void unit_stop(void) { if(data_node) { Curl_freeaddrinfo(data_node->addr); diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c index 89f49832f..576462274 100644 --- a/tests/unit/unit1307.c +++ b/tests/unit/unit1307.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 @@ -160,7 +160,7 @@ static const struct testcase tests[] = { { "****.txt", ".txt", MATCH }, /* empty string or pattern */ - { "", "", MATCH } , + { "", "", MATCH }, { "", "hello", NOMATCH }, { "file", "", NOMATCH }, { "?", "", NOMATCH }, @@ -208,12 +208,12 @@ static const struct testcase tests[] = { { "", "", MATCH } }; -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { return CURLE_OK; } -static void unit_stop( void ) +static void unit_stop(void) { } diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c index 37e8e49de..539433ca0 100644 --- a/tests/unit/unit1397.c +++ b/tests/unit/unit1397.c @@ -28,7 +28,7 @@ static CURLcode unit_setup(void) return CURLE_OK; } -static void unit_stop( void ) +static void unit_stop(void) { /* done before shutting down and exiting */ } @@ -51,14 +51,14 @@ fail_unless(Curl_cert_hostcheck("f*.example.com", "foo.example.com"), fail_unless(Curl_cert_hostcheck("192.168.0.0", "192.168.0.0"), "good 5"); -fail_if(Curl_cert_hostcheck("xxx.example.com", "www.example.com"), "bad 1" ); -fail_if(Curl_cert_hostcheck("*", "www.example.com"), "bad 2" ); -fail_if(Curl_cert_hostcheck("*.*.com", "www.example.com"), "bad 3" ); -fail_if(Curl_cert_hostcheck("*.example.com", "baa.foo.example.com"), "bad 4" ); -fail_if(Curl_cert_hostcheck("f*.example.com", "baa.example.com"), "bad 5" ); -fail_if(Curl_cert_hostcheck("*.com", "example.com"), "bad 6" ); -fail_if(Curl_cert_hostcheck("*fail.com", "example.com"), "bad 7" ); -fail_if(Curl_cert_hostcheck("*.example.", "www.example."), "bad 8" ); +fail_if(Curl_cert_hostcheck("xxx.example.com", "www.example.com"), "bad 1"); +fail_if(Curl_cert_hostcheck("*", "www.example.com"), "bad 2"); +fail_if(Curl_cert_hostcheck("*.*.com", "www.example.com"), "bad 3"); +fail_if(Curl_cert_hostcheck("*.example.com", "baa.foo.example.com"), "bad 4"); +fail_if(Curl_cert_hostcheck("f*.example.com", "baa.example.com"), "bad 5"); +fail_if(Curl_cert_hostcheck("*.com", "example.com"), "bad 6"); +fail_if(Curl_cert_hostcheck("*fail.com", "example.com"), "bad 7"); +fail_if(Curl_cert_hostcheck("*.example.", "www.example."), "bad 8"); fail_if(Curl_cert_hostcheck("*.example.", "www.example"), "bad 9"); fail_if(Curl_cert_hostcheck("", "www"), "bad 10"); fail_if(Curl_cert_hostcheck("*", "www"), "bad 11"); diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c index e9cc6753c..9491c46c5 100644 --- a/tests/unit/unit1398.c +++ b/tests/unit/unit1398.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, 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 @@ -23,8 +23,8 @@ #include "curl/mprintf.h" -static CURLcode unit_setup( void ) {return CURLE_OK;} -static void unit_stop( void ) {} +static CURLcode unit_setup(void) {return CURLE_OK;} +static void unit_stop(void) {} UNITTEST_START @@ -38,54 +38,54 @@ char output[24]; /* without a trailing zero */ rc = curl_msnprintf(output, 4, "%.*s", width, buf); -fail_unless( rc == 3 , "return code should be 3" ); +fail_unless(rc == 3, "return code should be 3"); fail_unless(!strcmp(output, "bug"), "wrong output"); /* with a trailing zero */ rc = curl_msnprintf(output, 4, "%.*s", width, str); -fail_unless( rc == 3 , "return code should be 3" ); +fail_unless(rc == 3, "return code should be 3"); fail_unless(!strcmp(output, "bug"), "wrong output"); width = 2; /* one byte less */ rc = curl_msnprintf(output, 4, "%.*s", width, buf); -fail_unless( rc == 2 , "return code should be 2" ); +fail_unless(rc == 2, "return code should be 2"); fail_unless(!strcmp(output, "bu"), "wrong output"); /* string with larger precision */ rc = curl_msnprintf(output, 8, "%.8s", str); -fail_unless( rc == 3 , "return code should be 3" ); +fail_unless(rc == 3, "return code should be 3"); fail_unless(!strcmp(output, "bug"), "wrong output"); /* longer string with precision */ rc = curl_msnprintf(output, 8, "%.3s", "0123456789"); -fail_unless( rc == 3 , "return code should be 3" ); +fail_unless(rc == 3, "return code should be 3"); fail_unless(!strcmp(output, "012"), "wrong output"); /* negative width */ rc = curl_msnprintf(output, 8, "%-8s", str); -fail_unless( rc == 8 , "return code should be 8" ); +fail_unless(rc == 8, "return code should be 8"); fail_unless(!strcmp(output, "bug "), "wrong output"); /* larger width that string length */ rc = curl_msnprintf(output, 8, "%8s", str); -fail_unless( rc == 8 , "return code should be 8" ); +fail_unless(rc == 8, "return code should be 8"); fail_unless(!strcmp(output, " bu"), "wrong output"); /* output a number in a limited output */ rc = curl_msnprintf(output, 4, "%d", 10240); /* TODO: this should return 5 to be POSIX/snprintf compliant! */ -fail_unless( rc == 4 , "return code should be 4" ); +fail_unless(rc == 4, "return code should be 4"); fail_unless(!strcmp(output, "102"), "wrong output"); /* padded strings */ rc = curl_msnprintf(output, 16, "%8s%8s", str, str); -fail_unless( rc == 16 , "return code should be 16" ); +fail_unless(rc == 16, "return code should be 16"); fail_unless(!strcmp(output, " bug bu"), "wrong output"); /* padded numbers */ rc = curl_msnprintf(output, 16, "%8d%8d", 1234, 5678); -fail_unless( rc == 16 , "return code should be 16" ); +fail_unless(rc == 16, "return code should be 16"); fail_unless(!strcmp(output, " 1234 567"), "wrong output"); UNITTEST_STOP diff --git a/tests/unit/unit1602.c b/tests/unit/unit1602.c index 0d56f9cd9..c67c0a555 100644 --- a/tests/unit/unit1602.c +++ b/tests/unit/unit1602.c @@ -36,13 +36,13 @@ static void mydtor(void *p) free(ptr); } -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { return Curl_hash_init(&hash_static, 7, Curl_hash_str, Curl_str_key_compare, mydtor); } -static void unit_stop( void ) +static void unit_stop(void) { Curl_hash_destroy(&hash_static); } diff --git a/tests/unit/unit1603.c b/tests/unit/unit1603.c index ffcd756e2..c20b20b0e 100644 --- a/tests/unit/unit1603.c +++ b/tests/unit/unit1603.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2015, Daniel Stenberg, , et al. + * Copyright (C) 2015 - 2016, 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 @@ -37,13 +37,13 @@ static void mydtor(void *p) (void)p; /* unused */ } -static CURLcode unit_setup( void ) +static CURLcode unit_setup(void) { return Curl_hash_init(&hash_static, slots, Curl_hash_str, Curl_str_key_compare, mydtor); } -static void unit_stop( void ) +static void unit_stop(void) { Curl_hash_destroy(&hash_static); } -- cgit v1.2.3