From: Viktor Szakats Date: Sat, 29 Nov 2025 22:11:52 +0000 (+0100) Subject: tidy-up: one more round of formatting nits X-Git-Tag: rc-8_18_0-1~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0476e4fc65a67c5d7e6d0229c4073ce2b8fd9325;p=thirdparty%2Fcurl.git tidy-up: one more round of formatting nits Closes #19835 --- diff --git a/.github/scripts/typos.toml b/.github/scripts/typos.toml index 3495823c1b..ec6b9bb050 100644 --- a/.github/scripts/typos.toml +++ b/.github/scripts/typos.toml @@ -9,7 +9,7 @@ extend-ignore-identifiers-re = [ "^(ECT0|ECT1|HELO|htpt|PASE)$", "^[A-Za-z0-9_-]*(EDE|GOST)[A-Z0-9_-]*$", # ciphers "^0x[0-9a-fA-F]+FUL$", # unsigned long hex literals ending with 'F' - "^(eyeballers|HELO_smtp|optin|passin|perfec|SMTP_HELO)$", + "^(eyeballers|HELO_smtp|Januar|optin|passin|perfec|SMTP_HELO)$", "^(clen|req_clen|smtp_perform_helo|smtp_state_helo_resp|Tru64|_stati64)$", "secur32", "proxys", # this should be limited to tests/http/*. Short for secure proxy. diff --git a/docs/examples/10-at-a-time.c b/docs/examples/10-at-a-time.c index 22db7c5fc4..08f1f25f7f 100644 --- a/docs/examples/10-at-a-time.c +++ b/docs/examples/10-at-a-time.c @@ -81,7 +81,7 @@ static const char *urls[] = { }; #define MAX_PARALLEL 10 /* number of simultaneous transfers */ -#define NUM_URLS (sizeof(urls) / sizeof(char *)) +#define NUM_URLS (sizeof(urls) / sizeof(char *)) static size_t write_cb(char *data, size_t n, size_t l, void *userp) { diff --git a/docs/examples/block_ip.c b/docs/examples/block_ip.c index 5cd77cad0e..04223ddd03 100644 --- a/docs/examples/block_ip.c +++ b/docs/examples/block_ip.c @@ -268,7 +268,7 @@ static curl_socket_t opensocket(void *clientp, if(ip && filter->type == CONNECTION_FILTER_BLACKLIST) { if(filter->verbose) { - char buf[128] = {0}; + char buf[128] = { 0 }; inet_ntop(address->family, cinaddr, buf, sizeof(buf)); fprintf(stderr, "* Rejecting IP %s due to blacklist entry %s.\n", buf, ip->str); @@ -277,7 +277,7 @@ static curl_socket_t opensocket(void *clientp, } else if(!ip && filter->type == CONNECTION_FILTER_WHITELIST) { if(filter->verbose) { - char buf[128] = {0}; + char buf[128] = { 0 }; inet_ntop(address->family, cinaddr, buf, sizeof(buf)); fprintf(stderr, "* Rejecting IP %s due to missing whitelist entry.\n", buf); diff --git a/docs/examples/cacertinmem.c b/docs/examples/cacertinmem.c index ed8f40aef4..b37cd6f414 100644 --- a/docs/examples/cacertinmem.c +++ b/docs/examples/cacertinmem.c @@ -83,7 +83,7 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *pointer) BIO *cbio = BIO_new_mem_buf(mypem, sizeof(mypem)); X509_STORE *cts = SSL_CTX_get_cert_store((SSL_CTX *)sslctx); ossl_valsize_t i; - STACK_OF(X509_INFO) *inf; + STACK_OF(X509_INFO) * inf; (void)curl; (void)pointer; diff --git a/docs/examples/crawler.c b/docs/examples/crawler.c index 9207199cdf..09c0c7d692 100644 --- a/docs/examples/crawler.c +++ b/docs/examples/crawler.c @@ -123,8 +123,8 @@ static CURL *make_handle(const char *url) /* HREF finder implemented in libxml2 but could be any HTML parser */ static size_t follow_links(CURLM *multi, struct memory *mem, const char *url) { - int opts = HTML_PARSE_NOBLANKS | HTML_PARSE_NOERROR | \ - HTML_PARSE_NOWARNING | HTML_PARSE_NONET; + int opts = HTML_PARSE_NOBLANKS | HTML_PARSE_NOERROR | HTML_PARSE_NOWARNING | + HTML_PARSE_NONET; htmlDocPtr doc = htmlReadMemory(mem->buf, (int)mem->size, url, NULL, opts); size_t count; int i; diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index e572fffad8..cafea9693f 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -244,7 +244,7 @@ static void timer_cb(struct GlobalInfo *g, int revents) } rc = curl_multi_socket_action(g->multi, - CURL_SOCKET_TIMEOUT, 0, &g->still_running); + CURL_SOCKET_TIMEOUT, 0, &g->still_running); mcode_or_die("timer_cb: curl_multi_socket_action", rc); check_multi_info(g); } @@ -303,7 +303,7 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { struct GlobalInfo *g = (struct GlobalInfo *)cbp; struct SockInfo *fdp = (struct SockInfo *)sockp; - const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + const char *whatstr[] = { "none", "IN", "OUT", "INOUT", "REMOVE" }; fprintf(MSG_OUT, "socket callback: s=%d e=%p what=%s ", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c index 178be018a3..922197c3cb 100644 --- a/docs/examples/evhiperfifo.c +++ b/docs/examples/evhiperfifo.c @@ -270,7 +270,7 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { struct GlobalInfo *g = (struct GlobalInfo *)cbp; struct SockInfo *fdp = (struct SockInfo *)sockp; - const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + const char *whatstr[] = { "none", "IN", "OUT", "INOUT", "REMOVE" }; printf("%s e %p s %i what %i cbp %p sockp %p\n", __PRETTY_FUNCTION__, e, s, what, cbp, sockp); diff --git a/docs/examples/externalsocket.c b/docs/examples/externalsocket.c index 632d5f2981..4f1b2e9091 100644 --- a/docs/examples/externalsocket.c +++ b/docs/examples/externalsocket.c @@ -43,17 +43,17 @@ #ifdef _WIN32 #define close closesocket #else -#include /* socket types */ -#include /* socket definitions */ +#include /* socket types */ +#include /* socket definitions */ #include -#include /* inet (3) functions */ -#include /* misc. Unix functions */ +#include /* inet (3) functions */ +#include /* misc. Unix functions */ #endif #include /* The IP address and port number to connect to */ -#define IPADDR "127.0.0.1" +#define IPADDR "127.0.0.1" #define PORTNUM 80 #ifndef INADDR_NONE diff --git a/docs/examples/ftp-wildcard.c b/docs/examples/ftp-wildcard.c index fa66628f16..9159d3857f 100644 --- a/docs/examples/ftp-wildcard.c +++ b/docs/examples/ftp-wildcard.c @@ -103,7 +103,7 @@ int main(int argc, char **argv) CURL *curl; /* help data */ - struct callback_data data = {0}; + struct callback_data data = { 0 }; /* global initialization */ CURLcode res = curl_global_init(CURL_GLOBAL_ALL); diff --git a/docs/examples/ftpgetresp.c b/docs/examples/ftpgetresp.c index 53ada7ccae..c46fa057eb 100644 --- a/docs/examples/ftpgetresp.c +++ b/docs/examples/ftpgetresp.c @@ -42,7 +42,7 @@ static size_t write_response(void *ptr, size_t size, size_t nmemb, void *data) return fwrite(ptr, size, nmemb, writehere); } -#define FTPBODY "ftp-list" +#define FTPBODY "ftp-list" #define FTPHEADERS "ftp-responses" int main(void) diff --git a/docs/examples/ftpsget.c b/docs/examples/ftpsget.c index 22c94b8e93..38844bb219 100644 --- a/docs/examples/ftpsget.c +++ b/docs/examples/ftpsget.c @@ -40,8 +40,7 @@ struct FtpFile { FILE *stream; }; -static size_t write_cb(void *buffer, size_t size, size_t nmemb, - void *stream) +static size_t write_cb(void *buffer, size_t size, size_t nmemb, void *stream) { struct FtpFile *out = (struct FtpFile *)stream; if(!out->stream) { @@ -53,7 +52,6 @@ static size_t write_cb(void *buffer, size_t size, size_t nmemb, return fwrite(buffer, size, nmemb, out->stream); } - int main(void) { CURL *curl; diff --git a/docs/examples/ftpupload.c b/docs/examples/ftpupload.c index 0a241db21c..48c76a4898 100644 --- a/docs/examples/ftpupload.c +++ b/docs/examples/ftpupload.c @@ -52,10 +52,10 @@ #include #endif -#define LOCAL_FILE "/tmp/uploadthis.txt" -#define UPLOAD_FILE_AS "while-uploading.txt" -#define REMOTE_URL "ftp://example.com/" UPLOAD_FILE_AS -#define RENAME_FILE_TO "renamed-and-fine.txt" +#define LOCAL_FILE "/tmp/uploadthis.txt" +#define UPLOAD_FILE_AS "while-uploading.txt" +#define REMOTE_URL "ftp://example.com/" UPLOAD_FILE_AS +#define RENAME_FILE_TO "renamed-and-fine.txt" /* NOTE: if you want this example to work on Windows with libcurl as a DLL, you MUST also provide a read callback with CURLOPT_READFUNCTION. Failing to diff --git a/docs/examples/ftpuploadresume.c b/docs/examples/ftpuploadresume.c index a9af3f12cd..30305f62fe 100644 --- a/docs/examples/ftpuploadresume.c +++ b/docs/examples/ftpuploadresume.c @@ -72,7 +72,6 @@ static size_t read_cb(char *ptr, size_t size, size_t nmemb, void *stream) return n; } - static int upload(CURL *curl, const char *remotepath, const char *localpath, long timeout, long tries) { diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c index d7b19abb9b..8f320a6e5f 100644 --- a/docs/examples/ghiper.c +++ b/docs/examples/ghiper.c @@ -66,9 +66,9 @@ #include -#define MSG_OUT g_print /* Change to "g_error" to write to stderr */ -#define SHOW_VERBOSE 0L /* Set to non-zero for libcurl messages */ -#define SHOW_PROGRESS 0 /* Set to non-zero to enable progress callback */ +#define MSG_OUT g_print /* Change to "g_error" to write to stderr */ +#define SHOW_VERBOSE 0L /* Set to non-zero for libcurl messages */ +#define SHOW_PROGRESS 0 /* Set to non-zero to enable progress callback */ /* Global information, common to all connections */ struct GlobalInfo { @@ -261,7 +261,7 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { struct GlobalInfo *g = (struct GlobalInfo *)cbp; struct SockInfo *fdp = (struct SockInfo *)sockp; - static const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + static const char *whatstr[] = { "none", "IN", "OUT", "INOUT", "REMOVE" }; MSG_OUT("socket callback: s=%d e=%p what=%s ", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index 576bbb8d2c..7b17731ebf 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -274,7 +274,7 @@ static int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { struct GlobalInfo *g = (struct GlobalInfo *)cbp; struct SockInfo *fdp = (struct SockInfo *)sockp; - const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + const char *whatstr[] = { "none", "IN", "OUT", "INOUT", "REMOVE" }; fprintf(MSG_OUT, "socket callback: s=%d e=%p what=%s ", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { diff --git a/docs/examples/hsts-preload.c b/docs/examples/hsts-preload.c index b029df2a0a..cd6c30f9c6 100644 --- a/docs/examples/hsts-preload.c +++ b/docs/examples/hsts-preload.c @@ -93,7 +93,7 @@ int main(void) curl = curl_easy_init(); if(curl) { - struct state st = {0}; + struct state st = { 0 }; /* enable HSTS for this handle */ curl_easy_setopt(curl, CURLOPT_HSTS_CTRL, CURLHSTS_ENABLE); diff --git a/docs/examples/htmltidy.c b/docs/examples/htmltidy.c index 9865a633ef..a3ecc01df1 100644 --- a/docs/examples/htmltidy.c +++ b/docs/examples/htmltidy.c @@ -79,8 +79,8 @@ int main(int argc, char **argv) CURL *curl; char curl_errbuf[CURL_ERROR_SIZE]; TidyDoc tdoc; - TidyBuffer docbuf = {0}; - TidyBuffer tidy_errbuf = {0}; + TidyBuffer docbuf = { 0 }; + TidyBuffer tidy_errbuf = { 0 }; CURLcode res; if(argc != 2) { diff --git a/docs/examples/htmltitle.cpp b/docs/examples/htmltitle.cpp index a6f944ff0e..ac351a8bf5 100644 --- a/docs/examples/htmltitle.cpp +++ b/docs/examples/htmltitle.cpp @@ -54,7 +54,6 @@ // // libxml callback context structure // - struct Context { Context() : addTitle(false) {} @@ -71,7 +70,6 @@ static std::string buffer; // // libcurl write callback function // - static size_t writer(char *data, size_t size, size_t nmemb, std::string *writerData) { @@ -86,7 +84,6 @@ static size_t writer(char *data, size_t size, size_t nmemb, // // libcurl connection initialization // - static bool init(CURL *&curl, const char *url) { CURLcode res; @@ -134,7 +131,6 @@ static bool init(CURL *&curl, const char *url) // // libxml start element callback function // - static void StartElement(void *voidContext, const xmlChar *name, const xmlChar **attributes) @@ -151,7 +147,6 @@ static void StartElement(void *voidContext, // // libxml end element callback function // - static void EndElement(void *voidContext, const xmlChar *name) { @@ -164,7 +159,6 @@ static void EndElement(void *voidContext, // // Text handling helper function // - static void handleCharacters(Context *context, const xmlChar *chars, int length) @@ -177,7 +171,6 @@ static void handleCharacters(Context *context, // // libxml PCDATA callback function // - static void Characters(void *voidContext, const xmlChar *chars, int length) @@ -190,7 +183,6 @@ static void Characters(void *voidContext, // // libxml CDATA callback function // - static void cdata(void *voidContext, const xmlChar *chars, int length) @@ -203,9 +195,7 @@ static void cdata(void *voidContext, // // libxml SAX callback structure // - -static htmlSAXHandler saxHandler = -{ +static htmlSAXHandler saxHandler = { NULL, NULL, NULL, @@ -243,7 +233,6 @@ static htmlSAXHandler saxHandler = // // Parse given (assumed to be) HTML text and return the title // - static void parseHtml(const std::string &html, std::string &title) { diff --git a/docs/examples/http2-download.c b/docs/examples/http2-download.c index e6fdbd6b9c..054f697b3e 100644 --- a/docs/examples/http2-download.c +++ b/docs/examples/http2-download.c @@ -200,10 +200,10 @@ int main(int argc, char **argv) /* if given a number, do that many transfers */ num_transfers = atoi(argv[1]); if((num_transfers < 1) || (num_transfers > 1000)) - num_transfers = 3; /* a suitable low default */ + num_transfers = 3; /* a suitable low default */ } else - num_transfers = 3; /* a suitable low default */ + num_transfers = 3; /* a suitable low default */ res = curl_global_init(CURL_GLOBAL_ALL); if(res) diff --git a/docs/examples/http2-serverpush.c b/docs/examples/http2-serverpush.c index 5c817ead58..eb67bfe671 100644 --- a/docs/examples/http2-serverpush.c +++ b/docs/examples/http2-serverpush.c @@ -136,7 +136,7 @@ static int setup(CURL *curl, const char *url) { out_download = fopen(OUTPUTFILE, "wb"); if(!out_download) - return 1; /* failed */ + return 1; /* failed */ /* set the same URL */ curl_easy_setopt(curl, CURLOPT_URL, url); diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c index 9ec8cbf5bc..e360127a44 100644 --- a/docs/examples/http2-upload.c +++ b/docs/examples/http2-upload.c @@ -72,8 +72,8 @@ static int my_gettimeofday(struct timeval *tp, void *tzp) { (void)tzp; if(tp) { - /* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */ - #define WIN32_FT_OFFSET (116444736000000000) +/* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */ +#define WIN32_FT_OFFSET (116444736000000000) union { CURL_TYPEOF_CURL_OFF_T ns100; /* time since 1 Jan 1601 in 100ns units */ FILETIME ft; diff --git a/docs/examples/imap-append.c b/docs/examples/imap-append.c index 91cbac6915..e3665d0128 100644 --- a/docs/examples/imap-append.c +++ b/docs/examples/imap-append.c @@ -36,9 +36,9 @@ * Note that this example requires libcurl 7.30.0 or above. */ -#define FROM "" -#define TO "" -#define CC "" +#define FROM "" +#define TO "" +#define CC "" static const char *payload_text = "Date: Mon, 29 Nov 2010 21:54:29 +1100\r\n" @@ -95,7 +95,7 @@ int main(void) if(curl) { size_t filesize; long infilesize = LONG_MAX; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* Set username and password */ curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); diff --git a/docs/examples/maxconnects.c b/docs/examples/maxconnects.c index 658b38d711..2ee1d305a9 100644 --- a/docs/examples/maxconnects.c +++ b/docs/examples/maxconnects.c @@ -39,7 +39,8 @@ int main(void) curl = curl_easy_init(); if(curl) { - const char *urls[] = { "https://example.com", + const char *urls[] = { + "https://example.com", "https://curl.se", "https://www.example/", NULL /* end of list */ diff --git a/docs/examples/multi-app.c b/docs/examples/multi-app.c index d58181e027..51492e8ade 100644 --- a/docs/examples/multi-app.c +++ b/docs/examples/multi-app.c @@ -36,7 +36,7 @@ */ #define HTTP_HANDLE 0 /* Index for the HTTP transfer */ -#define FTP_HANDLE 1 /* Index for the FTP transfer */ +#define FTP_HANDLE 1 /* Index for the FTP transfer */ #define HANDLECOUNT 2 /* Number of simultaneous transfers */ int main(void) diff --git a/docs/examples/multi-event.c b/docs/examples/multi-event.c index 901d7dd6e7..2eb3977200 100644 --- a/docs/examples/multi-event.c +++ b/docs/examples/multi-event.c @@ -183,8 +183,8 @@ static int handle_socket(CURL *curl, curl_socket_t s, int action, void *userp, case CURL_POLL_IN: case CURL_POLL_OUT: case CURL_POLL_INOUT: - curl_context = socketp ? - (struct curl_context *)socketp : create_curl_context(s); + curl_context = + socketp ? (struct curl_context *)socketp : create_curl_context(s); curl_multi_assign(multi, s, (void *)curl_context); @@ -197,7 +197,7 @@ static int handle_socket(CURL *curl, curl_socket_t s, int action, void *userp, event_del(curl_context->event); event_assign(curl_context->event, base, curl_context->sockfd, - (short)events, curl_perform, curl_context); + (short)events, curl_perform, curl_context); event_add(curl_context->event, NULL); break; diff --git a/docs/examples/multi-legacy.c b/docs/examples/multi-legacy.c index e34d1cd710..42670129f9 100644 --- a/docs/examples/multi-legacy.c +++ b/docs/examples/multi-legacy.c @@ -41,9 +41,9 @@ * Download an HTTP file and upload an FTP file simultaneously. */ -#define HTTP_HANDLE 0 /* Index for the HTTP transfer */ -#define FTP_HANDLE 1 /* Index for the FTP transfer */ -#define HANDLECOUNT 2 /* Number of simultaneous transfers */ +#define HTTP_HANDLE 0 /* Index for the HTTP transfer */ +#define FTP_HANDLE 1 /* Index for the FTP transfer */ +#define HANDLECOUNT 2 /* Number of simultaneous transfers */ int main(void) { @@ -140,7 +140,7 @@ int main(void) rc = 0; #else /* Portable sleep for platforms other than Windows. */ - struct timeval wait = {0}; + struct timeval wait = { 0 }; wait.tv_usec = 100 * 1000; /* 100ms */ rc = select(0, NULL, NULL, NULL, &wait); #endif @@ -155,7 +155,7 @@ int main(void) case -1: /* select error */ break; - case 0: /* timeout */ + case 0: /* timeout */ default: /* action */ curl_multi_perform(multi, &still_running); break; diff --git a/docs/examples/multi-uv.c b/docs/examples/multi-uv.c index 4053cb9061..13689ad3f8 100644 --- a/docs/examples/multi-uv.c +++ b/docs/examples/multi-uv.c @@ -201,8 +201,8 @@ static int cb_socket(CURL *curl, curl_socket_t s, int action, case CURL_POLL_IN: case CURL_POLL_OUT: case CURL_POLL_INOUT: - curl_context = socketp ? - (struct curl_context *)socketp : create_curl_context(s, uv); + curl_context = + socketp ? (struct curl_context *)socketp : create_curl_context(s, uv); curl_multi_assign(uv->multi, s, (void *)curl_context); @@ -230,7 +230,7 @@ static int cb_socket(CURL *curl, curl_socket_t s, int action, int main(int argc, char **argv) { CURLcode res; - struct datauv uv = {0}; + struct datauv uv = { 0 }; int running_handles; if(argc <= 1) diff --git a/docs/examples/multithread.c b/docs/examples/multithread.c index 308c1168e2..3d2f1df7de 100644 --- a/docs/examples/multithread.c +++ b/docs/examples/multithread.c @@ -45,7 +45,7 @@ https://curl.se/libcurl/c/threadsafe.html */ -static const char * const urls[NUMT]= { +static const char * const urls[NUMT] = { "https://curl.se/", "ftp://example.com/", "https://example.net/", diff --git a/docs/examples/post-callback.c b/docs/examples/post-callback.c index c463e3785c..0df09a34bf 100644 --- a/docs/examples/post-callback.c +++ b/docs/examples/post-callback.c @@ -31,8 +31,9 @@ #include /* silly test data to POST */ -static const char data[]="Lorem ipsum dolor sit amet, consectetur adipiscing " - "elit. Sed vel urna neque. Ut quis leo metus. Quisque eleifend, ex at " +static const char data[] = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " + "Sed vel urna neque. Ut quis leo metus. Quisque eleifend, ex at " "laoreet rhoncus, odio ipsum semper metus, at tempus ante urna in mauris. " "Suspendisse ornare tempor venenatis. Ut dui neque, pellentesque a ______ " "eget, mattis vitae ligula. Fusce ut pharetra est. Ut ullamcorper mi ac " @@ -61,7 +62,7 @@ static size_t read_cb(char *dest, size_t size, size_t nmemb, void *userp) return copy_this_much; /* we copied this many bytes */ } - return 0; /* no more data left to deliver */ + return 0; /* no more data left to deliver */ } int main(void) diff --git a/docs/examples/postinmemory.c b/docs/examples/postinmemory.c index 089d9a9c74..0a2964f1c6 100644 --- a/docs/examples/postinmemory.c +++ b/docs/examples/postinmemory.c @@ -68,7 +68,7 @@ int main(void) return (int)res; chunk.memory = malloc(1); /* grown as needed by realloc above */ - chunk.size = 0; /* no data at this point */ + chunk.size = 0; /* no data at this point */ curl = curl_easy_init(); if(curl) { diff --git a/docs/examples/progressfunc.c b/docs/examples/progressfunc.c index 59477951f9..41a87f2bf9 100644 --- a/docs/examples/progressfunc.c +++ b/docs/examples/progressfunc.c @@ -30,8 +30,8 @@ #include -#define MINIMAL_PROGRESS_FUNCTIONALITY_INTERVAL 3000000 -#define STOP_DOWNLOAD_AFTER_THIS_MANY_BYTES 6000 +#define MINIMAL_PROGRESS_FUNCTIONALITY_INTERVAL 3000000 +#define STOP_DOWNLOAD_AFTER_THIS_MANY_BYTES 6000 struct myprogress { curl_off_t lastruntime; /* type depends on version, see above */ diff --git a/docs/examples/protofeats.c b/docs/examples/protofeats.c index f93dccef00..50b31cb9ea 100644 --- a/docs/examples/protofeats.c +++ b/docs/examples/protofeats.c @@ -29,14 +29,14 @@ #include -#if !CURL_AT_LEAST_VERSION(7,87,0) +#if !CURL_AT_LEAST_VERSION(7, 87, 0) #error "too old libcurl" #endif int main(void) { curl_version_info_data *ver; - const char *const *ptr; + const char * const *ptr; CURLcode res = curl_global_init(CURL_GLOBAL_ALL); if(res) diff --git a/docs/examples/sendrecv.c b/docs/examples/sendrecv.c index 6f7cbb1b51..e0bf417e48 100644 --- a/docs/examples/sendrecv.c +++ b/docs/examples/sendrecv.c @@ -128,7 +128,7 @@ int main(void) do { nsent = 0; res = curl_easy_send(curl, request + nsent_total, - request_len - nsent_total, &nsent); + request_len - nsent_total, &nsent); nsent_total += nsent; if(res == CURLE_AGAIN && !wait_on_socket(sockfd, 0, 60000L)) { diff --git a/docs/examples/sessioninfo.c b/docs/examples/sessioninfo.c index e90b387da0..dec9fa988d 100644 --- a/docs/examples/sessioninfo.c +++ b/docs/examples/sessioninfo.c @@ -73,8 +73,8 @@ static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *stream) gnutls_x509_crt_import(cert, &chainp[i], GNUTLS_X509_FMT_DER)) { if(GNUTLS_E_SUCCESS == gnutls_x509_crt_print(cert, GNUTLS_CRT_PRINT_FULL, &dn)) { - fprintf(stderr, "Certificate #%u: %.*s", i, - (int)dn.size, dn.data); + fprintf(stderr, "Certificate #%u: %.*s", i, (int)dn.size, + dn.data); gnutls_free(dn.data); } diff --git a/docs/examples/smtp-authzid.c b/docs/examples/smtp-authzid.c index e7dd20f590..f8e66069f8 100644 --- a/docs/examples/smtp-authzid.c +++ b/docs/examples/smtp-authzid.c @@ -40,13 +40,13 @@ /* The libcurl options want plain addresses, the viewable headers in the mail * can get a full name as well. */ -#define FROM_ADDR "" -#define SENDER_ADDR "" -#define TO_ADDR "" +#define FROM_ADDR "" +#define SENDER_ADDR "" +#define TO_ADDR "" -#define FROM_MAIL "Ursel " FROM_ADDR -#define SENDER_MAIL "Kurt " SENDER_ADDR -#define TO_MAIL "A Receiver " TO_ADDR +#define FROM_MAIL "Ursel " FROM_ADDR +#define SENDER_MAIL "Kurt " SENDER_ADDR +#define TO_MAIL "A Receiver " TO_ADDR static const char *payload_text = "Date: Mon, 29 Nov 2010 21:54:29 +1100\r\n" @@ -99,7 +99,7 @@ int main(void) curl = curl_easy_init(); if(curl) { struct curl_slist *recipients = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* This is the URL for your mailserver. In this example we connect to the smtp-submission port as we require an authenticated connection. */ diff --git a/docs/examples/smtp-mail.c b/docs/examples/smtp-mail.c index d5074abbf2..8ed91f55b7 100644 --- a/docs/examples/smtp-mail.c +++ b/docs/examples/smtp-mail.c @@ -37,9 +37,9 @@ /* The libcurl options want plain addresses, the viewable headers in the mail * can get a full name as well. */ -#define FROM_ADDR "" -#define TO_ADDR "" -#define CC_ADDR "" +#define FROM_ADDR "" +#define TO_ADDR "" +#define CC_ADDR "" #define FROM_MAIL "Sender Person " FROM_ADDR #define TO_MAIL "A Receiver " TO_ADDR @@ -96,7 +96,7 @@ int main(void) curl = curl_easy_init(); if(curl) { struct curl_slist *recipients = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* This is the URL for your mailserver */ curl_easy_setopt(curl, CURLOPT_URL, "smtp://mail.example.com"); diff --git a/docs/examples/smtp-mime.c b/docs/examples/smtp-mime.c index 553947b097..89bfebd39d 100644 --- a/docs/examples/smtp-mime.c +++ b/docs/examples/smtp-mime.c @@ -37,9 +37,9 @@ * Note that this example requires libcurl 7.56.0 or above. */ -#define FROM "" -#define TO "" -#define CC "" +#define FROM "" +#define TO "" +#define CC "" static const char *headers_text[] = { "Date: Tue, 22 Aug 2017 14:08:43 +0100", @@ -47,7 +47,7 @@ static const char *headers_text[] = { "From: " FROM " (Example User)", "Cc: " CC " (Another example User)", "Message-ID: ", + "rfcpedant.example.org>", "Subject: example sending a MIME-formatted message", NULL }; @@ -66,7 +66,6 @@ static const char inline_html[] = "email viewers able to handle HTML.

" "\r\n"; - int main(void) { CURL *curl; diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c index 8cb5e65a26..acc54bacdf 100644 --- a/docs/examples/smtp-multi.c +++ b/docs/examples/smtp-multi.c @@ -34,9 +34,9 @@ * libcurl's multi interface. */ -#define FROM_MAIL "" -#define TO_MAIL "" -#define CC_MAIL "" +#define FROM_MAIL "" +#define TO_MAIL "" +#define CC_MAIL "" static const char *payload_text = "Date: Mon, 29 Nov 2010 21:54:29 +1100\r\n" @@ -94,7 +94,7 @@ int main(void) if(multi) { int still_running = 1; struct curl_slist *recipients = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* This is the URL for your mailserver */ curl_easy_setopt(curl, CURLOPT_URL, "smtp://mail.example.com"); diff --git a/docs/examples/smtp-ssl.c b/docs/examples/smtp-ssl.c index 3b140c904c..3a5e330439 100644 --- a/docs/examples/smtp-ssl.c +++ b/docs/examples/smtp-ssl.c @@ -38,9 +38,9 @@ * Note that this example requires libcurl 7.20.0 or above. */ -#define FROM_MAIL "" -#define TO_MAIL "" -#define CC_MAIL "" +#define FROM_MAIL "" +#define TO_MAIL "" +#define CC_MAIL "" static const char *payload_text = "Date: Mon, 29 Nov 2010 21:54:29 +1100\r\n" @@ -93,7 +93,7 @@ int main(void) curl = curl_easy_init(); if(curl) { struct curl_slist *recipients = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* Set username and password */ curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); diff --git a/docs/examples/smtp-tls.c b/docs/examples/smtp-tls.c index 3bf3b0cddf..e9221b36c9 100644 --- a/docs/examples/smtp-tls.c +++ b/docs/examples/smtp-tls.c @@ -38,9 +38,9 @@ * Note that this example requires libcurl 7.20.0 or above. */ -#define FROM_MAIL "" -#define TO_MAIL "" -#define CC_MAIL "" +#define FROM_MAIL "" +#define TO_MAIL "" +#define CC_MAIL "" static const char *payload_text = "Date: Mon, 29 Nov 2010 21:54:29 +1100\r\n" @@ -93,7 +93,7 @@ int main(void) curl = curl_easy_init(); if(curl) { struct curl_slist *recipients = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; /* Set username and password */ curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c index b2a3b92607..a81f40e3ac 100644 --- a/docs/examples/synctime.c +++ b/docs/examples/synctime.c @@ -58,8 +58,8 @@ */ #ifdef _MSC_VER #ifndef _CRT_SECURE_NO_WARNINGS -#define _CRT_SECURE_NO_WARNINGS /* for _snprintf(), fopen(), gmtime(), - localtime(), sscanf() */ +#define _CRT_SECURE_NO_WARNINGS /* for _snprintf(), fopen(), gmtime(), + localtime(), sscanf() */ #endif #endif @@ -74,9 +74,9 @@ int main(void) #else #if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \ - defined(WINAPI_FAMILY) + defined(WINAPI_FAMILY) # include -# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ +# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) # define CURL_WINDOWS_UWP # endif @@ -100,8 +100,8 @@ int main(void) #define snprintf _snprintf #endif -#define MAX_STRING 256 -#define MAX_STRING1 MAX_STRING + 1 +#define MAX_STRING 256 +#define MAX_STRING1 MAX_STRING + 1 #define SYNCTIME_UA "synctime/1.0" @@ -111,8 +111,7 @@ struct conf { char timeserver[MAX_STRING1]; }; -static const char DefaultTimeServer[3][MAX_STRING1] = -{ +static const char DefaultTimeServer[3][MAX_STRING1] = { "https://nist.time.gov/", "https://www.google.com/" }; @@ -128,8 +127,8 @@ static int AutoSyncTime; static SYSTEMTIME SYSTime; static SYSTEMTIME LOCALTime; -#define HTTP_COMMAND_HEAD 0 -#define HTTP_COMMAND_GET 1 +#define HTTP_COMMAND_HEAD 0 +#define HTTP_COMMAND_GET 1 static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *stream) { @@ -167,17 +166,17 @@ static size_t SyncTime_CURL_WriteHeader(void *ptr, size_t size, size_t nmemb, if(RetVal == 7) { int i; - SYSTime.wMilliseconds = 500; /* adjust to midpoint, 0.5 sec */ + SYSTime.wMilliseconds = 500; /* adjust to midpoint, 0.5 sec */ for(i = 0; i < 12; i++) { if(strcmp(MthStr[i], TmpStr2) == 0) { SYSTime.wMonth = (WORD)(i + 1); break; } } - AutoSyncTime = 3; /* Computer clock is adjusted */ + AutoSyncTime = 3; /* Computer clock is adjusted */ } else { - AutoSyncTime = 0; /* Error in sscanf() fields conversion */ + AutoSyncTime = 0; /* Error in sscanf() fields conversion */ } } } @@ -222,7 +221,7 @@ static CURLcode SyncTime_CURL_Fetch(CURL *curl, const char *URL_Str, res = curl_easy_perform(curl); if(outfile) fclose(outfile); - return res; /* (CURLE_OK) */ + return res; /* (CURLE_OK) */ } static void showUsage(void) @@ -251,7 +250,7 @@ static int conf_init(struct conf *conf) *conf->http_proxy = 0; for(i = 0; i < MAX_STRING1; i++) - conf->proxy_user[i] = 0; /* Clean up password from memory */ + conf->proxy_user[i] = 0; /* Clean up password from memory */ *conf->timeserver = 0; return 1; } @@ -263,9 +262,9 @@ int main(int argc, char *argv[]) struct conf conf[1]; int RetValue; - ShowAllHeader = 0; /* Do not show HTTP Header */ - AutoSyncTime = 0; /* Do not synchronise computer clock */ - RetValue = 0; /* Successful Exit */ + ShowAllHeader = 0; /* Do not show HTTP Header */ + AutoSyncTime = 0; /* Do not synchronise computer clock */ + RetValue = 0; /* Successful Exit */ conf_init(conf); if(argc > 1) { @@ -295,7 +294,7 @@ int main(int argc, char *argv[]) } } - if(*conf->timeserver == 0) /* Use default server for time information */ + if(*conf->timeserver == 0) /* Use default server for time information */ snprintf(conf->timeserver, MAX_STRING, "%s", DefaultTimeServer[0]); /* Init CURL before usage */ diff --git a/docs/examples/websocket-cb.c b/docs/examples/websocket-cb.c index 78899826fb..63d07c7841 100644 --- a/docs/examples/websocket-cb.c +++ b/docs/examples/websocket-cb.c @@ -33,8 +33,8 @@ static size_t write_cb(char *b, size_t size, size_t nitems, void *p) CURL *curl = p; size_t i; const struct curl_ws_frame *frame = curl_ws_meta(curl); - fprintf(stderr, "Type: %s\n", frame->flags & CURLWS_BINARY ? - "binary" : "text"); + fprintf(stderr, "Type: %s\n", + frame->flags & CURLWS_BINARY ? "binary" : "text"); fprintf(stderr, "Bytes: %u", (unsigned int)(nitems * size)); for(i = 0; i < nitems; i++) fprintf(stderr, "%02x ", (unsigned char)b[i]); diff --git a/docs/examples/websocket-updown.c b/docs/examples/websocket-updown.c index 87f7aea287..a40bddf9cf 100644 --- a/docs/examples/websocket-updown.c +++ b/docs/examples/websocket-updown.c @@ -35,8 +35,8 @@ static size_t write_cb(char *b, size_t size, size_t nitems, void *p) size_t i; unsigned int blen = (unsigned int)(nitems * size); const struct curl_ws_frame *frame = curl_ws_meta(curl); - fprintf(stderr, "Type: %s\n", frame->flags & CURLWS_BINARY ? - "binary" : "text"); + fprintf(stderr, "Type: %s\n", + frame->flags & CURLWS_BINARY ? "binary" : "text"); if(frame->flags & CURLWS_BINARY) { fprintf(stderr, "Bytes: %u", blen); for(i = 0; i < nitems; i++) @@ -111,7 +111,6 @@ int main(int argc, const char *argv[]) curl_easy_setopt(curl, CURLOPT_READDATA, &rctx); curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); - /* Perform the request, res gets the return code */ res = curl_easy_perform(curl); /* Check for errors */ diff --git a/docs/examples/websocket.c b/docs/examples/websocket.c index 0063f1b59c..0075f68e60 100644 --- a/docs/examples/websocket.c +++ b/docs/examples/websocket.c @@ -49,10 +49,10 @@ static CURLcode ping(CURL *curl, const char *send_payload) buf += sent; /* deduct what was sent */ blen -= sent; } - else if(res == CURLE_AGAIN) { /* blocked on sending */ + else if(res == CURLE_AGAIN) { /* blocked on sending */ fprintf(stderr, "ws: sent PING blocked, waiting a second\n"); - sleep(1); /* either select() on socket or max timeout would - be good here. */ + sleep(1); /* either select() on socket or max timeout would + be good here. */ } else /* real error sending */ break; @@ -85,8 +85,7 @@ retry: same ? "same" : "different"); } else if(meta->flags & CURLWS_TEXT) { - fprintf(stderr, "ws: received TEXT frame '%.*s'\n", (int)rlen, - buffer); + fprintf(stderr, "ws: received TEXT frame '%.*s'\n", (int)rlen, buffer); } else if(meta->flags & CURLWS_BINARY) { fprintf(stderr, "ws: received BINARY frame of %u bytes\n", @@ -99,10 +98,10 @@ retry: goto retry; } } - else if(res == CURLE_AGAIN) { /* blocked on receiving */ + else if(res == CURLE_AGAIN) { /* blocked on receiving */ fprintf(stderr, "ws: PONG not there yet, waiting a second\n"); - sleep(1); /* either select() on socket or max timeout would - be good here. */ + sleep(1); /* either select() on socket or max timeout would + be good here. */ goto retry; } if(res) diff --git a/lib/bufref.c b/lib/bufref.c index 8f52d48d20..e5b5a4d985 100644 --- a/lib/bufref.c +++ b/lib/bufref.c @@ -102,7 +102,7 @@ const char *Curl_bufref_ptr(const struct bufref *br) DEBUGASSERT(br->signature == SIGNATURE); DEBUGASSERT(br->ptr || !br->len); - return (const char *) br->ptr; + return (const char *)br->ptr; } /* diff --git a/lib/cookie.c b/lib/cookie.c index dff5198c11..5c29768bbd 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -1036,7 +1036,7 @@ Curl_cookie_add(struct Curl_easy *data, /* Only show this when NOT reading the cookies from a file */ infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, " "expire %" FMT_OFF_T, - replaces ? "Replaced":"Added", co->name, co->value, + replaces ? "Replaced" : "Added", co->name, co->value, co->domain, co->path, co->expires); if(!replaces) diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c index cc49aa4c77..78f60dfc26 100644 --- a/lib/curl_sha512_256.c +++ b/lib/curl_sha512_256.c @@ -238,8 +238,7 @@ static CURLcode Curl_sha512_256_update(void *context, # bytes * @return always CURLE_OK */ -static CURLcode Curl_sha512_256_finish(unsigned char *digest, - void *context) +static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *context) { Curl_sha512_256_ctx * const ctx = (Curl_sha512_256_ctx *)context; @@ -453,19 +452,19 @@ static void Curl_sha512_256_transform(uint64_t H[SHA512_256_HASH_SIZE_WORDS], /* 'Ch' and 'Maj' macro functions are defined with widely-used optimization. See FIPS PUB 180-4 formulae 4.8, 4.9. */ -#define Sha512_Ch(x, y, z) ( (z) ^ ((x) & ((y) ^ (z))) ) -#define Sha512_Maj(x, y, z) ( ((x) & (y)) ^ ((z) & ((x) ^ (y))) ) +#define Sha512_Ch(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) +#define Sha512_Maj(x, y, z) (((x) & (y)) ^ ((z) & ((x) ^ (y)))) /* Four 'Sigma' macro functions. See FIPS PUB 180-4 formulae 4.10, 4.11, 4.12, 4.13. */ #define SIG0(x) \ - ( Curl_rotr64((x), 28) ^ Curl_rotr64((x), 34) ^ Curl_rotr64((x), 39) ) + (Curl_rotr64((x), 28) ^ Curl_rotr64((x), 34) ^ Curl_rotr64((x), 39)) #define SIG1(x) \ - ( Curl_rotr64((x), 14) ^ Curl_rotr64((x), 18) ^ Curl_rotr64((x), 41) ) + (Curl_rotr64((x), 14) ^ Curl_rotr64((x), 18) ^ Curl_rotr64((x), 41)) #define sig0(x) \ - ( Curl_rotr64((x), 1) ^ Curl_rotr64((x), 8) ^ ((x) >> 7) ) + (Curl_rotr64((x), 1) ^ Curl_rotr64((x), 8) ^ ((x) >> 7)) #define sig1(x) \ - ( Curl_rotr64((x), 19) ^ Curl_rotr64((x), 61) ^ ((x) >> 6) ) + (Curl_rotr64((x), 19) ^ Curl_rotr64((x), 61) ^ ((x) >> 6)) if(1) { unsigned int t; @@ -628,9 +627,7 @@ static CURLcode Curl_sha512_256_update(void *context, if(length >= bytes_left) { /* Combine new data with data in the buffer and process the full block. */ - memcpy(((unsigned char *)ctx_buf) + bytes_have, - data, - bytes_left); + memcpy(((unsigned char *)ctx_buf) + bytes_have, data, bytes_left); data += bytes_left; length -= bytes_left; Curl_sha512_256_transform(ctx->H, ctx->buffer); diff --git a/lib/formdata.c b/lib/formdata.c index d5f6776a3d..b0c57b8d6f 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -252,7 +252,7 @@ static CURLFORMcode FormAddCheck(struct FormInfo *first_form, (form->flags & HTTPPOST_BUFFER)) && !Curl_bufref_ptr(&form->contenttype)) { const char *f = Curl_bufref_ptr((form->flags & HTTPPOST_BUFFER) ? - &form->showfilename : &form->value); + &form->showfilename : &form->value); const char *type = Curl_mime_contenttype(f); if(!type) type = prevtype; @@ -276,7 +276,7 @@ static CURLFORMcode FormAddCheck(struct FormInfo *first_form, if(!(form->flags & (HTTPPOST_FILENAME | HTTPPOST_READFILE | HTTPPOST_PTRCONTENTS | HTTPPOST_PTRBUFFER | HTTPPOST_CALLBACK))) { - if(FormInfoCopyField(&form->value, (size_t) form->contentslength)) + if(FormInfoCopyField(&form->value, (size_t)form->contentslength)) return CURL_FORMADD_MEMORY; } post = AddHttpPost(form, post, httppost, last_post); @@ -315,11 +315,11 @@ static CURLFORMcode FormAdd(struct curl_httppost **httppost, struct curl_httppost *newchain = NULL; struct curl_httppost *lastnode = NULL; -#define form_ptr_arg(t) (forms ? (t) (void *) avalue : va_arg(params, t)) +#define form_ptr_arg(t) (forms ? (t)(void *)avalue : va_arg(params, t)) #ifdef HAVE_STDINT_H -#define form_int_arg(t) (forms ? (t) (uintptr_t) avalue : va_arg(params, t)) +#define form_int_arg(t) (forms ? (t)(uintptr_t)avalue : va_arg(params, t)) #else -#define form_int_arg(t) (forms ? (t) (void *) avalue : va_arg(params, t)) +#define form_int_arg(t) (forms ? (t)(void *)avalue : va_arg(params, t)) #endif /* @@ -391,7 +391,7 @@ static CURLFORMcode FormAdd(struct curl_httppost **httppost, if(curr->namelength) retval = CURL_FORMADD_OPTION_TWICE; else - curr->namelength = (size_t) form_int_arg(long); + curr->namelength = (size_t)form_int_arg(long); break; /* @@ -412,7 +412,7 @@ static CURLFORMcode FormAdd(struct curl_httppost **httppost, } break; case CURLFORM_CONTENTSLENGTH: - curr->contentslength = (curl_off_t)(size_t) form_int_arg(long); + curr->contentslength = (curl_off_t)(size_t)form_int_arg(long); break; case CURLFORM_CONTENTLEN: @@ -493,7 +493,7 @@ static CURLFORMcode FormAdd(struct curl_httppost **httppost, if(curr->bufferlength) retval = CURL_FORMADD_OPTION_TWICE; else - curr->bufferlength = (size_t) form_int_arg(long); + curr->bufferlength = (size_t)form_int_arg(long); break; case CURLFORM_STREAM: @@ -521,7 +521,7 @@ static CURLFORMcode FormAdd(struct curl_httppost **httppost, if(avalue) { form = NewFormInfo(); if(!form || Curl_bufref_memdup0(&form->contenttype, avalue, - strlen(avalue))) { + strlen(avalue))) { curlx_free(form); retval = CURL_FORMADD_MEMORY; } @@ -793,10 +793,10 @@ CURLcode Curl_getformdata(CURL *data, #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wcast-function-type-strict" #endif - result = curl_mime_data_cb(part, (curl_off_t) -1, - (curl_read_callback) fread, + result = curl_mime_data_cb(part, (curl_off_t)-1, + (curl_read_callback)fread, curlx_fseek, - NULL, (void *) stdin); + NULL, (void *)stdin); #if defined(__clang__) && __clang_major__ >= 16 #pragma clang diagnostic pop #endif diff --git a/lib/ftp.c b/lib/ftp.c index 49f042c7c4..4e528259c9 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -81,8 +81,8 @@ /* macro to check for a three-digit ftp status code at the start of the given string */ -#define STATUSCODE(line) (ISDIGIT(line[0]) && ISDIGIT(line[1]) && \ - ISDIGIT(line[2])) +#define STATUSCODE(line) \ + (ISDIGIT(line[0]) && ISDIGIT(line[1]) && ISDIGIT(line[2])) /* macro to check for the last line in an FTP server response */ #define LASTLINE(line) (STATUSCODE(line) && (' ' == line[3])) @@ -1749,8 +1749,7 @@ static CURLcode ftp_epsv_disable(struct Curl_easy *data, return result; } -static CURLcode ftp_control_addr_dup(struct Curl_easy *data, - char **newhostp) +static CURLcode ftp_control_addr_dup(struct Curl_easy *data, char **newhostp) { struct connectdata *conn = data->conn; struct ip_quadruple ipquad; diff --git a/lib/hostip.c b/lib/hostip.c index ba9e3ddd7a..4f4122d6ae 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -217,7 +217,7 @@ static timediff_t dnscache_prune(struct Curl_hash *hostcache, user.oldest_ms = 0; Curl_hash_clean_with_criterium(hostcache, - (void *) &user, + (void *)&user, dnscache_entry_is_stale); return user.oldest_ms; diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c index da80f19658..850daf4139 100644 --- a/lib/http_aws_sigv4.c +++ b/lib/http_aws_sigv4.c @@ -448,7 +448,7 @@ static CURLcode calc_payload_hash(struct Curl_easy *data, else post_data_len = (size_t)data->set.postfieldsize; } - result = Curl_sha256it(sha_hash, (const unsigned char *) post_data, + result = Curl_sha256it(sha_hash, (const unsigned char *)post_data, post_data_len); if(!result) sha256_to_hex(sha_hex, sha_hash); diff --git a/lib/ldap.c b/lib/ldap.c index b6ed43d904..6104ff2073 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -143,11 +143,11 @@ static void ldap_free_urldesc_low(LDAPURLDesc *ludp); #endif /* !HAVE_LDAP_URL_PARSE */ #ifdef DEBUG_LDAP -#define LDAP_TRACE(x) \ -do { \ - ldap_trace_low("%u: ", __LINE__); \ - ldap_trace_low x; \ -} while(0) +#define LDAP_TRACE(x) \ + do { \ + ldap_trace_low("%u: ", __LINE__); \ + ldap_trace_low x; \ + } while(0) static void ldap_trace_low(const char *fmt, ...) CURL_PRINTF(1, 2); #else diff --git a/lib/url.c b/lib/url.c index 194810553e..043d7ca72c 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1769,7 +1769,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, if(!use_set_uh) { char *newurl; uc = curl_url_set(uh, CURLUPART_URL, Curl_bufref_ptr(&data->state.url), - (unsigned int) (CURLU_GUESS_SCHEME | + (unsigned int)(CURLU_GUESS_SCHEME | CURLU_NON_SUPPORT_SCHEME | (data->set.disallow_username_in_url ? CURLU_DISALLOW_USER : 0) | @@ -3199,7 +3199,7 @@ static CURLcode resolve_server(struct Curl_easy *data, #ifndef CURL_DISABLE_PROXY if(!unix_path && CONN_IS_PROXIED(conn) && conn->socks_proxy.host.name && - !strncmp(UNIX_SOCKET_PREFIX"/", + !strncmp(UNIX_SOCKET_PREFIX "/", conn->socks_proxy.host.name, sizeof(UNIX_SOCKET_PREFIX))) unix_path = conn->socks_proxy.host.name + sizeof(UNIX_SOCKET_PREFIX) - 1; #endif diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index fc2c139375..c92b53dcfc 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -452,10 +452,10 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, chlg_buf[0].cbBuffer = 0; chlg_buf[1].BufferType = SECBUFFER_PKG_PARAMS; chlg_buf[1].pvBuffer = CURL_UNCONST(request); - chlg_buf[1].cbBuffer = curlx_uztoul(strlen((const char *) request)); + chlg_buf[1].cbBuffer = curlx_uztoul(strlen((const char *)request)); chlg_buf[2].BufferType = SECBUFFER_PKG_PARAMS; chlg_buf[2].pvBuffer = CURL_UNCONST(uripath); - chlg_buf[2].cbBuffer = curlx_uztoul(strlen((const char *) uripath)); + chlg_buf[2].cbBuffer = curlx_uztoul(strlen((const char *)uripath)); chlg_buf[3].BufferType = SECBUFFER_PKG_PARAMS; chlg_buf[3].pvBuffer = NULL; chlg_buf[3].cbBuffer = 0; @@ -495,7 +495,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, } /* Populate our identity domain */ - if(Curl_override_sspi_http_realm((const char *) digest->input_token, + if(Curl_override_sspi_http_realm((const char *)digest->input_token, &identity)) { Curl_sspi_free_identity(&identity); curlx_free(output_token); @@ -552,7 +552,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, chlg_buf[0].cbBuffer = curlx_uztoul(digest->input_token_len); chlg_buf[1].BufferType = SECBUFFER_PKG_PARAMS; chlg_buf[1].pvBuffer = CURL_UNCONST(request); - chlg_buf[1].cbBuffer = curlx_uztoul(strlen((const char *) request)); + chlg_buf[1].cbBuffer = curlx_uztoul(strlen((const char *)request)); chlg_buf[2].BufferType = SECBUFFER_PKG_PARAMS; chlg_buf[2].pvBuffer = NULL; chlg_buf[2].cbBuffer = 0; @@ -565,7 +565,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, resp_buf.pvBuffer = output_token; resp_buf.cbBuffer = curlx_uztoul(token_max); - spn = curlx_convert_UTF8_to_tchar((const char *) uripath); + spn = curlx_convert_UTF8_to_tchar((const char *)uripath); if(!spn) { Curl_pSecFn->FreeCredentialsHandle(&credentials); diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c index 690ef252a0..b9eaa1e98e 100644 --- a/lib/vquic/curl_ngtcp2.c +++ b/lib/vquic/curl_ngtcp2.c @@ -73,7 +73,7 @@ #include "../curlx/warnless.h" -#define QUIC_MAX_STREAMS (256 * 1024) +#define QUIC_MAX_STREAMS (256 * 1024) #define QUIC_HANDSHAKE_TIMEOUT (10 * NGTCP2_SECONDS) /* A stream window is the maximum amount we need to buffer for @@ -91,12 +91,11 @@ * spares. Memory consumption goes down when streams run empty, * have a large upload done, etc. */ #define H3_STREAM_POOL_SPARES \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE ) / 2 + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) / 2 /* Receive and Send max number of chunks just follows from the * chunk size and window size */ #define H3_STREAM_SEND_CHUNKS \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) - + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) /* * Store ngtcp2 version info in this buffer. @@ -959,7 +958,7 @@ static CURLcode cf_ngtcp2_adjust_pollset(struct Curl_cfilter *cf, CF_DATA_SAVE(save, cf, data); c_exhaust = want_send && (!ngtcp2_conn_get_cwnd_left(ctx->qconn) || - !ngtcp2_conn_get_max_data_left(ctx->qconn)); + !ngtcp2_conn_get_max_data_left(ctx->qconn)); s_exhaust = want_send && stream && stream->id >= 0 && stream->quic_flow_blocked; want_recv = (want_recv || c_exhaust || s_exhaust); @@ -2513,7 +2512,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf, CURLcode result; const struct Curl_sockaddr_ex *sockaddr = NULL; int qfd; - static const struct alpn_spec ALPN_SPEC_H3 = {{ "h3", "h3-29" }, 2}; + static const struct alpn_spec ALPN_SPEC_H3 = { { "h3", "h3-29" }, 2 }; DEBUGASSERT(ctx->initialized); ctx->dcid.datalen = NGTCP2_MAX_CIDLEN; diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c index 73cea21a15..4e6e325295 100644 --- a/lib/vquic/curl_osslq.c +++ b/lib/vquic/curl_osslq.c @@ -70,13 +70,13 @@ * spares. Memory consumption goes down when streams run empty, * have a large upload done, etc. */ #define H3_STREAM_POOL_SPARES \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE ) / 2 + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) / 2 /* Receive and Send max number of chunks just follows from the * chunk size and window size */ #define H3_STREAM_RECV_CHUNKS \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) #define H3_STREAM_SEND_CHUNKS \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) #if defined(OPENSSL_IS_BORINGSSL) || defined(OPENSSL_IS_AWSLC) typedef uint32_t sslerr_t; @@ -87,8 +87,7 @@ typedef unsigned long sslerr_t; /* How to access `call_data` from a cf_osslq filter */ #undef CF_CTX_CALL_DATA -#define CF_CTX_CALL_DATA(cf) \ - ((struct cf_osslq_ctx *)(cf)->ctx)->call_data +#define CF_CTX_CALL_DATA(cf) ((struct cf_osslq_ctx *)(cf)->ctx)->call_data static CURLcode cf_progress_ingress(struct Curl_cfilter *cf, struct Curl_easy *data); @@ -954,7 +953,7 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int64_t stream_id, (void)conn; if(stream && stream->s.ssl) { - SSL_STREAM_RESET_ARGS args = {0}; + SSL_STREAM_RESET_ARGS args = { 0 }; args.quic_error_code = app_error_code; rv = !SSL_stream_reset(stream->s.ssl, &args, sizeof(args)); CURL_TRC_CF(data, cf, "[%" PRId64 "] reset -> %d", stream_id, rv); diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c index 7082d55916..feceaf6369 100644 --- a/lib/vquic/curl_quiche.c +++ b/lib/vquic/curl_quiche.c @@ -65,11 +65,11 @@ * stream buffer to not keep spares. Memory consumption goes down when streams * run empty, have a large upload done, etc. */ #define H3_STREAM_POOL_SPARES \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE ) / 2 + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) / 2 /* Receive and Send max number of chunks just follows from the * chunk size and window size */ #define H3_STREAM_RECV_CHUNKS \ - (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) + (H3_STREAM_WINDOW_SIZE / H3_STREAM_CHUNK_SIZE) /* * Store quiche version info in this buffer. @@ -1228,7 +1228,7 @@ static CURLcode cf_quiche_ctx_open(struct Curl_cfilter *cf, int rv; CURLcode result; const struct Curl_sockaddr_ex *sockaddr; - static const struct alpn_spec ALPN_SPEC_H3 = {{ "h3" }, 1}; + static const struct alpn_spec ALPN_SPEC_H3 = { { "h3" }, 1 }; DEBUGASSERT(ctx->q.sockfd != CURL_SOCKET_BAD); DEBUGASSERT(ctx->initialized); diff --git a/lib/vquic/vquic-tls.c b/lib/vquic/vquic-tls.c index 99b19b3691..d121b99379 100644 --- a/lib/vquic/vquic-tls.c +++ b/lib/vquic/vquic-tls.c @@ -178,12 +178,12 @@ CURLcode Curl_vquic_tls_verify_peer(struct curl_tls_ctx *ctx, if(!cert) result = CURLE_OUT_OF_MEMORY; else if(peer->sni && - (wolfSSL_X509_check_host(cert, peer->sni, strlen(peer->sni), 0, NULL) - == WOLFSSL_FAILURE)) + (wolfSSL_X509_check_host(cert, peer->sni, strlen(peer->sni), 0, + NULL) == WOLFSSL_FAILURE)) result = CURLE_PEER_FAILED_VERIFICATION; else if(!peer->sni && - (wolfSSL_X509_check_ip_asc(cert, peer->hostname, 0) - == WOLFSSL_FAILURE)) + (wolfSSL_X509_check_ip_asc(cert, peer->hostname, + 0) == WOLFSSL_FAILURE)) result = CURLE_PEER_FAILED_VERIFICATION; wolfSSL_X509_free(cert); } diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c index a4dea8a77c..125c31135e 100644 --- a/lib/vquic/vquic.c +++ b/lib/vquic/vquic.c @@ -124,7 +124,7 @@ static CURLcode do_sendmsg(struct Curl_cfilter *cf, CURLcode result = CURLE_OK; #ifdef HAVE_SENDMSG struct iovec msg_iov; - struct msghdr msg = {0}; + struct msghdr msg = { 0 }; ssize_t rv; #if defined(__linux__) && defined(UDP_SEGMENT) uint8_t msg_ctrl[32]; @@ -153,8 +153,7 @@ static CURLcode do_sendmsg(struct Curl_cfilter *cf, } #endif - while((rv = sendmsg(qctx->sockfd, &msg, 0)) == -1 && - SOCKERRNO == SOCKEINTR) + while((rv = sendmsg(qctx->sockfd, &msg, 0)) == -1 && SOCKERRNO == SOCKEINTR) ; if(!curlx_sztouz(rv, psent)) { @@ -516,7 +515,7 @@ static CURLcode recvmsg_packets(struct Curl_cfilter *cf, } curlx_strerror(SOCKERRNO, errstr, sizeof(errstr)); failf(data, "QUIC: recvmsg() unexpectedly returned %zd (errno=%d; %s)", - rc, SOCKERRNO, errstr); + rc, SOCKERRNO, errstr); result = CURLE_RECV_ERROR; goto out; } @@ -581,7 +580,7 @@ static CURLcode recvfrom_packets(struct Curl_cfilter *cf, } curlx_strerror(SOCKERRNO, errstr, sizeof(errstr)); failf(data, "QUIC: recvfrom() unexpectedly returned %zd (errno=%d; %s)", - rv, SOCKERRNO, errstr); + rv, SOCKERRNO, errstr); result = CURLE_RECV_ERROR; goto out; } diff --git a/lib/vquic/vquic_int.h b/lib/vquic/vquic_int.h index b4f2fd8116..cd8e8989d2 100644 --- a/lib/vquic/vquic_int.h +++ b/lib/vquic/vquic_int.h @@ -29,7 +29,7 @@ #ifdef USE_HTTP3 -#define MAX_PKT_BURST 10 +#define MAX_PKT_BURST 10 #define MAX_UDP_PAYLOAD_SIZE 1452 struct cf_quic_ctx { diff --git a/lib/vtls/apple.c b/lib/vtls/apple.c index 31108763a0..f076caf5ff 100644 --- a/lib/vtls/apple.c +++ b/lib/vtls/apple.c @@ -54,31 +54,31 @@ #ifdef USE_APPLE_SECTRUST #define SSL_SYSTEM_VERIFIER -#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ - && MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) \ - || (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ - && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000) +#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && \ + MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || \ + (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ + __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000) #define SUPPORTS_SecTrustEvaluateWithError 1 #endif -#if defined(SUPPORTS_SecTrustEvaluateWithError) \ - && ((defined(MAC_OS_X_VERSION_MIN_REQUIRED) \ - && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) \ - || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) \ - && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)) +#if defined(SUPPORTS_SecTrustEvaluateWithError) && \ + ((defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \ + MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || \ + (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && \ + __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)) #define REQUIRES_SecTrustEvaluateWithError 1 #endif -#if defined(SUPPORTS_SecTrustEvaluateWithError) \ - && !defined(HAVE_BUILTIN_AVAILABLE) \ - && !defined(REQUIRES_SecTrustEvaluateWithError) +#if defined(SUPPORTS_SecTrustEvaluateWithError) && \ + !defined(HAVE_BUILTIN_AVAILABLE) && \ + !defined(REQUIRES_SecTrustEvaluateWithError) #undef SUPPORTS_SecTrustEvaluateWithError #endif -#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ - && MAC_OS_X_VERSION_MAX_ALLOWED >= 100900) \ - || (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ - && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) +#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && \ + MAC_OS_X_VERSION_MAX_ALLOWED >= 100900) || \ + (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ + __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) #define SUPPORTS_SecOCSP 1 #endif diff --git a/lib/vtls/cipher_suite.c b/lib/vtls/cipher_suite.c index 3726187d7f..58d7556220 100644 --- a/lib/vtls/cipher_suite.c +++ b/lib/vtls/cipher_suite.c @@ -157,7 +157,7 @@ struct cs_entry { }; /* !checksrc! disable COMMANOSPACE all */ -static const struct cs_entry cs_list [] = { +static const struct cs_entry cs_list[] = { /* TLS 1.3 ciphers */ #if defined(USE_MBEDTLS) || defined(USE_RUSTLS) CS_ENTRY(0x1301, TLS,AES,128,GCM,SHA256,,,), @@ -549,7 +549,7 @@ static const struct cs_entry cs_list [] = { static int cs_str_to_zip(const char *cs_str, size_t cs_len, uint8_t zip[6]) { - uint8_t indexes[8] = {0}; + uint8_t indexes[8] = { 0 }; const char *entry, *cur; const char *nxt = cs_str; const char *end = cs_str + cs_len; @@ -597,7 +597,7 @@ static int cs_str_to_zip(const char *cs_str, size_t cs_len, uint8_t zip[6]) static int cs_zip_to_str(const uint8_t zip[6], char *buf, size_t buf_size) { - uint8_t indexes[8] = {0}; + uint8_t indexes[8] = { 0 }; const char *entry; char separator = '-'; int idx, i, r; diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index e1a3731457..77f9177349 100644 --- a/lib/vtls/schannel_verify.c +++ b/lib/vtls/schannel_verify.c @@ -52,8 +52,8 @@ #define BACKEND ((struct schannel_ssl_backend_data *)connssl->backend) #define MAX_CAFILE_SIZE 1048576 /* 1 MiB */ -#define BEGIN_CERT "-----BEGIN CERTIFICATE-----" -#define END_CERT "\n-----END CERTIFICATE-----" +#define BEGIN_CERT "-----BEGIN CERTIFICATE-----" +#define END_CERT "\n-----END CERTIFICATE-----" struct cert_chain_engine_config_win8 { DWORD cbSize; @@ -532,7 +532,7 @@ CURLcode Curl_verify_host(struct Curl_cfilter *cf, struct Curl_easy *data) DWORD actual_len = 0; PCERT_ALT_NAME_INFO alt_name_info = NULL; DWORD alt_name_info_size = 0; - struct num_ip_data ip_blob = {0}; + struct num_ip_data ip_blob = { 0 }; bool Win8_compat; struct num_ip_data *p = &ip_blob; DWORD i; diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c index f63a9fcb99..d1329410bf 100644 --- a/lib/vtls/x509asn1.c +++ b/lib/vtls/x509asn1.c @@ -153,7 +153,7 @@ static const struct Curl_OID OIDtable[] = { { "2.16.840.1.101.3.4.2.2", "sha384" }, { "2.16.840.1.101.3.4.2.3", "sha512" }, { "1.2.840.113549.1.9.2", "unstructuredName" }, - { (const char *) NULL, (const char *) NULL } + { (const char *)NULL, (const char *)NULL } }; #endif /* WANT_EXTRACT_CERTINFO */ diff --git a/tests/libtest/cli_h2_pausing.c b/tests/libtest/cli_h2_pausing.c index 30bcfcf043..740c9c2226 100644 --- a/tests/libtest/cli_h2_pausing.c +++ b/tests/libtest/cli_h2_pausing.c @@ -174,22 +174,22 @@ static CURLcode test_cli_h2_pausing(const char *URL) handles[i].fail_write = 1; handles[i].curl = curl_easy_init(); if(!handles[i].curl || - curl_easy_setopt(handles[i].curl, CURLOPT_WRITEFUNCTION, cb) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_WRITEDATA, &handles[i]) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_FOLLOWLOCATION, 1L) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_VERBOSE, 1L) != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_DEBUGFUNCTION, cli_debug_cb) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_SSL_VERIFYPEER, 0L) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_RESOLVE, resolve) - != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_PIPEWAIT, 1L) != CURLE_OK || - curl_easy_setopt(handles[i].curl, CURLOPT_URL, url) != CURLE_OK) { - curl_mfprintf(stderr, "failed configuring easy handle - bailing out\n"); + curl_easy_setopt(handles[i].curl, CURLOPT_WRITEFUNCTION, cb) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_WRITEDATA, &handles[i]) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_FOLLOWLOCATION, 1L) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_VERBOSE, 1L) != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_DEBUGFUNCTION, cli_debug_cb) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_SSL_VERIFYPEER, 0L) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_RESOLVE, resolve) + != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_PIPEWAIT, 1L) != CURLE_OK || + curl_easy_setopt(handles[i].curl, CURLOPT_URL, url) != CURLE_OK) { + curl_mfprintf(stderr, "failed configuring easy handle - bailing out\n"); res = (CURLcode)2; goto cleanup; } diff --git a/tests/libtest/cli_hx_download.c b/tests/libtest/cli_hx_download.c index d139ea28f7..ca1e343a8d 100644 --- a/tests/libtest/cli_hx_download.c +++ b/tests/libtest/cli_hx_download.c @@ -178,8 +178,8 @@ static int my_progress_d_cb(void *userdata, #endif #ifdef USE_MBEDTLS case CURLSSLBACKEND_MBEDTLS: { - const char *version = mbedtls_ssl_get_version( - (mbedtls_ssl_context*)tls->internals); + const char *version = + mbedtls_ssl_get_version((mbedtls_ssl_context *)tls->internals); assert(version); assert(strcmp(version, "unknown")); curl_mfprintf(stderr, "[t-%zu] info mbedTLS using %s\n", @@ -190,7 +190,7 @@ static int my_progress_d_cb(void *userdata, #ifdef USE_RUSTLS case CURLSSLBACKEND_RUSTLS: { int v = rustls_connection_get_protocol_version( - (struct rustls_connection*)tls->internals); + (struct rustls_connection *)tls->internals); assert(v); curl_mfprintf(stderr, "[t-%zu] info rustls TLS version 0x%x\n", t->idx, v); @@ -514,8 +514,8 @@ static CURLcode test_cli_hx_download(const char *URL) if(!t->started) { t->curl = curl_easy_init(); if(!t->curl || - setup_hx_download(t->curl, url, t, http_version, host, share, - use_earlydata, fresh_connect)) { + setup_hx_download(t->curl, url, t, http_version, host, share, + use_earlydata, fresh_connect)) { curl_mfprintf(stderr, "[t-%zu] FAILED setup\n", i); res = (CURLcode)1; goto cleanup; diff --git a/tests/libtest/first.c b/tests/libtest/first.c index e384971c7e..f060560371 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -62,7 +62,7 @@ int unitfail; /* for unittests */ int coptind; const char *coptarg; -int cgetopt(int argc, const char *const argv[], const char *optstring) +int cgetopt(int argc, const char * const argv[], const char *optstring) { static int optpos = 1; int coptopt; @@ -141,7 +141,7 @@ static void memory_tracking_init(void) } } #else -# define memory_tracking_init() Curl_nop_stmt +#define memory_tracking_init() Curl_nop_stmt #endif /* returns a hexdump in a static memory area */ diff --git a/tests/libtest/first.h b/tests/libtest/first.h index 5fa587686b..2ad600ef60 100644 --- a/tests/libtest/first.h +++ b/tests/libtest/first.h @@ -59,11 +59,11 @@ extern int unitfail; /* for unittests */ #define CURL_GNUC_DIAG #endif -#define test_setopt(A,B,C) \ +#define test_setopt(A, B, C) \ if((res = curl_easy_setopt((A), (B), (C))) != CURLE_OK) \ goto test_cleanup -#define test_multi_setopt(A,B,C) \ +#define test_multi_setopt(A, B, C) \ if((res = curl_multi_setopt((A), (B), (C))) != CURLE_OK) \ goto test_cleanup @@ -79,7 +79,7 @@ extern struct curltime tv_test_start; /* for test timing */ extern int coptind; extern const char *coptarg; -int cgetopt(int argc, const char *const argv[], const char *optstring); +int cgetopt(int argc, const char * const argv[], const char *optstring); extern int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc, struct timeval *tv); @@ -100,18 +100,18 @@ void ws_close(CURL *curl); ** For portability reasons TEST_ERR_* values should be less than 127. */ -#define TEST_ERR_MAJOR_BAD CURLE_OBSOLETE20 -#define TEST_ERR_RUNS_FOREVER CURLE_OBSOLETE24 -#define TEST_ERR_EASY_INIT CURLE_OBSOLETE29 -#define TEST_ERR_MULTI CURLE_OBSOLETE32 -#define TEST_ERR_NUM_HANDLES CURLE_OBSOLETE34 -#define TEST_ERR_SELECT CURLE_OBSOLETE40 -#define TEST_ERR_SUCCESS CURLE_OBSOLETE41 -#define TEST_ERR_FAILURE CURLE_OBSOLETE44 -#define TEST_ERR_USAGE CURLE_OBSOLETE46 -#define TEST_ERR_FOPEN CURLE_OBSOLETE50 -#define TEST_ERR_FSTAT CURLE_OBSOLETE51 -#define TEST_ERR_BAD_TIMEOUT CURLE_OBSOLETE57 +#define TEST_ERR_MAJOR_BAD CURLE_OBSOLETE20 +#define TEST_ERR_RUNS_FOREVER CURLE_OBSOLETE24 +#define TEST_ERR_EASY_INIT CURLE_OBSOLETE29 +#define TEST_ERR_MULTI CURLE_OBSOLETE32 +#define TEST_ERR_NUM_HANDLES CURLE_OBSOLETE34 +#define TEST_ERR_SELECT CURLE_OBSOLETE40 +#define TEST_ERR_SUCCESS CURLE_OBSOLETE41 +#define TEST_ERR_FAILURE CURLE_OBSOLETE44 +#define TEST_ERR_USAGE CURLE_OBSOLETE46 +#define TEST_ERR_FOPEN CURLE_OBSOLETE50 +#define TEST_ERR_FSTAT CURLE_OBSOLETE51 +#define TEST_ERR_BAD_TIMEOUT CURLE_OBSOLETE57 /* ** Macros for test source code readability/maintainability. @@ -144,7 +144,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_easy_init(A,Y,Z) do { \ +#define exe_easy_init(A, Y, Z) do { \ if(((A) = curl_easy_init()) == NULL) { \ curl_mfprintf(stderr, "%s:%d curl_easy_init() failed\n", (Y), (Z)); \ res = TEST_ERR_EASY_INIT; \ @@ -154,10 +154,10 @@ void ws_close(CURL *curl); #define res_easy_init(A) \ exe_easy_init((A), (__FILE__), (__LINE__)) -#define chk_easy_init(A,Y,Z) do { \ - exe_easy_init((A), (Y), (Z)); \ - if(res) \ - goto test_cleanup; \ +#define chk_easy_init(A, Y, Z) do { \ + exe_easy_init((A), (Y), (Z)); \ + if(res) \ + goto test_cleanup; \ } while(0) #define easy_init(A) \ @@ -165,7 +165,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_init(A,Y,Z) do { \ +#define exe_multi_init(A, Y, Z) do { \ if(((A) = curl_multi_init()) == NULL) { \ curl_mfprintf(stderr, "%s:%d curl_multi_init() failed\n", (Y), (Z)); \ res = TEST_ERR_MULTI; \ @@ -175,10 +175,10 @@ void ws_close(CURL *curl); #define res_multi_init(A) \ exe_multi_init((A), (__FILE__), (__LINE__)) -#define chk_multi_init(A,Y,Z) do { \ - exe_multi_init((A), (Y), (Z)); \ - if(res) \ - goto test_cleanup; \ +#define chk_multi_init(A, Y, Z) do { \ + exe_multi_init((A), (Y), (Z)); \ + if(res) \ + goto test_cleanup; \ } while(0) #define multi_init(A) \ @@ -186,7 +186,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_easy_setopt(A,B,C,Y,Z) do { \ +#define exe_easy_setopt(A, B, C, Y, Z) do { \ CURLcode ec; \ if((ec = curl_easy_setopt((A), (B), (C))) != CURLE_OK) { \ curl_mfprintf(stderr, "%s:%d curl_easy_setopt() failed, " \ @@ -220,21 +220,21 @@ void ws_close(CURL *curl); } \ } while(0) -#define res_multi_setopt(A,B,C) \ +#define res_multi_setopt(A, B, C) \ exe_multi_setopt((A), (B), (C), (__FILE__), (__LINE__)) -#define chk_multi_setopt(A,B,C,Y,Z) do { \ +#define chk_multi_setopt(A, B, C, Y, Z) do { \ exe_multi_setopt((A), (B), (C), (Y), (Z)); \ if(res) \ goto test_cleanup; \ } while(0) -#define multi_setopt(A,B,C) \ +#define multi_setopt(A, B, C) \ chk_multi_setopt((A), (B), (C), (__FILE__), (__LINE__)) /* ---------------------------------------------------------------- */ -#define exe_multi_add_handle(A,B,Y,Z) do { \ +#define exe_multi_add_handle(A, B, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_add_handle((A), (B))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_add_handle() failed, " \ @@ -258,7 +258,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_remove_handle(A,B,Y,Z) do { \ +#define exe_multi_remove_handle(A, B, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_remove_handle((A), (B))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_remove_handle() failed, " \ @@ -283,7 +283,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_perform(A,B,Y,Z) do { \ +#define exe_multi_perform(A, B, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_perform((A), (B))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_perform() failed, " \ @@ -308,7 +308,7 @@ void ws_close(CURL *curl); goto test_cleanup; \ } while(0) -#define multi_perform(A,B) \ +#define multi_perform(A, B) \ chk_multi_perform((A), (B), (__FILE__), (__LINE__)) /* ---------------------------------------------------------------- */ @@ -343,7 +343,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_timeout(A,B,Y,Z) do { \ +#define exe_multi_timeout(A, B, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_timeout((A), (B))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_timeout() failed, " \ @@ -373,7 +373,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_poll(A,B,C,D,E,Y,Z) do { \ +#define exe_multi_poll(A, B, C, D, E, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_poll((A), (B), (C), (D), (E))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_poll() failed, " \ @@ -403,7 +403,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_multi_wakeup(A,Y,Z) do { \ +#define exe_multi_wakeup(A, Y, Z) do { \ CURLMcode ec; \ if((ec = curl_multi_wakeup((A))) != CURLM_OK) { \ curl_mfprintf(stderr, "%s:%d curl_multi_wakeup() failed, " \ @@ -460,7 +460,7 @@ void ws_close(CURL *curl); #define TEST_HANG_TIMEOUT 60 * 1000 /* global default */ -#define exe_test_timedout(T,Y,Z) do { \ +#define exe_test_timedout(T, Y, Z) do { \ timediff_t timediff = curlx_timediff_ms(curlx_now(), tv_test_start); \ if(timediff > (T)) { \ curl_mfprintf(stderr, "%s:%d ABORTING TEST, since it seems " \ @@ -490,7 +490,7 @@ void ws_close(CURL *curl); /* ---------------------------------------------------------------- */ -#define exe_global_init(A,Y,Z) do { \ +#define exe_global_init(A, Y, Z) do { \ CURLcode ec; \ if((ec = curl_global_init((A))) != CURLE_OK) { \ curl_mfprintf(stderr, "%s:%d curl_global_init() failed, " \ diff --git a/tests/libtest/lib1156.c b/tests/libtest/lib1156.c index 1468b35e1c..bfabd4b412 100644 --- a/tests/libtest/lib1156.c +++ b/tests/libtest/lib1156.c @@ -34,11 +34,11 @@ */ -#define F_RESUME (1 << 0) /* resume/range. */ -#define F_HTTP416 (1 << 1) /* Server returns http code 416. */ -#define F_FAIL (1 << 2) /* Fail on error. */ -#define F_CONTENTRANGE (1 << 3) /* Server sends content-range hdr. */ -#define F_IGNOREBODY (1 << 4) /* Body should be ignored. */ +#define F_RESUME (1 << 0) /* resume/range. */ +#define F_HTTP416 (1 << 1) /* Server returns http code 416. */ +#define F_FAIL (1 << 2) /* Fail on error. */ +#define F_CONTENTRANGE (1 << 3) /* Server sends content-range hdr. */ +#define F_IGNOREBODY (1 << 4) /* Body should be ignored. */ struct testparams { unsigned int flags; /* ORed flags as above. */ diff --git a/tests/libtest/lib1506.c b/tests/libtest/lib1506.c index 8b986c59a0..a2d60e1757 100644 --- a/tests/libtest/lib1506.c +++ b/tests/libtest/lib1506.c @@ -26,7 +26,7 @@ static CURLcode test_lib1506(const char *URL) { CURLcode res = CURLE_OK; - CURL *curl[NUM_HANDLES] = {0}; + CURL *curl[NUM_HANDLES] = { 0 }; int running; CURLM *multi = NULL; size_t i; diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c index 16648d7e56..e5c78d3e63 100644 --- a/tests/libtest/lib1512.c +++ b/tests/libtest/lib1512.c @@ -33,7 +33,7 @@ static CURLcode test_lib1512(const char *URL) { CURLcode res = CURLE_OK; - CURL *curl[2] = {NULL, NULL}; + CURL *curl[2] = { NULL, NULL }; const char *port = libtest_arg3; const char *address = libtest_arg2; char dnsentry[256]; diff --git a/tests/libtest/lib1514.c b/tests/libtest/lib1514.c index 0ae61d41e8..be81c0e556 100644 --- a/tests/libtest/lib1514.c +++ b/tests/libtest/lib1514.c @@ -57,7 +57,7 @@ static CURLcode test_lib1514(const char *URL) static char testdata[] = "dummy"; - struct t1514_WriteThis pooh = { testdata, sizeof(testdata)-1 }; + struct t1514_WriteThis pooh = { testdata, sizeof(testdata) - 1 }; global_init(CURL_GLOBAL_ALL); diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c index 076ab564d0..f6e41f16b1 100644 --- a/tests/libtest/lib1520.c +++ b/tests/libtest/lib1520.c @@ -68,7 +68,7 @@ static CURLcode test_lib1520(const char *URL) CURLcode res; CURL *curl; struct curl_slist *rcpt_list = NULL; - struct upload_status upload_ctx = {0}; + struct upload_status upload_ctx = { 0 }; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { curl_mfprintf(stderr, "curl_global_init() failed\n"); diff --git a/tests/libtest/lib1537.c b/tests/libtest/lib1537.c index f521986ebc..9d59725fcf 100644 --- a/tests/libtest/lib1537.c +++ b/tests/libtest/lib1537.c @@ -25,8 +25,8 @@ static CURLcode test_lib1537(const char *URL) { - const unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7}; + const unsigned char a[] = { 0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7 }; CURLcode res = CURLE_OK; char *ptr = NULL; int asize; diff --git a/tests/libtest/lib1541.c b/tests/libtest/lib1541.c index c39bee989c..f1c8c6791a 100644 --- a/tests/libtest/lib1541.c +++ b/tests/libtest/lib1541.c @@ -29,7 +29,7 @@ struct t1541_transfer_status { int bd_count; }; -#define KN(a) a, #a +#define KN(a) a, #a static void t1541_geterr(const char *name, CURLcode val, int lineno) { diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c index b328dd27bc..bd9fead1ea 100644 --- a/tests/libtest/lib1550.c +++ b/tests/libtest/lib1550.c @@ -30,9 +30,9 @@ static CURLcode test_lib1550(const char *URL) CURLM *multi; CURLcode res = CURLE_OK; static const char * const bl_servers[] = - {"Microsoft-IIS/6.0", "nginx/0.8.54", NULL}; + { "Microsoft-IIS/6.0", "nginx/0.8.54", NULL }; static const char * const bl_sites[] = - {"curl.se:443", "example.com:80", NULL}; + { "curl.se:443", "example.com:80", NULL }; global_init(CURL_GLOBAL_ALL); multi = curl_multi_init(); diff --git a/tests/libtest/lib1556.c b/tests/libtest/lib1556.c index e852bb3224..94d409295b 100644 --- a/tests/libtest/lib1556.c +++ b/tests/libtest/lib1556.c @@ -45,7 +45,7 @@ static CURLcode test_lib1556(const char *URL) CURLcode code; CURL *curl = NULL; CURLcode res = CURLE_OK; - struct headerinfo info = {0}; + struct headerinfo info = { 0 }; global_init(CURL_GLOBAL_ALL); diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index d080d38aa8..deb24be9dc 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -1859,18 +1859,18 @@ static int get_nothing(void) return 0; } -static const struct clearurlcase clear_url_list[] ={ - {CURLUPART_SCHEME, "http", NULL, CURLUE_NO_SCHEME}, - {CURLUPART_USER, "user", NULL, CURLUE_NO_USER}, - {CURLUPART_PASSWORD, "password", NULL, CURLUE_NO_PASSWORD}, - {CURLUPART_OPTIONS, "options", NULL, CURLUE_NO_OPTIONS}, - {CURLUPART_HOST, "host", NULL, CURLUE_NO_HOST}, - {CURLUPART_ZONEID, "eth0", NULL, CURLUE_NO_ZONEID}, - {CURLUPART_PORT, "1234", NULL, CURLUE_NO_PORT}, - {CURLUPART_PATH, "/hello", "/", CURLUE_OK}, - {CURLUPART_QUERY, "a=b", NULL, CURLUE_NO_QUERY}, - {CURLUPART_FRAGMENT, "anchor", NULL, CURLUE_NO_FRAGMENT}, - {CURLUPART_URL, NULL, NULL, CURLUE_OK}, +static const struct clearurlcase clear_url_list[] = { + { CURLUPART_SCHEME, "http", NULL, CURLUE_NO_SCHEME }, + { CURLUPART_USER, "user", NULL, CURLUE_NO_USER }, + { CURLUPART_PASSWORD, "password", NULL, CURLUE_NO_PASSWORD }, + { CURLUPART_OPTIONS, "options", NULL, CURLUE_NO_OPTIONS }, + { CURLUPART_HOST, "host", NULL, CURLUE_NO_HOST }, + { CURLUPART_ZONEID, "eth0", NULL, CURLUE_NO_ZONEID }, + { CURLUPART_PORT, "1234", NULL, CURLUE_NO_PORT }, + { CURLUPART_PATH, "/hello", "/", CURLUE_OK }, + { CURLUPART_QUERY, "a=b", NULL, CURLUE_NO_QUERY }, + { CURLUPART_FRAGMENT, "anchor", NULL, CURLUE_NO_FRAGMENT }, + { CURLUPART_URL, NULL, NULL, CURLUE_OK }, }; static int clear_url(void) @@ -1935,7 +1935,7 @@ static int huge(void) memset(&bigpart[1], 'a', sizeof(bigpart) - 2); bigpart[sizeof(bigpart) - 1] = 0; - for(i = 0; i < 7; i++) { + for(i = 0; i < 7; i++) { char *partp; curl_msnprintf(total, sizeof(total), "%s://%s:%s@%s/%s?%s#%s", diff --git a/tests/libtest/lib1565.c b/tests/libtest/lib1565.c index 506959dd90..5bc0e3465d 100644 --- a/tests/libtest/lib1565.c +++ b/tests/libtest/lib1565.c @@ -26,7 +26,7 @@ #ifdef HAVE_PTHREAD_H #include -#define CONN_NUM 3 +#define CONN_NUM 3 #define TIME_BETWEEN_START_SECS 2 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/tests/libtest/lib1597.c b/tests/libtest/lib1597.c index 0e86517ead..d5124a5141 100644 --- a/tests/libtest/lib1597.c +++ b/tests/libtest/lib1597.c @@ -36,7 +36,7 @@ static CURLcode test_lib1597(const char *URL) CURL *curl = NULL; CURLcode res = CURLE_OK; curl_version_info_data *curlinfo; - const char *const *proto; + const char * const *proto; int n; int i; static CURLcode ok = CURLE_OK; @@ -47,22 +47,22 @@ static CURLcode test_lib1597(const char *URL) static char protolist[1024]; static const struct pair prots[] = { - {"goobar", &unsup}, - {"http ", &unsup}, - {" http", &unsup}, - {"http", &httpcode}, - {"http,", &httpcode}, - {"https,", &httpscode}, - {"https,http", &httpscode}, - {"http,http", &httpcode}, - {"HTTP,HTTP", &httpcode}, - {",HTTP,HTTP", &httpcode}, - {"http,http,ft", &unsup}, - {"", &bad}, - {",,", &bad}, - {protolist, &ok}, - {"all", &ok}, - {NULL, NULL}, + { "goobar", &unsup }, + { "http ", &unsup }, + { " http", &unsup }, + { "http", &httpcode }, + { "http,", &httpcode }, + { "https,", &httpscode }, + { "https,http", &httpscode }, + { "http,http", &httpcode }, + { "HTTP,HTTP", &httpcode }, + { ",HTTP,HTTP", &httpcode }, + { "http,http,ft", &unsup }, + { "", &bad }, + { ",,", &bad }, + { protolist, &ok }, + { "all", &ok }, + { NULL, NULL }, }; (void)URL; diff --git a/tests/libtest/lib1911.c b/tests/libtest/lib1911.c index 0f88752b6f..9ec6874918 100644 --- a/tests/libtest/lib1911.c +++ b/tests/libtest/lib1911.c @@ -49,9 +49,7 @@ static CURLcode test_lib1911(const char *URL) curl_mprintf("string length: %zu\n", strlen(testbuf)); - for(o = curl_easy_option_next(NULL); - o; - o = curl_easy_option_next(o)) { + for(o = curl_easy_option_next(NULL); o; o = curl_easy_option_next(o)) { if(o->type == CURLOT_STRING) { CURLcode res; /* diff --git a/tests/libtest/lib1912.c b/tests/libtest/lib1912.c index 76ba51c447..98623bd339 100644 --- a/tests/libtest/lib1912.c +++ b/tests/libtest/lib1912.c @@ -33,9 +33,7 @@ static CURLcode test_lib1912(const char *URL) int error = 0; #ifdef CURLINC_TYPECHECK_GCC_H const struct curl_easyoption *o; - for(o = curl_easy_option_next(NULL); - o; - o = curl_easy_option_next(o)) { + for(o = curl_easy_option_next(NULL); o; o = curl_easy_option_next(o)) { /* Test for mismatch OR missing typecheck macros */ if(curlcheck_long_option(o->id) != (o->type == CURLOT_LONG || o->type == CURLOT_VALUES)) { diff --git a/tests/libtest/lib1915.c b/tests/libtest/lib1915.c index adb589a8c0..406cea0205 100644 --- a/tests/libtest/lib1915.c +++ b/tests/libtest/lib1915.c @@ -97,7 +97,7 @@ static CURLcode test_lib1915(const char *URL) { CURLcode res = CURLE_OK; CURL *curl; - struct state st = {0}; + struct state st = { 0 }; global_init(CURL_GLOBAL_ALL); diff --git a/tests/libtest/lib1918.c b/tests/libtest/lib1918.c index d995639164..1c8ccb78f9 100644 --- a/tests/libtest/lib1918.c +++ b/tests/libtest/lib1918.c @@ -30,9 +30,7 @@ static CURLcode test_lib1918(const char *URL) curl_global_init(CURL_GLOBAL_ALL); - for(o = curl_easy_option_next(NULL); - o; - o = curl_easy_option_next(o)) { + for(o = curl_easy_option_next(NULL); o; o = curl_easy_option_next(o)) { const struct curl_easyoption *ename = curl_easy_option_by_name(o->name); const struct curl_easyoption *eid = diff --git a/tests/libtest/lib1938.c b/tests/libtest/lib1938.c index b585c53c01..b93f993a45 100644 --- a/tests/libtest/lib1938.c +++ b/tests/libtest/lib1938.c @@ -29,7 +29,7 @@ static CURLcode test_lib1938(const char *URL) CURLcode res = TEST_ERR_MAJOR_BAD; struct curl_slist *connect_to = NULL; struct curl_slist *list = NULL; - unsigned char data[] = {0x70, 0x6f, 0x73, 0x74, 0, 0x44, 0x61, 0x74, 0x61}; + unsigned char data[] = { 0x70, 0x6f, 0x73, 0x74, 0, 0x44, 0x61, 0x74, 0x61 }; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { curl_mfprintf(stderr, "curl_global_init() failed\n"); diff --git a/tests/libtest/lib2032.c b/tests/libtest/lib2032.c index a9cb298571..7dc549f84e 100644 --- a/tests/libtest/lib2032.c +++ b/tests/libtest/lib2032.c @@ -75,7 +75,7 @@ static size_t callback(char *ptr, size_t size, size_t nmemb, void *data) return size * nmemb; } -static CURLcode test_lib2032(const char *URL) /* libntlmconnect */ +static CURLcode test_lib2032(const char *URL) /* libntlmconnect */ { enum HandleState { ReadyForNewHandle, @@ -175,10 +175,9 @@ static CURLcode test_lib2032(const char *URL) /* libntlmconnect */ "handle (trying again)\n"); continue; } - state = num_handles < MAX_EASY_HANDLES ? ReadyForNewHandle - : NoMoreHandles; - curl_mfprintf(stderr, "%s:%d new state %d\n", - __FILE__, __LINE__, state); + state = + num_handles < MAX_EASY_HANDLES ? ReadyForNewHandle : NoMoreHandles; + curl_mfprintf(stderr, "%s:%d new state %d\n", __FILE__, __LINE__, state); } multi_timeout(multi, &timeout); diff --git a/tests/libtest/lib2301.c b/tests/libtest/lib2301.c index 6fb9e48618..70c40fa4c7 100644 --- a/tests/libtest/lib2301.c +++ b/tests/libtest/lib2301.c @@ -46,9 +46,7 @@ static size_t t2301_write_cb(char *b, size_t size, size_t nitems, void *p) unsigned char *buffer = (unsigned char *)b; size_t i; size_t sent; - unsigned char pong[] = { - 0x8a, 0x0 - }; + unsigned char pong[] = { 0x8a, 0x0 }; size_t incoming = nitems; curl_mfprintf(stderr, "Called CURLOPT_WRITEFUNCTION with %zu bytes: ", nitems); diff --git a/tests/libtest/lib2402.c b/tests/libtest/lib2402.c index 49d87d1cd4..5f727f98e6 100644 --- a/tests/libtest/lib2402.c +++ b/tests/libtest/lib2402.c @@ -26,7 +26,7 @@ static CURLcode test_lib2402(const char *URL) { CURLcode res = CURLE_OK; - CURL *curl[NUM_HANDLES] = {0}; + CURL *curl[NUM_HANDLES] = { 0 }; int running; CURLM *multi = NULL; size_t i; diff --git a/tests/libtest/lib2404.c b/tests/libtest/lib2404.c index c202597447..ef83a2509e 100644 --- a/tests/libtest/lib2404.c +++ b/tests/libtest/lib2404.c @@ -26,7 +26,7 @@ static CURLcode test_lib2404(const char *URL) { CURLcode res = CURLE_OK; - CURL *curl[NUM_HANDLES] = {0}; + CURL *curl[NUM_HANDLES] = { 0 }; int running; CURLM *multi = NULL; size_t i; diff --git a/tests/libtest/lib2405.c b/tests/libtest/lib2405.c index 89ab659bdd..7979d122e4 100644 --- a/tests/libtest/lib2405.c +++ b/tests/libtest/lib2405.c @@ -41,22 +41,23 @@ /* ---------------------------------------------------------------- */ -#define test_check(expected_fds) \ - if(res != CURLE_OK) { \ - curl_mfprintf(stderr, "test failed with code: %d\n", res); \ - goto test_cleanup; \ - } \ - else if(fd_count != expected_fds) { \ +#define test_check(expected_fds) \ + if(res != CURLE_OK) { \ + curl_mfprintf(stderr, "test failed with code: %d\n", res); \ + goto test_cleanup; \ + } \ + else if(fd_count != expected_fds) { \ curl_mfprintf(stderr, "Max number of waitfds: %u not as expected: %u\n", \ - fd_count, expected_fds); \ - res = TEST_ERR_FAILURE; \ - goto test_cleanup; \ + fd_count, expected_fds); \ + res = TEST_ERR_FAILURE; \ + goto test_cleanup; \ } -#define test_run_check(option, expected_fds) do { \ - res = test_run(URL, option, &fd_count); \ - test_check(expected_fds); \ -} while(0) +#define test_run_check(option, expected_fds) \ + do { \ + res = test_run(URL, option, &fd_count); \ + test_check(expected_fds); \ + } while(0) /* ---------------------------------------------------------------- */ diff --git a/tests/libtest/lib2502.c b/tests/libtest/lib2502.c index 48a8a93f0f..d7ab413f25 100644 --- a/tests/libtest/lib2502.c +++ b/tests/libtest/lib2502.c @@ -28,7 +28,7 @@ static CURLcode test_lib2502(const char *URL) { CURLcode res = CURLE_OK; - CURL *curl[NUM_HANDLES] = {0}; + CURL *curl[NUM_HANDLES] = { 0 }; int running; CURLM *multi = NULL; size_t i; diff --git a/tests/libtest/lib3207.c b/tests/libtest/lib3207.c index 8b20b311eb..76dcf4bac9 100644 --- a/tests/libtest/lib3207.c +++ b/tests/libtest/lib3207.c @@ -29,7 +29,7 @@ #include "curl_threads.h" -#define THREAD_SIZE 16 +#define THREAD_SIZE 16 #define PER_THREAD_SIZE 8 struct Ctx { diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index c065eb87c8..4f074da8ab 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -76,8 +76,10 @@ static void custom_free(void *ptr) static CURLcode test_lib509(const char *URL) { - static const unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7}; + static const unsigned char a[] = { + 0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7 + }; CURLcode res; CURL *curl; int asize; diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index 843c5c03f0..379e2e70d0 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -31,130 +31,130 @@ static CURLcode test_lib517(const char *URL) }; static const struct dcheck dates[] = { - {"Sun, 06 Nov 1994 08:49:37 GMT", 784111777 }, - {"Sunday, 06-Nov-94 08:49:37 GMT", 784111777 }, - {"Sun Nov 6 08:49:37 1994", 784111777 }, - {"Sun Nov 6 8:49:37 1994", 784111777 }, - {"Sun Nov 6 8:9:37 1994", 784109377 }, - {"Sun Nov 6 008:09:37 1994", -1 }, - {"Nov Sun 6 8:9:7 1994", 784109347 }, - {"06 Nov 1994 08:49:37 GMT", 784111777 }, - {"06-Nov-94 08:49:37 GMT", 784111777 }, - {"Nov 6 08:49:37 1994", 784111777 }, - {"06 Nov 1994 08:49:37", 784111777 }, - {"06-Nov-94 08:49:37", 784111777 }, - {"1994 Nov 6 08:49:37", 784111777 }, - {"GMT 08:49:37 06-Nov-94 Sunday", 784111777 }, - {"94 6 Nov 08:49:37", 784111777 }, - {"1994 Nov 6", 784080000 }, - {"06-Nov-94", 784080000 }, - {"Sun Nov 6 94", 784080000 }, - {"1994.Nov.6", 784080000 }, - {"Sun/Nov/6/94/GMT", 784080000 }, - {"Sun, 06 Nov 1994 08:49:37 CET", 784108177 }, - {"06 Nov 1994 08:49:37 EST", 784129777 }, - {"Sun, 06 Nov 1994 08:49:37 UT", 784111777 }, - {"Sun, 12 Sep 2004 15:05:58 -0700", 1095026758 }, - {"Sat, 11 Sep 2004 21:32:11 +0200", 1094931131 }, - {"20040912 15:05:58 -0700", 1095026758 }, - {"20040911 +0200", 1094853600 }, - {"Thu, 01-Jan-1970 00:59:59 GMT", 3599 }, - {"Thu, 01-Jan-1970 01:00:00 GMT", 3600 }, - {"Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, - {"Thu, 19-Apr-2007 16:00:00 GMT", 1176998400 }, - {"Wed, 25 Apr 2007 21:02:13 GMT", 1177534933 }, - {"Thu, 19/Apr\\2007 16:00:00 GMT", 1176998400 }, - {"Fri, 1 Jan 2010 01:01:50 GMT", 1262307710 }, - {"Wednesday, 1-Jan-2003 00:00:00 GMT", 1041379200 }, - {", 1-Jan-2003 00:00:00 GMT", 1041379200 }, - {"1-Jan-2003 00:00:00 GMT", 1041379200 }, - {"1-Jan-2003 00:00:00 GMT", 1041379200 }, - {"Wed,18-Apr-07 22:50:12 GMT", 1176936612 }, - {"WillyWonka , 18-Apr-07 22:50:12 GMT", -1 }, - {"WillyWonka , 18-Apr-07 22:50:12", -1 }, - {"WillyWonka , 18-apr-07 22:50:12", -1 }, - {"Mon, 18-Apr-1977 22:50:13 GMT", 230251813 }, - {"Mon, 18-Apr-77 22:50:13 GMT", 230251813 }, - {"Sat, 15-Apr-17\"21:01:22\"GMT", 1492290082 }, - {"Partyday, 18- April-07 22:50:12", -1 }, - {"Partyday, 18 - Apri-07 22:50:12", -1 }, - {"Wednes, 1-Januar-2003 00:00:00 GMT", -1 },/* spellchecker:disable-line */ - {"Sat, 15-Apr-17 21:01:22", 1492290082 }, - {"Sat, 15-Apr-17 21:01:22 GMT-2", 1492290082 }, - {"Sat, 15-Apr-17 21:01:22 GMT BLAH", 1492290082 }, - {"Sat, 15-Apr-17 21:01:22 GMT-0400", 1492290082 }, - {"Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)", 1492290082 }, - {"Sat, 15-Apr-17 21:01:22 DST", -1 }, - {"Sat, 15-Apr-17 21:01:22 -0400", 1492304482 }, - {"Sat, 15-Apr-17 21:01:22 (hello there)", -1 }, - {"Sat, 15-Apr-17 21:01:22 11:22:33", -1 }, - {"Sat, 15-Apr-17 ::00 21:01:22", -1 }, - {"Sat, 15-Apr-17 boink:z 21:01:22", -1 }, - {"Sat, 15-Apr-17 91:22:33 21:01:22", -1 }, - {"Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, - {"22:50:12 Thu Apr 18 2007 GMT", 1176936612 }, - {"Thu 22:50:12 Apr 18 2007 GMT", 1176936612 }, - {"Thu Apr 22:50:12 18 2007 GMT", 1176936612 }, - {"Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, - {"Thu Apr 18 2007 22:50:12 GMT", 1176936612 }, - {"Thu Apr 18 2007 GMT 22:50:12", 1176936612 }, + { "Sun, 06 Nov 1994 08:49:37 GMT", 784111777 }, + { "Sunday, 06-Nov-94 08:49:37 GMT", 784111777 }, + { "Sun Nov 6 08:49:37 1994", 784111777 }, + { "Sun Nov 6 8:49:37 1994", 784111777 }, + { "Sun Nov 6 8:9:37 1994", 784109377 }, + { "Sun Nov 6 008:09:37 1994", -1 }, + { "Nov Sun 6 8:9:7 1994", 784109347 }, + { "06 Nov 1994 08:49:37 GMT", 784111777 }, + { "06-Nov-94 08:49:37 GMT", 784111777 }, + { "Nov 6 08:49:37 1994", 784111777 }, + { "06 Nov 1994 08:49:37", 784111777 }, + { "06-Nov-94 08:49:37", 784111777 }, + { "1994 Nov 6 08:49:37", 784111777 }, + { "GMT 08:49:37 06-Nov-94 Sunday", 784111777 }, + { "94 6 Nov 08:49:37", 784111777 }, + { "1994 Nov 6", 784080000 }, + { "06-Nov-94", 784080000 }, + { "Sun Nov 6 94", 784080000 }, + { "1994.Nov.6", 784080000 }, + { "Sun/Nov/6/94/GMT", 784080000 }, + { "Sun, 06 Nov 1994 08:49:37 CET", 784108177 }, + { "06 Nov 1994 08:49:37 EST", 784129777 }, + { "Sun, 06 Nov 1994 08:49:37 UT", 784111777 }, + { "Sun, 12 Sep 2004 15:05:58 -0700", 1095026758 }, + { "Sat, 11 Sep 2004 21:32:11 +0200", 1094931131 }, + { "20040912 15:05:58 -0700", 1095026758 }, + { "20040911 +0200", 1094853600 }, + { "Thu, 01-Jan-1970 00:59:59 GMT", 3599 }, + { "Thu, 01-Jan-1970 01:00:00 GMT", 3600 }, + { "Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, + { "Thu, 19-Apr-2007 16:00:00 GMT", 1176998400 }, + { "Wed, 25 Apr 2007 21:02:13 GMT", 1177534933 }, + { "Thu, 19/Apr\\2007 16:00:00 GMT", 1176998400 }, + { "Fri, 1 Jan 2010 01:01:50 GMT", 1262307710 }, + { "Wednesday, 1-Jan-2003 00:00:00 GMT", 1041379200 }, + { ", 1-Jan-2003 00:00:00 GMT", 1041379200 }, + { "1-Jan-2003 00:00:00 GMT", 1041379200 }, + { "1-Jan-2003 00:00:00 GMT", 1041379200 }, + { "Wed,18-Apr-07 22:50:12 GMT", 1176936612 }, + { "WillyWonka , 18-Apr-07 22:50:12 GMT", -1 }, + { "WillyWonka , 18-Apr-07 22:50:12", -1 }, + { "WillyWonka , 18-apr-07 22:50:12", -1 }, + { "Mon, 18-Apr-1977 22:50:13 GMT", 230251813 }, + { "Mon, 18-Apr-77 22:50:13 GMT", 230251813 }, + { "Sat, 15-Apr-17\"21:01:22\"GMT", 1492290082 }, + { "Partyday, 18- April-07 22:50:12", -1 }, + { "Partyday, 18 - Apri-07 22:50:12", -1 }, + { "Wednes, 1-Januar-2003 00:00:00 GMT", -1 }, + { "Sat, 15-Apr-17 21:01:22", 1492290082 }, + { "Sat, 15-Apr-17 21:01:22 GMT-2", 1492290082 }, + { "Sat, 15-Apr-17 21:01:22 GMT BLAH", 1492290082 }, + { "Sat, 15-Apr-17 21:01:22 GMT-0400", 1492290082 }, + { "Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)", 1492290082 }, + { "Sat, 15-Apr-17 21:01:22 DST", -1 }, + { "Sat, 15-Apr-17 21:01:22 -0400", 1492304482 }, + { "Sat, 15-Apr-17 21:01:22 (hello there)", -1 }, + { "Sat, 15-Apr-17 21:01:22 11:22:33", -1 }, + { "Sat, 15-Apr-17 ::00 21:01:22", -1 }, + { "Sat, 15-Apr-17 boink:z 21:01:22", -1 }, + { "Sat, 15-Apr-17 91:22:33 21:01:22", -1 }, + { "Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, + { "22:50:12 Thu Apr 18 2007 GMT", 1176936612 }, + { "Thu 22:50:12 Apr 18 2007 GMT", 1176936612 }, + { "Thu Apr 22:50:12 18 2007 GMT", 1176936612 }, + { "Thu Apr 18 22:50:12 2007 GMT", 1176936612 }, + { "Thu Apr 18 2007 22:50:12 GMT", 1176936612 }, + { "Thu Apr 18 2007 GMT 22:50:12", 1176936612 }, - {"\"Thu Apr 18 22:50:12 2007 GMT\"", 1176936612 }, - {"-\"22:50:12 Thu Apr 18 2007 GMT\"", 1176936612 }, - {"*\"Thu 22:50:12 Apr 18 2007 GMT\"", 1176936612 }, - {";\"Thu Apr 22:50:12 18 2007 GMT\"", 1176936612 }, - {".\"Thu Apr 18 22:50:12 2007 GMT\"", 1176936612 }, - {"\"Thu Apr 18 2007 22:50:12 GMT\"", 1176936612 }, - {"\"Thu Apr 18 2007 GMT 22:50:12\"", 1176936612 }, + { "\"Thu Apr 18 22:50:12 2007 GMT\"", 1176936612 }, + { "-\"22:50:12 Thu Apr 18 2007 GMT\"", 1176936612 }, + { "*\"Thu 22:50:12 Apr 18 2007 GMT\"", 1176936612 }, + { ";\"Thu Apr 22:50:12 18 2007 GMT\"", 1176936612 }, + { ".\"Thu Apr 18 22:50:12 2007 GMT\"", 1176936612 }, + { "\"Thu Apr 18 2007 22:50:12 GMT\"", 1176936612 }, + { "\"Thu Apr 18 2007 GMT 22:50:12\"", 1176936612 }, - {"Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, - {"15-Sat, Apr-17 21:01:22 GMT", 1492290082 }, - {"15-Sat, Apr 21:01:22 GMT 17", 1492290082 }, - {"15-Sat, Apr 21:01:22 GMT 2017", 1492290082 }, - {"15 Apr 21:01:22 2017", 1492290082 }, - {"15 17 Apr 21:01:22", 1492290082 }, - {"Apr 15 17 21:01:22", 1492290082 }, - {"Apr 15 21:01:22 17", 1492290082 }, - {"2017 April 15 21:01:22", -1 }, - {"15 April 2017 21:01:22", -1 }, - {"98 April 17 21:01:22", -1 }, - {"Thu, 012-Aug-2008 20:49:07 GMT", 1218574147 }, - {"Thu, 999999999999-Aug-2007 20:49:07 GMT", -1 }, - {"Thu, 12-Aug-2007 20:61:99999999999 GMT", -1 }, - {"IAintNoDateFool", -1 }, - {"Thu Apr 18 22:50 2007 GMT", 1176936600 }, - {"20110623 12:34:56", 1308832496 }, - {"20110632 12:34:56", -1 }, - {"20110623 56:34:56", -1 }, - {"20111323 12:34:56", -1 }, - {"20110623 12:34:79", -1 }, - {"Wed, 31 Dec 2008 23:59:60 GMT", 1230768000 }, - {"Wed, 31 Dec 2008 23:59:61 GMT", -1 }, - {"Wed, 31 Dec 2008 24:00:00 GMT", -1 }, - {"Wed, 31 Dec 2008 23:60:59 GMT", -1 }, - {"20110623 12:3", 1308830580 }, - {"20110623 1:3", 1308790980 }, - {"20110623 1:30", 1308792600 }, - {"20110623 12:12:3", 1308831123 }, - {"20110623 01:12:3", 1308791523 }, - {"20110623 01:99:30", -1 }, - {"Thu, 01-Jan-1970 00:00:00 GMT", 0 }, - {"Thu, 31-Dec-1969 23:59:58 GMT", -2 }, - {"Thu, 31-Dec-1969 23:59:59 GMT", 0 }, /* avoids -1 ! */ + { "Sat, 15-Apr-17 21:01:22 GMT", 1492290082 }, + { "15-Sat, Apr-17 21:01:22 GMT", 1492290082 }, + { "15-Sat, Apr 21:01:22 GMT 17", 1492290082 }, + { "15-Sat, Apr 21:01:22 GMT 2017", 1492290082 }, + { "15 Apr 21:01:22 2017", 1492290082 }, + { "15 17 Apr 21:01:22", 1492290082 }, + { "Apr 15 17 21:01:22", 1492290082 }, + { "Apr 15 21:01:22 17", 1492290082 }, + { "2017 April 15 21:01:22", -1 }, + { "15 April 2017 21:01:22", -1 }, + { "98 April 17 21:01:22", -1 }, + { "Thu, 012-Aug-2008 20:49:07 GMT", 1218574147 }, + { "Thu, 999999999999-Aug-2007 20:49:07 GMT", -1 }, + { "Thu, 12-Aug-2007 20:61:99999999999 GMT", -1 }, + { "IAintNoDateFool", -1 }, + { "Thu Apr 18 22:50 2007 GMT", 1176936600 }, + { "20110623 12:34:56", 1308832496 }, + { "20110632 12:34:56", -1 }, + { "20110623 56:34:56", -1 }, + { "20111323 12:34:56", -1 }, + { "20110623 12:34:79", -1 }, + { "Wed, 31 Dec 2008 23:59:60 GMT", 1230768000 }, + { "Wed, 31 Dec 2008 23:59:61 GMT", -1 }, + { "Wed, 31 Dec 2008 24:00:00 GMT", -1 }, + { "Wed, 31 Dec 2008 23:60:59 GMT", -1 }, + { "20110623 12:3", 1308830580 }, + { "20110623 1:3", 1308790980 }, + { "20110623 1:30", 1308792600 }, + { "20110623 12:12:3", 1308831123 }, + { "20110623 01:12:3", 1308791523 }, + { "20110623 01:99:30", -1 }, + { "Thu, 01-Jan-1970 00:00:00 GMT", 0 }, + { "Thu, 31-Dec-1969 23:59:58 GMT", -2 }, + { "Thu, 31-Dec-1969 23:59:59 GMT", 0 }, /* avoids -1 ! */ #if SIZEOF_TIME_T > 4 - {"Sun, 06 Nov 2044 08:49:37 GMT", (time_t)2362034977LL }, - {"Sun, 06 Nov 3144 08:49:37 GMT", 37074617377 }, + { "Sun, 06 Nov 2044 08:49:37 GMT", (time_t)2362034977LL }, + { "Sun, 06 Nov 3144 08:49:37 GMT", 37074617377 }, #ifndef HAVE_TIME_T_UNSIGNED - {"Sun, 06 Nov 1900 08:49:37 GMT", (time_t)-2182259423LL }, - {"Sun, 06 Nov 1800 08:49:37 GMT", -5337933023 }, - {"Thu, 01-Jan-1583 00:00:00 GMT", -12212553600 }, + { "Sun, 06 Nov 1900 08:49:37 GMT", (time_t)-2182259423LL }, + { "Sun, 06 Nov 1800 08:49:37 GMT", -5337933023 }, + { "Thu, 01-Jan-1583 00:00:00 GMT", -12212553600 }, #endif /* HAVE_TIME_T_UNSIGNED */ - {"Thu, 01-Jan-1499 00:00:00 GMT", -1 }, + { "Thu, 01-Jan-1499 00:00:00 GMT", -1 }, #else - {"Sun, 06 Nov 2044 08:49:37 GMT", -1 }, + { "Sun, 06 Nov 2044 08:49:37 GMT", -1 }, #endif /* SIZEOF_TIME_T > 4 */ #ifndef HAVE_TIME_T_UNSIGNED - {"Sun, 06 Nov 1968 08:49:37 GMT", -36342623 }, + { "Sun, 06 Nov 1968 08:49:37 GMT", -36342623 }, #endif /* !HAVE_TIME_T_UNSIGNED */ { NULL, 0 } }; diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index d785857bb1..5488d4db04 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -31,8 +31,8 @@ #define T518_SAFETY_MARGIN (16) -#define NUM_OPEN (FD_SETSIZE + 10) -#define NUM_NEEDED (NUM_OPEN + T518_SAFETY_MARGIN) +#define NUM_OPEN (FD_SETSIZE + 10) +#define NUM_NEEDED (NUM_OPEN + T518_SAFETY_MARGIN) #if defined(_WIN32) || defined(MSDOS) #define DEV_NULL "NUL" diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index f32d64b303..4e18436136 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -52,7 +52,6 @@ static void t530_msg(const char *msg) curl_mfprintf(stderr, "%s %s\n", t530_tag(), msg); } - struct t530_Sockets { curl_socket_t *sockets; int count; /* number of sockets actually stored in array */ @@ -285,9 +284,9 @@ static CURLcode testone(const char *URL, int timer_fail_at, int socket_fail_at) CURLcode res = CURLE_OK; CURL *curl = NULL; CURLM *multi = NULL; - struct t530_ReadWriteSockets sockets = {{NULL, 0, 0}, {NULL, 0, 0}}; + struct t530_ReadWriteSockets sockets = { { NULL, 0, 0 }, { NULL, 0, 0 } }; int success = 0; - struct curltime timeout = {0}; + struct curltime timeout = { 0 }; timeout.tv_sec = (time_t)-1; /* set the limits */ @@ -328,7 +327,7 @@ static CURLcode testone(const char *URL, int timer_fail_at, int socket_fail_at) while(!t530_checkForCompletion(multi, &success)) { fd_set readSet, writeSet; curl_socket_t maxFd = 0; - struct timeval tv = {0}; + struct timeval tv = { 0 }; tv.tv_sec = 10; FD_ZERO(&readSet); diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 31c5e30612..24d166b5cc 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -118,7 +118,7 @@ static int t537_test_rlimit(int keep_open) /* If the OS allows a HUGE number of open files, we do not run. * Modern debian sid reports a limit of 134217724 and this tests * takes minutes. */ -#define LIMIT_CAP (256 * 1024) +#define LIMIT_CAP (256 * 1024) if(rl.rlim_cur > LIMIT_CAP) { curl_mfprintf(stderr, "soft limit above %ld, not running\n", (long)LIMIT_CAP); diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index 9938d269ad..670f45e540 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -28,9 +28,10 @@ static CURLcode test_lib543(const char *URL) { static const unsigned char a[] = { - 0x9c, 0x26, 0x4b, 0x3d, 0x49, 0x4, 0xa1, 0x1, - 0xe0, 0xd8, 0x7c, 0x20, 0xb7, 0xef, 0x53, 0x29, 0xfa, - 0x1d, 0x57, 0xe1}; + 0x9c, 0x26, 0x4b, 0x3d, 0x49, 0x4, 0xa1, 0x1, + 0xe0, 0xd8, 0x7c, 0x20, 0xb7, 0xef, 0x53, 0x29, 0xfa, + 0x1d, 0x57, 0xe1 + }; CURL *curl; CURLcode res = CURLE_OK; diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index 0d72af3042..77daeb5da8 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -32,7 +32,8 @@ static CURLcode test_lib544(const char *URL) 'T', 'h', 'i', 's', '\0', ' ', 'i', 's', ' ', 't', 'e', 's', 't', ' ', 'b', 'i', 'n', 'a', 'r', 'y', ' ', 'd', 'a', 't', 'a', ' ', 'w', 'i', 't', 'h', ' ', 'a', 'n', ' ', - 'e', 'm', 'b', 'e', 'd', 'd', 'e', 'd', ' ', 'N', 'U', 'L'}; + 'e', 'm', 'b', 'e', 'd', 'd', 'e', 'd', ' ', 'N', 'U', 'L' + }; char teststring[sizeof(teststring_init)]; diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index 4bc2568a46..cbf4b3013c 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -50,7 +50,7 @@ static size_t myreadfunc(char *ptr, size_t size, size_t nmemb, void *stream) return size; } -#define NUM_HEADERS 8 +#define NUM_HEADERS 8 #define SIZE_HEADERS 5000 static CURLcode test_lib553(const char *URL) diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 9c4f7f9b9f..edf7590732 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -46,7 +46,7 @@ #endif #endif -#define BUFSZ 256 +#define BUFSZ 256 struct unsshort_st { unsigned short num; /* unsigned short */ @@ -1166,9 +1166,9 @@ static int test_width_precision(void) { /* 325 is max precision (and width) for a double */ char larger[1024]; -#define SPACE60 " " +#define SPACE60 " " #define SPACE300 SPACE60 SPACE60 SPACE60 SPACE60 SPACE60 -#define OK325 SPACE300 " 0" +#define OK325 SPACE300 " 0" int rc; int errors = 0; diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index 94dd7f57b8..27afa3c9d3 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -25,8 +25,8 @@ static CURLcode test_lib558(const char *URL) { - unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7}; + unsigned char a[] = { 0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7 }; CURLcode res = CURLE_OK; char *ptr = NULL; int asize; diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index 7ee7bc9525..ae5f5d40b3 100644 --- a/tests/libtest/lib576.c +++ b/tests/libtest/lib576.c @@ -98,7 +98,7 @@ static CURLcode test_lib576(const char *URL) { CURL *curl = NULL; CURLcode res = CURLE_OK; - struct chunk_data chunk_data = {0, 0}; + struct chunk_data chunk_data = { 0, 0 }; curl_global_init(CURL_GLOBAL_ALL); curl = curl_easy_init(); if(!curl) { diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index dabebed6ce..3940d9c470 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -229,9 +229,9 @@ static CURLcode test_lib582(const char *URL) int hd; struct_stat file_info; CURLM *multi = NULL; - struct t582_ReadWriteSockets sockets = {{NULL, 0, 0}, {NULL, 0, 0}}; + struct t582_ReadWriteSockets sockets = { { NULL, 0, 0 }, { NULL, 0, 0 } }; int success = 0; - struct curltime timeout = {0}; + struct curltime timeout = { 0 }; timeout.tv_sec = (time_t)-1; assert(test_argc >= 5); @@ -304,7 +304,7 @@ static CURLcode test_lib582(const char *URL) while(!t582_checkForCompletion(multi, &success)) { fd_set readSet, writeSet; curl_socket_t maxFd = 0; - struct timeval tv = {0}; + struct timeval tv = { 0 }; tv.tv_sec = 10; FD_ZERO(&readSet); diff --git a/tests/libtest/lib654.c b/tests/libtest/lib654.c index 7d519d6453..37afec4f5a 100644 --- a/tests/libtest/lib654.c +++ b/tests/libtest/lib654.c @@ -107,7 +107,7 @@ static CURLcode test_lib654(const char *URL) part = curl_mime_addpart(mime); curl_mime_filedata(part, libtest_arg2); part = curl_mime_addpart(mime); - curl_mime_data_cb(part, (curl_off_t) -1, t654_read_cb, NULL, + curl_mime_data_cb(part, (curl_off_t)-1, t654_read_cb, NULL, free_callback, &pooh); /* Bind mime data to its easy handle. */ diff --git a/tests/libtest/lib670.c b/tests/libtest/lib670.c index 886bf39a72..08dd7cfa08 100644 --- a/tests/libtest/lib670.c +++ b/tests/libtest/lib670.c @@ -23,7 +23,7 @@ ***************************************************************************/ #include "first.h" -#define PAUSE_TIME 5 +#define PAUSE_TIME 5 struct t670_ReadThis { CURL *curl; diff --git a/tests/libtest/lib678.c b/tests/libtest/lib678.c index 525407fddc..3214694c7d 100644 --- a/tests/libtest/lib678.c +++ b/tests/libtest/lib678.c @@ -97,7 +97,7 @@ static CURLcode test_lib678(const char *URL) curl_global_init(CURL_GLOBAL_DEFAULT); if(!strcmp("check", URL)) { CURLcode w = CURLE_OK; - struct curl_blob blob = {0}; + struct curl_blob blob = { 0 }; CURL *curl = curl_easy_init(); if(curl) { w = curl_easy_setopt(curl, CURLOPT_CAINFO_BLOB, &blob); diff --git a/tests/libtest/lib758.c b/tests/libtest/lib758.c index fadb1db6fd..37bc3b0e62 100644 --- a/tests/libtest/lib758.c +++ b/tests/libtest/lib758.c @@ -57,8 +57,7 @@ static struct t758_ctx { static const char *t758_tag(void) { - curl_msnprintf(t758_ctx.buf, sizeof(t758_ctx.buf), - "[T758-%d-%d] [%d/%d]", + curl_msnprintf(t758_ctx.buf, sizeof(t758_ctx.buf), "[T758-%d-%d] [%d/%d]", t758_ctx.max_socket_calls, t758_ctx.max_timer_calls, t758_ctx.socket_calls, t758_ctx.timer_calls); return t758_ctx.buf; @@ -204,8 +203,8 @@ static int t758_cert_verify_callback(X509_STORE_CTX *ctx, void *arg) { SSL *ssl; (void)arg; - ssl = (SSL *)X509_STORE_CTX_get_ex_data(ctx, - SSL_get_ex_data_X509_STORE_CTX_idx()); + ssl = (SSL *)X509_STORE_CTX_get_ex_data( + ctx, SSL_get_ex_data_X509_STORE_CTX_idx()); t758_ctx.number_of_cert_verify_callbacks++; if(!t758_ctx.fake_async_cert_verification_pending) { t758_ctx.fake_async_cert_verification_pending = 1; @@ -222,8 +221,8 @@ static int t758_cert_verify_callback(X509_STORE_CTX *ctx, void *arg) } } -static CURLcode -t758_set_ssl_ctx_callback(CURL *curl, void *ssl_ctx, void *clientp) +static CURLcode t758_set_ssl_ctx_callback(CURL *curl, void *ssl_ctx, + void *clientp) { SSL_CTX *ctx = (SSL_CTX *)ssl_ctx; (void)curl; @@ -333,9 +332,9 @@ static CURLcode t758_one(const char *URL, int timer_fail_at, CURLcode res = CURLE_OK; CURL *curl = NULL; CURLM *multi = NULL; - struct t758_ReadWriteSockets sockets = {{NULL, 0, 0}, {NULL, 0, 0}}; + struct t758_ReadWriteSockets sockets = { { NULL, 0, 0 }, { NULL, 0, 0 } }; int success = 0; - struct curltime timeout = {0}; + struct curltime timeout = { 0 }; timeout.tv_sec = (time_t)-1; /* set the limits */ @@ -390,7 +389,7 @@ static CURLcode t758_one(const char *URL, int timer_fail_at, while(!t758_checkForCompletion(multi, &success)) { fd_set readSet, writeSet; curl_socket_t maxFd = 0; - struct timeval tv = {0}; + struct timeval tv = { 0 }; tv.tv_sec = 10; if(t758_ctx.fake_async_cert_verification_pending && diff --git a/tests/libtest/memptr.c b/tests/libtest/memptr.c index fe90b01a6c..3c383d9003 100644 --- a/tests/libtest/memptr.c +++ b/tests/libtest/memptr.c @@ -26,8 +26,8 @@ #ifndef CURL_STATICLIB #if defined(_MSC_VER) && defined(_DLL) -# pragma warning(push) -# pragma warning(disable:4232) /* MSVC extension, dllimport identity */ +#pragma warning(push) +#pragma warning(disable:4232) /* MSVC extension, dllimport identity */ #endif /* when libcurl is *not* static and we build libtests, the global pointers in @@ -44,7 +44,7 @@ curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)strdup; curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc; #if defined(_MSC_VER) && defined(_DLL) -# pragma warning(pop) +#pragma warning(pop) #endif #endif /* !CURL_STATICLIB */ diff --git a/tests/server/dnsd.c b/tests/server/dnsd.c index 58bbd2f3f8..eaf56b03fb 100644 --- a/tests/server/dnsd.c +++ b/tests/server/dnsd.c @@ -59,8 +59,8 @@ static int qname(const unsigned char **pkt, size_t *size) return 0; } -#define QTYPE_A 1 -#define QTYPE_AAAA 28 +#define QTYPE_A 1 +#define QTYPE_AAAA 28 #define QTYPE_HTTPS 0x41 static const char *type2string(unsigned short qtype) @@ -497,8 +497,7 @@ static int test_dnsd(int argc, char **argv) } flag = 1; - if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, - (void *)&flag, sizeof(flag))) { + if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, curlx_strerror(error, errbuf, sizeof(errbuf))); diff --git a/tests/server/getpart.c b/tests/server/getpart.c index becde4a9bb..d76368e016 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -243,7 +243,7 @@ static int decodedata(char **buf, /* dest buffer */ int getpart(char **outbuf, size_t *outlen, const char *main, const char *sub, FILE *stream) { -# define MAX_TAG_LEN 200 +#define MAX_TAG_LEN 200 char curouter[MAX_TAG_LEN + 1]; /* current outermost section */ char curmain[MAX_TAG_LEN + 1]; /* current main section */ char cursub[MAX_TAG_LEN + 1]; /* current sub section */ diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 081b038d07..64ba64dc69 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -55,7 +55,7 @@ struct mqttd_configurable { int testnum; }; -#define REQUEST_DUMP "server.input" +#define REQUEST_DUMP "server.input" #define CONFIG_VERSION 5 static struct mqttd_configurable m_config; @@ -152,7 +152,6 @@ static void logprotocol(mqttdir dir, prefix, (int)remlen, data); } - /* return 0 on success */ static int connack(FILE *dump, curl_socket_t fd) { @@ -179,7 +178,7 @@ static int connack(FILE *dump, curl_socket_t fd) /* return 0 on success */ static int suback(FILE *dump, curl_socket_t fd, unsigned short packetid) { - unsigned char packet[]={ + unsigned char packet[] = { MQTT_MSG_SUBACK, 0x03, 0, 0, /* filled in below */ 0x00 @@ -202,7 +201,7 @@ static int suback(FILE *dump, curl_socket_t fd, unsigned short packetid) /* return 0 on success */ static int puback(FILE *dump, curl_socket_t fd, unsigned short packetid) { - unsigned char packet[]={ + unsigned char packet[] = { MQTT_MSG_PUBACK, 0x00, 0, 0 /* filled in below */ }; @@ -225,7 +224,7 @@ static int puback(FILE *dump, curl_socket_t fd, unsigned short packetid) /* return 0 on success */ static int disconnect(FILE *dump, curl_socket_t fd) { - unsigned char packet[]={ + unsigned char packet[] = { MQTT_MSG_DISCONNECT, 0x00, }; ssize_t rc = swrite(fd, (char *)packet, sizeof(packet)); @@ -364,7 +363,7 @@ static int publish(FILE *dump, return 1; } -#define MAX_TOPIC_LENGTH 65535 +#define MAX_TOPIC_LENGTH 65535 #define MAX_CLIENT_ID_LENGTH 32 static char topic[MAX_TOPIC_LENGTH + 1]; diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 8425623940..6c7aa1e9d0 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -88,10 +88,10 @@ struct rtspd_httprequest { #define RESPONSE_DUMP "server.response" /* very-big-path support */ -#define MAXDOCNAMELEN 140000 +#define MAXDOCNAMELEN 140000 #define MAXDOCNAMELEN_TXT "139999" -#define REQUEST_KEYWORD_SIZE 256 +#define REQUEST_KEYWORD_SIZE 256 #define REQUEST_KEYWORD_SIZE_TXT "255" #define CMD_AUTH_REQUIRED "auth_required" @@ -110,14 +110,15 @@ static const char *docquit_rtsp = "HTTP/1.1 200 Goodbye" END_OF_HEADERS; /* sent as reply to a CONNECT */ static const char *docconnect = -"HTTP/1.1 200 Mighty fine indeed" END_OF_HEADERS; + "HTTP/1.1 200 Mighty fine indeed" END_OF_HEADERS; /* sent as reply to a "bad" CONNECT */ static const char *docbadconnect = -"HTTP/1.1 501 Forbidden you fool" END_OF_HEADERS; + "HTTP/1.1 501 Forbidden you fool" END_OF_HEADERS; /* send back this on HTTP 404 file not found */ -static const char *doc404_HTTP = "HTTP/1.1 404 Not Found\r\n" +static const char *doc404_HTTP = + "HTTP/1.1 404 Not Found\r\n" "Server: " RTSPDVERSION "\r\n" "Connection: close\r\n" "Content-Type: text/html" @@ -128,7 +129,8 @@ static const char *doc404_HTTP = "HTTP/1.1 404 Not Found\r\n" "\n" "

Not Found

\n" "The requested URL was not found on this server.\n" - "

" RTSPDVERSION "
\n" "\n"; + "

" RTSPDVERSION "
\n" + "\n"; /* send back this on RTSP 404 file not found */ static const char *doc404_RTSP = "RTSP/1.0 404 Not Found\r\n" @@ -1021,8 +1023,7 @@ static int test_rtspd(int argc, char *argv[]) curl_off_t num; if(!strcmp("--version", argv[arg])) { printf("rtspd IPv4%s" - "\n" - , + "\n", #ifdef USE_IPV6 "/IPv6" #else diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 9560a39676..db0261bf14 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -173,7 +173,7 @@ static ssize_t write_wincon(int fd, const void *buf, size_t count) /* On Windows, we sometimes get this for a broken pipe, seemingly * when the client just closed stdin? */ -#define CURL_WIN32_EPIPE 109 +#define CURL_WIN32_EPIPE 109 /* * fullread is a wrapper around the read() function. This will repeat the call @@ -888,7 +888,6 @@ static bool disc_handshake(void) logmsg("Throwing away data bytes"); if(!read_data_block(buffer, sizeof(buffer), &buffer_len)) return FALSE; - } else if(!memcmp("QUIT", buffer, 4)) { /* just die */ @@ -1339,31 +1338,31 @@ static int test_sockfilt(int argc, char *argv[]) /* Active mode, we should connect to the given port number */ mode = ACTIVE; switch(socket_domain) { - case AF_INET: - memset(&me.sa4, 0, sizeof(me.sa4)); - me.sa4.sin_family = AF_INET; - me.sa4.sin_port = htons(server_connectport); - me.sa4.sin_addr.s_addr = INADDR_ANY; - if(!addr) - addr = "127.0.0.1"; - curlx_inet_pton(AF_INET, addr, &me.sa4.sin_addr); - - rc = connect(sock, &me.sa, sizeof(me.sa4)); - break; + case AF_INET: + memset(&me.sa4, 0, sizeof(me.sa4)); + me.sa4.sin_family = AF_INET; + me.sa4.sin_port = htons(server_connectport); + me.sa4.sin_addr.s_addr = INADDR_ANY; + if(!addr) + addr = "127.0.0.1"; + curlx_inet_pton(AF_INET, addr, &me.sa4.sin_addr); + + rc = connect(sock, &me.sa, sizeof(me.sa4)); + break; #ifdef USE_IPV6 - case AF_INET6: - memset(&me.sa6, 0, sizeof(me.sa6)); - me.sa6.sin6_family = AF_INET6; - me.sa6.sin6_port = htons(server_connectport); - if(!addr) - addr = "::1"; - curlx_inet_pton(AF_INET6, addr, &me.sa6.sin6_addr); - - rc = connect(sock, &me.sa, sizeof(me.sa6)); - break; + case AF_INET6: + memset(&me.sa6, 0, sizeof(me.sa6)); + me.sa6.sin6_family = AF_INET6; + me.sa6.sin6_port = htons(server_connectport); + if(!addr) + addr = "::1"; + curlx_inet_pton(AF_INET6, addr, &me.sa6.sin6_addr); + + rc = connect(sock, &me.sa, sizeof(me.sa6)); + break; #endif /* USE_IPV6 */ - default: - rc = 1; + default: + rc = 1; } if(rc) { error = SOCKERRNO; diff --git a/tests/server/socksd.c b/tests/server/socksd.c index f9fadd2113..99adb727fb 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -76,15 +76,15 @@ struct socksd_configurable { char password[256]; }; -#define CONFIG_VERSION 5 -#define CONFIG_NMETHODS_MIN 1 /* unauth, gssapi, auth */ -#define CONFIG_NMETHODS_MAX 3 +#define CONFIG_VERSION 5 +#define CONFIG_NMETHODS_MIN 1 /* unauth, gssapi, auth */ +#define CONFIG_NMETHODS_MAX 3 #define CONFIG_RESPONSEVERSION CONFIG_VERSION -#define CONFIG_RESPONSEMETHOD 0 /* no auth */ -#define CONFIG_REQCMD 1 /* CONNECT */ -#define CONFIG_PORT backendport -#define CONFIG_ADDR backendaddr -#define CONFIG_CONNECTREP 0 +#define CONFIG_RESPONSEMETHOD 0 /* no auth */ +#define CONFIG_REQCMD 1 /* CONNECT */ +#define CONFIG_PORT backendport +#define CONFIG_ADDR backendaddr +#define CONFIG_CONNECTREP 0 static struct socksd_configurable s_config; @@ -185,24 +185,24 @@ static void socksd_getconfig(void) } /* RFC 1928, SOCKS5 byte index */ -#define SOCKS5_VERSION 0 +#define SOCKS5_VERSION 0 #define SOCKS5_NMETHODS 1 /* number of methods that is listed */ /* in the request: */ -#define SOCKS5_REQCMD 1 +#define SOCKS5_REQCMD 1 #define SOCKS5_RESERVED 2 -#define SOCKS5_ATYP 3 -#define SOCKS5_DSTADDR 4 +#define SOCKS5_ATYP 3 +#define SOCKS5_DSTADDR 4 /* connect response */ -#define SOCKS5_REP 1 +#define SOCKS5_REP 1 #define SOCKS5_BNDADDR 4 /* auth request */ -#define SOCKS5_ULEN 1 +#define SOCKS5_ULEN 1 #define SOCKS5_UNAME 2 -#define SOCKS4_CD 1 +#define SOCKS4_CD 1 #define SOCKS4_DSTPORT 2 /* connect to a given IPv4 address, not the one asked for */ diff --git a/tests/server/sws.c b/tests/server/sws.c index 13f7455469..56135a8326 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -104,10 +104,10 @@ static size_t num_sockets = 0; static const char *cmdfile = "log/server.cmd"; /* very-big-path support */ -#define MAXDOCNAMELEN 140000 +#define MAXDOCNAMELEN 140000 #define MAXDOCNAMELEN_TXT "139999" -#define REQUEST_KEYWORD_SIZE 256 +#define REQUEST_KEYWORD_SIZE 256 #define REQUEST_KEYWORD_SIZE_TXT "255" #define CMD_AUTH_REQUIRED "auth_required" @@ -141,7 +141,8 @@ static const char *end_of_headers = END_OF_HEADERS; static const char *docquit_sws = "HTTP/1.1 200 Goodbye" END_OF_HEADERS; /* send back this on 404 file not found */ -static const char *doc404 = "HTTP/1.1 404 Not Found\r\n" +static const char *doc404 = + "HTTP/1.1 404 Not Found\r\n" "Server: " SWSVERSION "\r\n" "Connection: close\r\n" "Content-Type: text/html" @@ -152,7 +153,8 @@ static const char *doc404 = "HTTP/1.1 404 Not Found\r\n" "\n" "

Not Found

\n" "The requested URL was not found on this server.\n" - "

" SWSVERSION "
\n" "\n"; + "

" SWSVERSION "
\n" + "\n"; /* work around for handling trailing headers */ static int already_recv_zeroed_chunk = FALSE; @@ -332,8 +334,7 @@ static int sws_ProcessRequest(struct sws_httprequest *req) char *httppath = NULL; size_t npath = 0; /* httppath length */ - if(sscanf(line, - "%" REQUEST_KEYWORD_SIZE_TXT "s ", request) == 1) { + if(sscanf(line, "%" REQUEST_KEYWORD_SIZE_TXT "s ", request) == 1) { http = strstr(line + strlen(request), "HTTP/"); if(http && sscanf(http, "HTTP/%d.%d", &prot_major, &prot_minor) == 2) { @@ -833,7 +834,7 @@ static int sws_get_request(curl_socket_t sock, struct sws_httprequest *req) int rc; fd_set input; fd_set output; - struct timeval timeout = {0}; + struct timeval timeout = { 0 }; timeout.tv_sec = 1; /* 1000 ms */ logmsg("Got EAGAIN from sread"); @@ -1318,7 +1319,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) error = SOCKERRNO; if((error == SOCKEINPROGRESS) || (error == SOCKEWOULDBLOCK)) { fd_set output; - struct timeval timeout = {0}; + struct timeval timeout = { 0 }; timeout.tv_sec = 1; /* 1000 ms */ FD_ZERO(&output); @@ -1386,8 +1387,8 @@ success: #define data_or_ctrl(x) ((x) ? "DATA" : "CTRL") -#define SWS_CTRL 0 -#define SWS_DATA 1 +#define SWS_CTRL 0 +#define SWS_DATA 1 static void http_connect(curl_socket_t *infdp, curl_socket_t rootfd, @@ -1395,10 +1396,10 @@ static void http_connect(curl_socket_t *infdp, unsigned short ipport, int keepalive_secs) { - curl_socket_t serverfd[2] = {CURL_SOCKET_BAD, CURL_SOCKET_BAD}; - curl_socket_t clientfd[2] = {CURL_SOCKET_BAD, CURL_SOCKET_BAD}; - ssize_t toc[2] = {0, 0}; /* number of bytes to client */ - ssize_t tos[2] = {0, 0}; /* number of bytes to server */ + curl_socket_t serverfd[2] = { CURL_SOCKET_BAD, CURL_SOCKET_BAD }; + curl_socket_t clientfd[2] = { CURL_SOCKET_BAD, CURL_SOCKET_BAD }; + ssize_t toc[2] = { 0, 0 }; /* number of bytes to client */ + ssize_t tos[2] = { 0, 0 }; /* number of bytes to server */ char readclient[2][256]; char readserver[2][256]; bool poll_client_rd[2] = { TRUE, TRUE }; @@ -1441,7 +1442,7 @@ static void http_connect(curl_socket_t *infdp, fd_set output; ssize_t rc; curl_socket_t maxfd = (curl_socket_t)-1; - struct timeval timeout = {0}; + struct timeval timeout = { 0 }; timeout.tv_sec = 1; /* 1000 ms */ FD_ZERO(&input); @@ -2176,8 +2177,7 @@ static int test_sws(int argc, char *argv[]) } flag = 1; - if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, - (void *)&flag, sizeof(flag))) { + if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) { error = SOCKERRNO; logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s", error, curlx_strerror(error, errbuf, sizeof(errbuf))); @@ -2314,7 +2314,7 @@ static int test_sws(int argc, char *argv[]) fd_set output; curl_socket_t maxfd = (curl_socket_t)-1; int active; - struct timeval timeout = {0}; + struct timeval timeout = { 0 }; timeout.tv_usec = 250000L; /* 250 ms */ /* Clear out closed sockets */ @@ -2458,7 +2458,7 @@ sws_cleanup: for(socket_idx = 1; socket_idx < num_sockets; ++socket_idx) if((all_sockets[socket_idx] != sock) && - (all_sockets[socket_idx] != CURL_SOCKET_BAD)) + (all_sockets[socket_idx] != CURL_SOCKET_BAD)) sclose(all_sockets[socket_idx]); if(sock != CURL_SOCKET_BAD) diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 99c008031e..d1867e7c87 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -70,8 +70,8 @@ #include /***************************************************************************** -* This is a rewrite/clone of the arpa/tftp.h file for systems without it. * -*****************************************************************************/ + * This is a rewrite/clone of the arpa/tftp.h file for systems without it. * + *****************************************************************************/ #define SEGSIZE 512 /* data segment size */ #if defined(__GNUC__) && ((__GNUC__ >= 3) || \ @@ -105,8 +105,8 @@ struct tftphdr { #define TFTP_ENOUSER 7 /***************************************************************************** -* STRUCT DECLARATIONS AND DEFINES * -*****************************************************************************/ + * STRUCT DECLARATIONS AND DEFINES * + *****************************************************************************/ #ifndef PKTSIZE #define PKTSIZE (SEGSIZE + 4) /* SEGSIZE defined in arpa/tftp.h */ @@ -157,13 +157,13 @@ struct bf { #define opcode_ACK 4 #define opcode_ERROR 5 -#define TIMEOUT 5 +#define TIMEOUT 5 -#define REQUEST_DUMP "server.input" +#define REQUEST_DUMP "server.input" /***************************************************************************** -* GLOBAL VARIABLES * -*****************************************************************************/ + * GLOBAL VARIABLES * + *****************************************************************************/ static struct errmsg errmsgs[] = { { TFTP_EUNDEF, "Undefined error code" }, @@ -212,8 +212,8 @@ static const unsigned int rexmtval = TIMEOUT; #endif /***************************************************************************** -* FUNCTION PROTOTYPES * -*****************************************************************************/ + * FUNCTION PROTOTYPES * + *****************************************************************************/ static struct tftphdr *rw_init(int); @@ -249,8 +249,8 @@ static void justtimeout(int signum); #endif /* HAVE_ALARM && SIGALRM */ /***************************************************************************** -* FUNCTION IMPLEMENTATIONS * -*****************************************************************************/ + * FUNCTION IMPLEMENTATIONS * + *****************************************************************************/ #if defined(HAVE_ALARM) && defined(SIGALRM) @@ -482,9 +482,8 @@ static ssize_t write_behind(struct testcase *test, int convert) if(prevchar == '\r') { /* if prev char was cr */ if(c == '\n') /* if have cr,lf then just */ lseek(test->ofile, -1, SEEK_CUR); /* smash lf on top of the cr */ - else - if(c == '\0') /* if have cr,nul then */ - goto skipit; /* just skip over the putc */ + else if(c == '\0') /* if have cr,nul then */ + goto skipit; /* just skip over the putc */ /* else just fall through and allow it */ } /* formerly @@ -1204,8 +1203,7 @@ static void sendtftp(struct testcase *test, const struct formats *pf) (void)sigsetjmp(timeoutbuf, 1); #endif if(test->writedelay) { - logmsg("Pausing %d seconds before %d bytes", test->writedelay, - size); + logmsg("Pausing %d seconds before %d bytes", test->writedelay, size); curlx_wait_ms(1000 * test->writedelay); } @@ -1299,7 +1297,7 @@ send_ack: #endif if(got_exit_signal) goto abort; - if(n < 0) { /* really? */ + if(n < 0) { /* really? */ logmsg("read: fail"); goto abort; } @@ -1313,13 +1311,13 @@ send_ack: } /* Re-synchronize with the other side */ (void)synchnet(peer); - if(rdp->th_block == (recvblock-1)) + if(rdp->th_block == (recvblock - 1)) goto send_ack; /* rexmit */ } } size = writeit(test, &rdp, (int)(n - 4), pf->f_convert); - if(size != (n-4)) { /* ahem */ + if(size != (n - 4)) { /* ahem */ if(size < 0) nak(errno + 100); else diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index 53da9dd4f6..5fae379dce 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -108,7 +108,7 @@ static CURLcode test_unit1300(const char *arg) Curl_llist_insert_next(&llist, Curl_llist_head(&llist), &unusedData_case3, &case3_list); fail_unless(Curl_node_elem(Curl_node_next(Curl_llist_head(&llist))) == - &unusedData_case3, + &unusedData_case3, "the node next to head is not getting set correctly"); fail_unless(Curl_node_elem(Curl_llist_tail(&llist)) == &unusedData_case3, "the list tail is not getting set correctly"); @@ -125,7 +125,7 @@ static CURLcode test_unit1300(const char *arg) Curl_llist_insert_next(&llist, Curl_llist_head(&llist), &unusedData_case2, &case2_list); fail_unless(Curl_node_elem(Curl_node_next(Curl_llist_head(&llist))) == - &unusedData_case2, + &unusedData_case2, "the node next to head is not getting set correctly"); /* better safe than sorry, check that the tail is not corrupted */ fail_unless(Curl_node_elem(Curl_llist_tail(&llist)) != &unusedData_case2, @@ -149,7 +149,7 @@ static CURLcode test_unit1300(const char *arg) Curl_node_remove(Curl_llist_head(&llist)); - fail_unless(Curl_llist_count(&llist) == (llist_size-1), + fail_unless(Curl_llist_count(&llist) == (llist_size - 1), "llist size not decremented as expected"); fail_unless(Curl_llist_head(&llist) == element_next, "llist new head not modified properly"); @@ -243,7 +243,7 @@ static CURLcode test_unit1300(const char *arg) */ Curl_llist_append(&llist, &unusedData_case2, &case2_list); fail_unless(Curl_node_elem(Curl_node_next(Curl_llist_head(&llist))) == - &unusedData_case2, + &unusedData_case2, "the node next to head is not getting set correctly"); fail_unless(Curl_node_elem(Curl_llist_tail(&llist)) == &unusedData_case2, "the list tail is not getting set correctly"); @@ -258,7 +258,7 @@ static CURLcode test_unit1300(const char *arg) */ Curl_llist_append(&llist, &unusedData_case3, &case3_list); fail_unless(Curl_node_elem(Curl_node_next(Curl_llist_head(&llist))) == - &unusedData_case2, + &unusedData_case2, "the node next to head did not stay the same"); fail_unless(Curl_node_elem(Curl_llist_tail(&llist)) == &unusedData_case3, "the list tail is not getting set correctly"); diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c index 157f1f61ed..5fb3d5c636 100644 --- a/tests/unit/unit1302.c +++ b/tests/unit/unit1302.c @@ -41,87 +41,87 @@ static CURLcode test_unit1302(const char *arg) /* common base64 encoding */ struct etest encode[] = { - {"iiiiii", 1, "aQ==", 4 }, - {"iiiiii", 2, "aWk=", 4 }, - {"iiiiii", 3, "aWlp", 4 }, - {"iiiiii", 4, "aWlpaQ==", 8 }, - {"iiiiii", 5, "aWlpaWk=", 8 }, - {"iiiiii", 6, "aWlpaWlp", 8 }, - {"iiiiiii", 7, "aWlpaWlpaQ==", 12 }, - {"iiiiiiii", 8, "aWlpaWlpaWk=", 12 }, - {"iiiiiiiii", 9, "aWlpaWlpaWlp", 12 }, - {"iiiiiiiiii", 10, "aWlpaWlpaWlpaQ==", 16 }, - {"iiiiiiiiiii", 11, "aWlpaWlpaWlpaWk=", 16 }, - {"iiiiiiiiiiii", 12, "aWlpaWlpaWlpaWlp", 16 }, - {"\xff\x01\xfe\x02", 4, "/wH+Ag==", 8 }, - {"\xff\xff\xff\xff", 4, "/////w==", 8 }, - {"\x00\x00\x00\x00", 4, "AAAAAA==", 8 }, - {"\x00\x00\x00\x00", 1, "AA==", 4 }, + { "iiiiii", 1, "aQ==", 4 }, + { "iiiiii", 2, "aWk=", 4 }, + { "iiiiii", 3, "aWlp", 4 }, + { "iiiiii", 4, "aWlpaQ==", 8 }, + { "iiiiii", 5, "aWlpaWk=", 8 }, + { "iiiiii", 6, "aWlpaWlp", 8 }, + { "iiiiiii", 7, "aWlpaWlpaQ==", 12 }, + { "iiiiiiii", 8, "aWlpaWlpaWk=", 12 }, + { "iiiiiiiii", 9, "aWlpaWlpaWlp", 12 }, + { "iiiiiiiiii", 10, "aWlpaWlpaWlpaQ==", 16 }, + { "iiiiiiiiiii", 11, "aWlpaWlpaWlpaWk=", 16 }, + { "iiiiiiiiiiii", 12, "aWlpaWlpaWlpaWlp", 16 }, + { "\xff\x01\xfe\x02", 4, "/wH+Ag==", 8 }, + { "\xff\xff\xff\xff", 4, "/////w==", 8 }, + { "\x00\x00\x00\x00", 4, "AAAAAA==", 8 }, + { "\x00\x00\x00\x00", 1, "AA==", 4 }, }; /* base64 URL encoding */ struct etest url[] = { - {"", 0, "", 0 }, - {"iiiiiiiiiii", 1, "aQ", 2 }, - {"iiiiiiiiiii", 2, "aWk", 3 }, - {"iiiiiiiiiii", 3, "aWlp", 4 }, - {"iiiiiiiiiii", 4, "aWlpaQ", 6 }, - {"iiiiiiiiiii", 5, "aWlpaWk", 7 }, - {"iiiiiiiiiii", 6, "aWlpaWlp", 8 }, - {"iiiiiiiiiii", 7, "aWlpaWlpaQ", 10 }, - {"iiiiiiiiiii", 8, "aWlpaWlpaWk", 11 }, - {"iiiiiiiiiii", 9, "aWlpaWlpaWlp", 12 }, - {"iiiiiiiiiii", 10, "aWlpaWlpaWlpaQ", 14 }, - {"iiiiiiiiiii", 11, "aWlpaWlpaWlpaWk", 15 }, - {"iiiiiiiiiiii", 12, "aWlpaWlpaWlpaWlp", 16 }, - {"\xff\x01\xfe\x02", 4, "_wH-Ag", 6 }, - {"\xff\xff\xff\xff", 4, "_____w", 6 }, - {"\xff\x00\xff\x00", 4, "_wD_AA", 6 }, - {"\x00\xff\x00\xff", 4, "AP8A_w", 6 }, - {"\x00\x00\x00\x00", 4, "AAAAAA", 6 }, - {"\x00", 1, "AA", 2 }, - {"\x01", 1, "AQ", 2 }, - {"\x02", 1, "Ag", 2 }, - {"\x03", 1, "Aw", 2 }, - {"\x04", 1, "BA", 2 }, /* spellchecker:disable-line */ - {"\x05", 1, "BQ", 2 }, - {"\x06", 1, "Bg", 2 }, - {"\x07", 1, "Bw", 2 }, - {"\x08", 1, "CA", 2 }, - {"\x09", 1, "CQ", 2 }, - {"\x0a", 1, "Cg", 2 }, - {"\x0b", 1, "Cw", 2 }, - {"\x0c", 1, "DA", 2 }, - {"\x0d", 1, "DQ", 2 }, - {"\x0e", 1, "Dg", 2 }, - {"\x0f", 1, "Dw", 2 }, - {"\x10", 1, "EA", 2 }, + { "", 0, "", 0 }, + { "iiiiiiiiiii", 1, "aQ", 2 }, + { "iiiiiiiiiii", 2, "aWk", 3 }, + { "iiiiiiiiiii", 3, "aWlp", 4 }, + { "iiiiiiiiiii", 4, "aWlpaQ", 6 }, + { "iiiiiiiiiii", 5, "aWlpaWk", 7 }, + { "iiiiiiiiiii", 6, "aWlpaWlp", 8 }, + { "iiiiiiiiiii", 7, "aWlpaWlpaQ", 10 }, + { "iiiiiiiiiii", 8, "aWlpaWlpaWk", 11 }, + { "iiiiiiiiiii", 9, "aWlpaWlpaWlp", 12 }, + { "iiiiiiiiiii", 10, "aWlpaWlpaWlpaQ", 14 }, + { "iiiiiiiiiii", 11, "aWlpaWlpaWlpaWk", 15 }, + { "iiiiiiiiiiii", 12, "aWlpaWlpaWlpaWlp", 16 }, + { "\xff\x01\xfe\x02", 4, "_wH-Ag", 6 }, + { "\xff\xff\xff\xff", 4, "_____w", 6 }, + { "\xff\x00\xff\x00", 4, "_wD_AA", 6 }, + { "\x00\xff\x00\xff", 4, "AP8A_w", 6 }, + { "\x00\x00\x00\x00", 4, "AAAAAA", 6 }, + { "\x00", 1, "AA", 2 }, + { "\x01", 1, "AQ", 2 }, + { "\x02", 1, "Ag", 2 }, + { "\x03", 1, "Aw", 2 }, + { "\x04", 1, "BA", 2 }, /* spellchecker:disable-line */ + { "\x05", 1, "BQ", 2 }, + { "\x06", 1, "Bg", 2 }, + { "\x07", 1, "Bw", 2 }, + { "\x08", 1, "CA", 2 }, + { "\x09", 1, "CQ", 2 }, + { "\x0a", 1, "Cg", 2 }, + { "\x0b", 1, "Cw", 2 }, + { "\x0c", 1, "DA", 2 }, + { "\x0d", 1, "DQ", 2 }, + { "\x0e", 1, "Dg", 2 }, + { "\x0f", 1, "Dw", 2 }, + { "\x10", 1, "EA", 2 }, }; /* bad decode inputs */ struct etest badecode[] = { - {"", 0, "", 0 }, /* no dats means error */ - {"", 0, "a", 1 }, /* data is too short */ - {"", 0, "aQ", 2 }, /* data is too short */ - {"", 0, "aQ=", 3 }, /* data is too short */ - {"", 0, "====", 1 }, /* data is only padding characters */ - {"", 0, "====", 2 }, /* data is only padding characters */ - {"", 0, "====", 3 }, /* data is only padding characters */ - {"", 0, "====", 4 }, /* data is only padding characters */ - {"", 0, "a===", 4 }, /* contains three padding characters */ - {"", 0, "a=Q=", 4 }, /* contains a padding character mid input */ - {"", 0, "aWlpa=Q=", 8 }, /* contains a padding character mid input */ - {"", 0, "a\x1f==", 4 }, /* contains illegal base64 character */ - {"", 0, "abcd ", 5 }, /* contains illegal base64 character */ - {"", 0, "abcd ", 6 }, /* contains illegal base64 character */ - {"", 0, " abcd", 5 }, /* contains illegal base64 character */ - {"", 0, "_abcd", 5 }, /* contains illegal base64 character */ - {"", 0, "abcd-", 5 }, /* contains illegal base64 character */ - {"", 0, "abcd_", 5 }, /* contains illegal base64 character */ - {"", 0, "aWlpaWlpaQ==-", 17}, /* bad character after padding */ - {"", 0, "aWlpaWlpaQ==_", 17}, /* bad character after padding */ - {"", 0, "aWlpaWlpaQ== ", 17}, /* bad character after padding */ - {"", 0, "aWlpaWlpaQ=", 15} /* unaligned size, missing a padding char */ + { "", 0, "", 0 }, /* no dats means error */ + { "", 0, "a", 1 }, /* data is too short */ + { "", 0, "aQ", 2 }, /* data is too short */ + { "", 0, "aQ=", 3 }, /* data is too short */ + { "", 0, "====", 1 }, /* data is only padding characters */ + { "", 0, "====", 2 }, /* data is only padding characters */ + { "", 0, "====", 3 }, /* data is only padding characters */ + { "", 0, "====", 4 }, /* data is only padding characters */ + { "", 0, "a===", 4 }, /* contains three padding characters */ + { "", 0, "a=Q=", 4 }, /* contains a padding character mid input */ + { "", 0, "aWlpa=Q=", 8 }, /* contains a padding character mid input */ + { "", 0, "a\x1f==", 4 }, /* contains illegal base64 character */ + { "", 0, "abcd ", 5 }, /* contains illegal base64 character */ + { "", 0, "abcd ", 6 }, /* contains illegal base64 character */ + { "", 0, " abcd", 5 }, /* contains illegal base64 character */ + { "", 0, "_abcd", 5 }, /* contains illegal base64 character */ + { "", 0, "abcd-", 5 }, /* contains illegal base64 character */ + { "", 0, "abcd_", 5 }, /* contains illegal base64 character */ + { "", 0, "aWlpaWlpaQ==-", 17 }, /* bad character after padding */ + { "", 0, "aWlpaWlpaQ==_", 17 }, /* bad character after padding */ + { "", 0, "aWlpaWlpaQ== ", 17 }, /* bad character after padding */ + { "", 0, "aWlpaWlpaQ=", 15 } /* unaligned size, missing a padding char */ }; for(i = 0; i < CURL_ARRAYSIZE(encode); i++) { @@ -161,7 +161,7 @@ static CURLcode test_unit1302(const char *arg) Curl_safefree(decoded); } - for(i = 0 ; i < CURL_ARRAYSIZE(url); i++) { + for(i = 0; i < CURL_ARRAYSIZE(url); i++) { struct etest *e = &url[i]; char *out; size_t olen; diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c index 3651b341ed..5c147c6eda 100644 --- a/tests/unit/unit1307.c +++ b/tests/unit/unit1307.c @@ -36,17 +36,17 @@ #define MATCH CURL_FNMATCH_MATCH #define NOMATCH CURL_FNMATCH_NOMATCH -#define LINUX_DIFFER 0x80 -#define LINUX_SHIFT 8 -#define LINUX_MATCH ((CURL_FNMATCH_MATCH << LINUX_SHIFT) | LINUX_DIFFER) +#define LINUX_DIFFER 0x80 +#define LINUX_SHIFT 8 +#define LINUX_MATCH ((CURL_FNMATCH_MATCH << LINUX_SHIFT) | LINUX_DIFFER) #define LINUX_NOMATCH ((CURL_FNMATCH_NOMATCH << LINUX_SHIFT) | LINUX_DIFFER) -#define LINUX_FAIL ((CURL_FNMATCH_FAIL << LINUX_SHIFT) | LINUX_DIFFER) +#define LINUX_FAIL ((CURL_FNMATCH_FAIL << LINUX_SHIFT) | LINUX_DIFFER) -#define MAC_DIFFER 0x40 -#define MAC_SHIFT 16 -#define MAC_MATCH ((CURL_FNMATCH_MATCH << MAC_SHIFT) | MAC_DIFFER) -#define MAC_NOMATCH ((CURL_FNMATCH_NOMATCH << MAC_SHIFT) | MAC_DIFFER) -#define MAC_FAIL ((CURL_FNMATCH_FAIL << MAC_SHIFT) | MAC_DIFFER) +#define MAC_DIFFER 0x40 +#define MAC_SHIFT 16 +#define MAC_MATCH ((CURL_FNMATCH_MATCH << MAC_SHIFT) | MAC_DIFFER) +#define MAC_NOMATCH ((CURL_FNMATCH_NOMATCH << MAC_SHIFT) | MAC_DIFFER) +#define MAC_FAIL ((CURL_FNMATCH_FAIL << MAC_SHIFT) | MAC_DIFFER) static const char *ret2name(int i) { diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c index af9a29e110..46596544c6 100644 --- a/tests/unit/unit1309.c +++ b/tests/unit/unit1309.c @@ -67,8 +67,8 @@ static CURLcode test_unit1309(const char *arg) size_t storage[NUM_NODES * 3]; int rc; int i, j; - struct curltime tv_now = {0, 0}; - root = NULL; /* the empty tree */ + struct curltime tv_now = { 0, 0 }; + root = NULL; /* the empty tree */ /* add nodes */ for(i = 0; i < NUM_NODES; i++) { diff --git a/tests/unit/unit1323.c b/tests/unit/unit1323.c index 15d140e10a..c705dc96eb 100644 --- a/tests/unit/unit1323.c +++ b/tests/unit/unit1323.c @@ -34,10 +34,10 @@ static CURLcode test_unit1323(const char *arg) }; struct a tests[] = { - { {36762, 8345}, {36761, 995926}, 13 }, - { {36761, 995926}, {36762, 8345}, -13 }, - { {36761, 995926}, {0, 0}, 36761995 }, - { {0, 0}, {36761, 995926}, -36761995 }, + { { 36762, 8345 }, { 36761, 995926 }, 13 }, + { { 36761, 995926 }, { 36762, 8345 }, -13 }, + { { 36761, 995926 }, { 0, 0 }, 36761995 }, + { { 0, 0 }, { 36761, 995926 }, -36761995 }, }; size_t i; diff --git a/tests/unit/unit1395.c b/tests/unit/unit1395.c index 395f3e7707..7ca7f22c10 100644 --- a/tests/unit/unit1395.c +++ b/tests/unit/unit1395.c @@ -96,9 +96,9 @@ static CURLcode test_unit1395(const char *arg) { "/hello/1/./../2", "/hello/2" }, { "test/this", "test/this" }, { "test/this/../now", "test/now" }, - { "/1../moo../foo", "/1../moo../foo"}, - { "/../../moo", "/moo"}, - { "/../../moo?", "/moo?"}, + { "/1../moo../foo", "/1../moo../foo" }, + { "/../../moo", "/moo" }, + { "/../../moo?", "/moo?" }, { "/123?", "/123?" }, { "/", NULL }, { "", NULL }, diff --git a/tests/unit/unit1396.c b/tests/unit/unit1396.c index 0b74afa84f..fd58c03b80 100644 --- a/tests/unit/unit1396.c +++ b/tests/unit/unit1396.c @@ -52,33 +52,33 @@ static CURLcode test_unit1396(const char *arg) /* unescape, this => that */ const struct test list1[] = { - {"%61", 3, "a", 1}, - {"%61a", 4, "aa", 2}, - {"%61b", 4, "ab", 2}, - {"%6 1", 4, "%6 1", 4}, - {"%61", 1, "%", 1}, - {"%61", 2, "%6", 2}, - {"%6%a", 4, "%6%a", 4}, - {"%6a", 0, "j", 1}, - {"%FF", 0, "\xff", 1}, - {"%FF%00%ff", 9, "\xff\x00\xff", 3}, - {"%-2", 0, "%-2", 3}, - {"%FG", 0, "%FG", 3}, - {NULL, 0, NULL, 0} /* end of list marker */ + { "%61", 3, "a", 1 }, + { "%61a", 4, "aa", 2 }, + { "%61b", 4, "ab", 2 }, + { "%6 1", 4, "%6 1", 4 }, + { "%61", 1, "%", 1 }, + { "%61", 2, "%6", 2 }, + { "%6%a", 4, "%6%a", 4 }, + { "%6a", 0, "j", 1 }, + { "%FF", 0, "\xff", 1 }, + { "%FF%00%ff", 9, "\xff\x00\xff", 3 }, + { "%-2", 0, "%-2", 3 }, + { "%FG", 0, "%FG", 3 }, + { NULL, 0, NULL, 0 } /* end of list marker */ }; /* escape, this => that */ const struct test list2[] = { - {"a", 1, "a", 1}, - {"/", 1, "%2F", 3}, - {"a=b", 3, "a%3Db", 5}, - {"a=b", 0, "a%3Db", 5}, - {"a=b", 1, "a", 1}, - {"a=b", 2, "a%3D", 4}, - {"1/./0", 5, "1%2F.%2F0", 9}, - {"-._~!#%&", 0, "-._~%21%23%25%26", 16}, - {"a", 2, "a%00", 4}, - {"a\xff\x01g", 4, "a%FF%01g", 8}, - {NULL, 0, NULL, 0} /* end of list marker */ + { "a", 1, "a", 1 }, + { "/", 1, "%2F", 3 }, + { "a=b", 3, "a%3Db", 5 }, + { "a=b", 0, "a%3Db", 5 }, + { "a=b", 1, "a", 1 }, + { "a=b", 2, "a%3D", 4 }, + { "1/./0", 5, "1%2F.%2F0", 9 }, + { "-._~!#%&", 0, "-._~%21%23%25%26", 16 }, + { "a", 2, "a%00", 4 }, + { "a\xff\x01g", 4, "a%FF%01g", 8 }, + { NULL, 0, NULL, 0 } /* end of list marker */ }; int i; @@ -86,9 +86,7 @@ static CURLcode test_unit1396(const char *arg) abort_unless(easy != NULL, "returned NULL!"); for(i = 0; list1[i].in; i++) { int outlen; - char *out = curl_easy_unescape(easy, - list1[i].in, list1[i].inlen, - &outlen); + char *out = curl_easy_unescape(easy, list1[i].in, list1[i].inlen, &outlen); abort_unless(out != NULL, "returned NULL!"); fail_unless(outlen == list1[i].outlen, "wrong output length returned"); diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c index e56b894e36..6726c50530 100644 --- a/tests/unit/unit1397.c +++ b/tests/unit/unit1397.c @@ -39,56 +39,56 @@ static CURLcode test_unit1397(const char *arg) }; static const struct testcase tests[] = { - {"", "", FALSE}, - {"a", "", FALSE}, - {"", "b", FALSE}, - {"a", "b", FALSE}, - {"aa", "bb", FALSE}, - {"\xff", "\xff", TRUE}, - {"aa.aa.aa", "aa.aa.bb", FALSE}, - {"aa.aa.aa", "aa.aa.aa", TRUE}, - {"aa.aa.aa", "*.aa.bb", FALSE}, - {"aa.aa.aa", "*.aa.aa", TRUE}, - {"192.168.0.1", "192.168.0.1", TRUE}, - {"192.168.0.1", "*.168.0.1", FALSE}, - {"192.168.0.1", "*.0.1", FALSE}, - {"h.ello", "*.ello", FALSE}, - {"h.ello.", "*.ello", FALSE}, - {"h.ello", "*.ello.", FALSE}, - {"h.e.llo", "*.e.llo", TRUE}, - {"h.e.llo", " *.e.llo", FALSE}, - {" h.e.llo", "*.e.llo", TRUE}, - {"h.e.llo.", "*.e.llo", TRUE}, - {"*.e.llo.", "*.e.llo", TRUE}, - {"************.e.llo.", "*.e.llo", TRUE}, - {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" - "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" - "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD" - "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE" - ".e.llo.", "*.e.llo", TRUE}, - {"\xfe\xfe.e.llo.", "*.e.llo", TRUE}, - {"h.e.llo.", "*.e.llo.", TRUE}, - {"h.e.llo", "*.e.llo.", TRUE}, - {".h.e.llo", "*.e.llo.", FALSE}, - {"h.e.llo", "*.*.llo.", FALSE}, - {"h.e.llo", "h.*.llo", FALSE}, - {"h.e.llo", "h.e.*", FALSE}, - {"hello", "*.ello", FALSE}, - {"hello", "**llo", FALSE}, - {"bar.foo.example.com", "*.example.com", FALSE}, - {"foo.example.com", "*.example.com", TRUE}, - {"baz.example.net", "b*z.example.net", FALSE}, - {"foobaz.example.net", "*baz.example.net", FALSE}, - {"xn--l8j.example.local", "x*.example.local", FALSE}, - {"xn--l8j.example.net", "*.example.net", TRUE}, - {"xn--l8j.example.net", "*j.example.net", FALSE}, - {"xn--l8j.example.net", "xn--l8j.example.net", TRUE}, - {"xn--l8j.example.net", "xn--l8j.*.net", FALSE}, - {"xl8j.example.net", "*.example.net", TRUE}, - {"fe80::3285:a9ff:fe46:b619", "*::3285:a9ff:fe46:b619", FALSE}, - {"fe80::3285:a9ff:fe46:b619", "fe80::3285:a9ff:fe46:b619", TRUE}, - {NULL, NULL, FALSE} + { "", "", FALSE }, + { "a", "", FALSE }, + { "", "b", FALSE }, + { "a", "b", FALSE }, + { "aa", "bb", FALSE }, + { "\xff", "\xff", TRUE }, + { "aa.aa.aa", "aa.aa.bb", FALSE }, + { "aa.aa.aa", "aa.aa.aa", TRUE }, + { "aa.aa.aa", "*.aa.bb", FALSE }, + { "aa.aa.aa", "*.aa.aa", TRUE }, + { "192.168.0.1", "192.168.0.1", TRUE }, + { "192.168.0.1", "*.168.0.1", FALSE }, + { "192.168.0.1", "*.0.1", FALSE }, + { "h.ello", "*.ello", FALSE }, + { "h.ello.", "*.ello", FALSE }, + { "h.ello", "*.ello.", FALSE }, + { "h.e.llo", "*.e.llo", TRUE }, + { "h.e.llo", " *.e.llo", FALSE }, + { " h.e.llo", "*.e.llo", TRUE }, + { "h.e.llo.", "*.e.llo", TRUE }, + { "*.e.llo.", "*.e.llo", TRUE }, + { "************.e.llo.", "*.e.llo", TRUE }, + { "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" + "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" + "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD" + "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE" + ".e.llo.", "*.e.llo", TRUE }, + { "\xfe\xfe.e.llo.", "*.e.llo", TRUE }, + { "h.e.llo.", "*.e.llo.", TRUE }, + { "h.e.llo", "*.e.llo.", TRUE }, + { ".h.e.llo", "*.e.llo.", FALSE }, + { "h.e.llo", "*.*.llo.", FALSE }, + { "h.e.llo", "h.*.llo", FALSE }, + { "h.e.llo", "h.e.*", FALSE }, + { "hello", "*.ello", FALSE }, + { "hello", "**llo", FALSE }, + { "bar.foo.example.com", "*.example.com", FALSE }, + { "foo.example.com", "*.example.com", TRUE }, + { "baz.example.net", "b*z.example.net", FALSE }, + { "foobaz.example.net", "*baz.example.net", FALSE }, + { "xn--l8j.example.local", "x*.example.local", FALSE }, + { "xn--l8j.example.net", "*.example.net", TRUE }, + { "xn--l8j.example.net", "*j.example.net", FALSE }, + { "xn--l8j.example.net", "xn--l8j.example.net", TRUE }, + { "xn--l8j.example.net", "xn--l8j.*.net", FALSE }, + { "xl8j.example.net", "*.example.net", TRUE }, + { "fe80::3285:a9ff:fe46:b619", "*::3285:a9ff:fe46:b619", FALSE }, + { "fe80::3285:a9ff:fe46:b619", "fe80::3285:a9ff:fe46:b619", TRUE }, + { NULL, NULL, FALSE } }; int i; diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c index abd4447ca4..951a74589f 100644 --- a/tests/unit/unit1398.c +++ b/tests/unit/unit1398.c @@ -33,7 +33,7 @@ static CURLcode test_unit1398(const char *arg) UNITTEST_BEGIN_SIMPLE int rc; - char buf[3] = {'b', 'u', 'g'}; + char buf[3] = { 'b', 'u', 'g' }; static const char *str = "bug"; int width = 3; char output[130]; diff --git a/tests/unit/unit1600.c b/tests/unit/unit1600.c index a347203255..20a299af73 100644 --- a/tests/unit/unit1600.c +++ b/tests/unit/unit1600.c @@ -51,27 +51,36 @@ static CURLcode test_unit1600(const char *arg) UNITTEST_BEGIN(t1600_setup(&easy)) -#if defined(USE_NTLM) && (!defined(USE_WINDOWS_SSPI) || \ - defined(USE_WIN32_CRYPTO)) +#if defined(USE_NTLM) && \ + (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)) unsigned char output[21]; unsigned char *testp = output; Curl_ntlm_core_mk_nt_hash("1", output); verify_memory(testp, - "\x69\x94\x3c\x5e\x63\xb4\xd2\xc1\x04\xdb" - "\xbc\xc1\x51\x38\xb7\x2b\x00\x00\x00\x00\x00", 21); + "\x69\x94\x3c\x5e\x63\xb4\xd2\xc1\x04\xdb" + "\xbc\xc1\x51\x38\xb7\x2b\x00\x00\x00\x00\x00", + 21); Curl_ntlm_core_mk_nt_hash("hello-you-fool", output); verify_memory(testp, - "\x39\xaf\x87\xa6\x75\x0a\x7a\x00\xba\xa0" - "\xd3\x4f\x04\x9e\xc1\xd0\x00\x00\x00\x00\x00", 21); + "\x39\xaf\x87\xa6\x75\x0a\x7a\x00\xba\xa0" + "\xd3\x4f\x04\x9e\xc1\xd0\x00\x00\x00\x00\x00", + 21); - /* !checksrc! disable LONGLINE 2 */ - Curl_ntlm_core_mk_nt_hash("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", output); + Curl_ntlm_core_mk_nt_hash( + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAA", + output); verify_memory(testp, - "\x36\x9d\xae\x06\x84\x7e\xe1\xc1\x4a\x94\x39\xea\x6f\x44\x8c\x65\x00\x00\x00\x00\x00", 21); + "\x36\x9d\xae\x06\x84\x7e\xe1\xc1\x4a\x94\x39\xea\x6f\x44\x8c" + "\x65\x00\x00\x00\x00\x00", + 21); #endif UNITTEST_END(t1600_stop(easy)) diff --git a/tests/unit/unit1601.c b/tests/unit/unit1601.c index fa7743785d..9b0b38486f 100644 --- a/tests/unit/unit1601.c +++ b/tests/unit/unit1601.c @@ -42,7 +42,7 @@ static CURLcode test_unit1601(const char *arg) verify_memory(testp, "\xc4\xca\x42\x38\xa0\xb9\x23\x82\x0d\xcc\x50\x9a\x6f" "\x75\x84\x9b", MD5_DIGEST_LEN); - Curl_md5it(output, (const unsigned char *) string2, strlen(string2)); + Curl_md5it(output, (const unsigned char *)string2, strlen(string2)); verify_memory(testp, "\x88\x67\x0b\x6d\x5d\x74\x2f\xad\xa5\xcd\xf9\xb6\x82" "\x87\x5f\x22", MD5_DIGEST_LEN); diff --git a/tests/unit/unit1606.c b/tests/unit/unit1606.c index c7f3d718c7..03126a7478 100644 --- a/tests/unit/unit1606.c +++ b/tests/unit/unit1606.c @@ -52,7 +52,7 @@ static int runawhile(struct Curl_easy *easy, int dec) { int counter = 1; - struct curltime now = {1, 0}; + struct curltime now = { 1, 0 }; CURLcode res; int finaltime; diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c index 233866da18..c23a59fa54 100644 --- a/tests/unit/unit1607.c +++ b/tests/unit/unit1607.c @@ -140,7 +140,7 @@ static CURLcode test_unit1607(const char *arg) for(j = 0; j < addressnum; ++j) { uint16_t port = 0; - char ipaddress[MAX_IPADR_LEN] = {0}; + char ipaddress[MAX_IPADR_LEN] = { 0 }; if(!addr && !tests[i].address[j]) break; diff --git a/tests/unit/unit1609.c b/tests/unit/unit1609.c index bf912b99cd..b1eac34923 100644 --- a/tests/unit/unit1609.c +++ b/tests/unit/unit1609.c @@ -142,7 +142,7 @@ static CURLcode test_unit1609(const char *arg) for(j = 0; j < addressnum; ++j) { uint16_t port = 0; - char ipaddress[MAX_IPADR_LEN] = {0}; + char ipaddress[MAX_IPADR_LEN] = { 0 }; if(!addr && !tests[i].address[j]) break; diff --git a/tests/unit/unit1610.c b/tests/unit/unit1610.c index 5c47fe28e2..ba64a15a96 100644 --- a/tests/unit/unit1610.c +++ b/tests/unit/unit1610.c @@ -49,14 +49,16 @@ static CURLcode test_unit1610(const char *arg) verify_memory(testp, "\x6b\x86\xb2\x73\xff\x34\xfc\xe1\x9d\x6b\x80\x4e\xff\x5a\x3f" "\x57\x47\xad\xa4\xea\xa2\x2f\x1d\x49\xc0\x1e\x52\xdd\xb7\x87" - "\x5b\x4b", CURL_SHA256_DIGEST_LENGTH); + "\x5b\x4b", + CURL_SHA256_DIGEST_LENGTH); Curl_sha256it(output, (const unsigned char *)string2, strlen(string2)); verify_memory(testp, "\xcb\xb1\x6a\x8a\xb9\xcb\xb9\x35\xa8\xcb\xa0\x2e\x28\xc0\x26" "\x30\xd1\x19\x9c\x1f\x02\x17\xf4\x7c\x96\x20\xf3\xef\xe8\x27" - "\x15\xae", CURL_SHA256_DIGEST_LENGTH); + "\x15\xae", + CURL_SHA256_DIGEST_LENGTH); #endif UNITTEST_END(curl_global_cleanup()) diff --git a/tests/unit/unit1611.c b/tests/unit/unit1611.c index 88c79eb3d9..fbff7f9211 100644 --- a/tests/unit/unit1611.c +++ b/tests/unit/unit1611.c @@ -39,13 +39,15 @@ static CURLcode test_unit1611(const char *arg) verify_memory(testp, "\x8b\xe1\xec\x69\x7b\x14\xad\x3a\x53\xb3\x71\x43\x61\x20\x64" - "\x1d", MD4_DIGEST_LENGTH); + "\x1d", + MD4_DIGEST_LENGTH); Curl_md4it(output, (const unsigned char *)string2, strlen(string2)); verify_memory(testp, "\xa7\x16\x1c\xad\x7e\xbe\xdb\xbc\xf8\xc7\x23\x10\x2d\x2c\xe2" - "\x0b", MD4_DIGEST_LENGTH); + "\x0b", + MD4_DIGEST_LENGTH); #endif UNITTEST_END_SIMPLE diff --git a/tests/unit/unit1612.c b/tests/unit/unit1612.c index 7d8c9acf96..313ca0f329 100644 --- a/tests/unit/unit1612.c +++ b/tests/unit/unit1612.c @@ -46,7 +46,8 @@ static CURLcode test_unit1612(const char *arg) verify_memory(testp, "\xd1\x29\x75\x43\x58\xdc\xab\x78\xdf\xcd\x7f\x2b\x29\x31\x13" - "\x37", HMAC_MD5_LENGTH); + "\x37", + HMAC_MD5_LENGTH); Curl_hmacit(&Curl_HMAC_MD5, (const unsigned char *)password, strlen(password), @@ -55,7 +56,8 @@ static CURLcode test_unit1612(const char *arg) verify_memory(testp, "\x75\xf1\xa7\xb9\xf5\x40\xe5\xa4\x98\x83\x9f\x64\x5a\x27\x6d" - "\xd0", HMAC_MD5_LENGTH); + "\xd0", + HMAC_MD5_LENGTH); #endif UNITTEST_END_SIMPLE diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c index 7b66af8431..ed0e3aba98 100644 --- a/tests/unit/unit1614.c +++ b/tests/unit/unit1614.c @@ -40,28 +40,28 @@ static CURLcode test_unit1614(const char *arg) bool match; }; struct check list4[] = { - { "192.160.0.1", "192.160.0.1", 33, FALSE}, - { "192.160.0.1", "192.160.0.1", 32, TRUE}, - { "192.160.0.1", "192.160.0.1", 0, TRUE}, - { "192.160.0.1", "192.160.0.1", 24, TRUE}, - { "192.160.0.1", "192.160.0.1", 26, TRUE}, - { "192.160.0.1", "192.160.0.1", 20, TRUE}, - { "192.160.0.1", "192.160.0.1", 18, TRUE}, - { "192.160.0.1", "192.160.0.1", 12, TRUE}, - { "192.160.0.1", "192.160.0.1", 8, TRUE}, - { "192.160.0.1", "10.0.0.1", 8, FALSE}, - { "192.160.0.1", "10.0.0.1", 32, FALSE}, - { "192.160.0.1", "10.0.0.1", 0, FALSE}, - { NULL, NULL, 0, FALSE} /* end marker */ + { "192.160.0.1", "192.160.0.1", 33, FALSE }, + { "192.160.0.1", "192.160.0.1", 32, TRUE }, + { "192.160.0.1", "192.160.0.1", 0, TRUE }, + { "192.160.0.1", "192.160.0.1", 24, TRUE }, + { "192.160.0.1", "192.160.0.1", 26, TRUE }, + { "192.160.0.1", "192.160.0.1", 20, TRUE }, + { "192.160.0.1", "192.160.0.1", 18, TRUE }, + { "192.160.0.1", "192.160.0.1", 12, TRUE }, + { "192.160.0.1", "192.160.0.1", 8, TRUE }, + { "192.160.0.1", "10.0.0.1", 8, FALSE }, + { "192.160.0.1", "10.0.0.1", 32, FALSE }, + { "192.160.0.1", "10.0.0.1", 0, FALSE }, + { NULL, NULL, 0, FALSE } /* end marker */ }; #ifdef USE_IPV6 struct check list6[] = { - { "::1", "::1", 0, TRUE}, - { "::1", "::1", 128, TRUE}, - { "::1", "0:0::1", 128, TRUE}, - { "::1", "0:0::1", 129, FALSE}, - { "fe80::ab47:4396:55c9:8474", "fe80::ab47:4396:55c9:8474", 64, TRUE}, - { NULL, NULL, 0, FALSE} /* end marker */ + { "::1", "::1", 0, TRUE }, + { "::1", "::1", 128, TRUE }, + { "::1", "0:0::1", 128, TRUE }, + { "::1", "0:0::1", 129, FALSE }, + { "fe80::ab47:4396:55c9:8474", "fe80::ab47:4396:55c9:8474", 64, TRUE }, + { NULL, NULL, 0, FALSE } /* end marker */ }; #endif struct noproxy { @@ -70,91 +70,91 @@ static CURLcode test_unit1614(const char *arg) bool match; }; struct noproxy list[] = { - { "www.example.com", "localhost .example.com .example.de", FALSE}, - { "www.example.com", "localhost,.example.com,.example.de", TRUE}, - { "www.example.com.", "localhost,.example.com,.example.de", TRUE}, - { "example.com", "localhost,.example.com,.example.de", TRUE}, - { "example.com.", "localhost,.example.com,.example.de", TRUE}, - { "www.example.com", "localhost,.example.com.,.example.de", TRUE}, - { "www.example.com", "localhost,www.example.com.,.example.de", TRUE}, - { "example.com", "localhost,example.com,.example.de", TRUE}, - { "example.com.", "localhost,example.com,.example.de", TRUE}, - { "nexample.com", "localhost,example.com,.example.de", FALSE}, - { "www.example.com", "localhost,example.com,.example.de", TRUE}, - { "127.0.0.1", "127.0.0.1,localhost", TRUE}, - { "127.0.0.1", "127.0.0.1,localhost,", TRUE}, - { "127.0.0.1", "127.0.0.1/8,localhost,", TRUE}, - { "127.0.0.1", "127.0.0.1/28,localhost,", TRUE}, - { "127.0.0.1", "127.0.0.1/31,localhost,", TRUE}, - { "127.0.0.1", "localhost,127.0.0.1", TRUE}, + { "www.example.com", "localhost .example.com .example.de", FALSE }, + { "www.example.com", "localhost,.example.com,.example.de", TRUE }, + { "www.example.com.", "localhost,.example.com,.example.de", TRUE }, + { "example.com", "localhost,.example.com,.example.de", TRUE }, + { "example.com.", "localhost,.example.com,.example.de", TRUE }, + { "www.example.com", "localhost,.example.com.,.example.de", TRUE }, + { "www.example.com", "localhost,www.example.com.,.example.de", TRUE }, + { "example.com", "localhost,example.com,.example.de", TRUE }, + { "example.com.", "localhost,example.com,.example.de", TRUE }, + { "nexample.com", "localhost,example.com,.example.de", FALSE }, + { "www.example.com", "localhost,example.com,.example.de", TRUE }, + { "127.0.0.1", "127.0.0.1,localhost", TRUE }, + { "127.0.0.1", "127.0.0.1,localhost,", TRUE }, + { "127.0.0.1", "127.0.0.1/8,localhost,", TRUE }, + { "127.0.0.1", "127.0.0.1/28,localhost,", TRUE }, + { "127.0.0.1", "127.0.0.1/31,localhost,", TRUE }, + { "127.0.0.1", "localhost,127.0.0.1", TRUE }, { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1." "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127." - "0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE}, + "0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE }, { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1." "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127." - "0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE}, - { "localhost", "localhost,127.0.0.1", TRUE}, - { "localhost", "127.0.0.1,localhost", TRUE}, - { "foobar", "barfoo", FALSE}, - { "foobar", "foobar", TRUE}, - { "192.168.0.1", "foobar", FALSE}, - { "192.168.0.1", "192.168.0.0/16", TRUE}, - { "192.168.0.1", "192.168.0.0/16a", FALSE}, - { "192.168.0.1", "192.168.0.0/16 ", TRUE}, - { "192.168.0.1", "192.168.0.0/a16", FALSE}, - { "192.168.0.1", "192.168.0.0/ 16", FALSE}, - { "192.168.0.1", "192.168.0.0/24", TRUE}, - { "192.168.0.1", "192.168.0.0/32", FALSE}, - { "192.168.0.1", "192.168.0.1/32", TRUE}, - { "192.168.0.1", "192.168.0.1/33", FALSE}, - { "192.168.0.1", "192.168.0.0", FALSE}, - { "192.168.1.1", "192.168.0.0/24", FALSE}, - { "192.168.1.1", "192.168.0.0/33", FALSE}, - { "192.168.1.1", "foo, bar, 192.168.0.0/24", FALSE}, - { "192.168.1.1", "foo, bar, 192.168.0.0/16", TRUE}, + "0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE }, + { "localhost", "localhost,127.0.0.1", TRUE }, + { "localhost", "127.0.0.1,localhost", TRUE }, + { "foobar", "barfoo", FALSE }, + { "foobar", "foobar", TRUE }, + { "192.168.0.1", "foobar", FALSE }, + { "192.168.0.1", "192.168.0.0/16", TRUE }, + { "192.168.0.1", "192.168.0.0/16a", FALSE }, + { "192.168.0.1", "192.168.0.0/16 ", TRUE }, + { "192.168.0.1", "192.168.0.0/a16", FALSE }, + { "192.168.0.1", "192.168.0.0/ 16", FALSE }, + { "192.168.0.1", "192.168.0.0/24", TRUE }, + { "192.168.0.1", "192.168.0.0/32", FALSE }, + { "192.168.0.1", "192.168.0.1/32", TRUE }, + { "192.168.0.1", "192.168.0.1/33", FALSE }, + { "192.168.0.1", "192.168.0.0", FALSE }, + { "192.168.1.1", "192.168.0.0/24", FALSE }, + { "192.168.1.1", "192.168.0.0/33", FALSE }, + { "192.168.1.1", "foo, bar, 192.168.0.0/24", FALSE }, + { "192.168.1.1", "foo, bar, 192.168.0.0/16", TRUE }, #ifdef USE_IPV6 - { "::1", "foo, bar, 192.168.0.0/16", FALSE}, - { "::1", "foo, bar, ::1/64", TRUE}, - { "::1", "::1/64", TRUE}, - { "::1", "::1/96", TRUE}, - { "::1", "::1/129", FALSE}, - { "::1", "::1/128", TRUE}, - { "::1", "::1/127", TRUE}, - { "::1", "::1/a127", FALSE}, - { "::1", "::1/127a", FALSE}, - { "::1", "::1/ 127", FALSE}, - { "::1", "::1/127 ", TRUE}, - { "::1", "::1/126", TRUE}, - { "::1", "::1/125", TRUE}, - { "::1", "::1/124", TRUE}, - { "::1", "::1/123", TRUE}, - { "::1", "::1/122", TRUE}, - { "2001:db8:8000::1", "2001:db8::/65", FALSE}, - { "2001:db8:8000::1", "2001:db8::/66", FALSE}, - { "2001:db8:8000::1", "2001:db8::/67", FALSE}, - { "2001:db8:8000::1", "2001:db8::/68", FALSE}, - { "2001:db8:8000::1", "2001:db8::/69", FALSE}, - { "2001:db8:8000::1", "2001:db8::/70", FALSE}, - { "2001:db8:8000::1", "2001:db8::/71", FALSE}, - { "2001:db8:8000::1", "2001:db8::/72", FALSE}, - { "2001:db8::1", "2001:db8::/65", TRUE}, - { "2001:db8::1", "2001:db8::/66", TRUE}, - { "2001:db8::1", "2001:db8::/67", TRUE}, - { "2001:db8::1", "2001:db8::/68", TRUE}, - { "2001:db8::1", "2001:db8::/69", TRUE}, - { "2001:db8::1", "2001:db8::/70", TRUE}, - { "2001:db8::1", "2001:db8::/71", TRUE}, - { "2001:db8::1", "2001:db8::/72", TRUE}, - { "::1", "::1/129", FALSE}, - { "bar", "foo, bar, ::1/64", TRUE}, - { "BAr", "foo, bar, ::1/64", TRUE}, - { "BAr", "foo,,,,, bar, ::1/64", TRUE}, + { "::1", "foo, bar, 192.168.0.0/16", FALSE }, + { "::1", "foo, bar, ::1/64", TRUE }, + { "::1", "::1/64", TRUE }, + { "::1", "::1/96", TRUE }, + { "::1", "::1/129", FALSE }, + { "::1", "::1/128", TRUE }, + { "::1", "::1/127", TRUE }, + { "::1", "::1/a127", FALSE }, + { "::1", "::1/127a", FALSE }, + { "::1", "::1/ 127", FALSE }, + { "::1", "::1/127 ", TRUE }, + { "::1", "::1/126", TRUE }, + { "::1", "::1/125", TRUE }, + { "::1", "::1/124", TRUE }, + { "::1", "::1/123", TRUE }, + { "::1", "::1/122", TRUE }, + { "2001:db8:8000::1", "2001:db8::/65", FALSE }, + { "2001:db8:8000::1", "2001:db8::/66", FALSE }, + { "2001:db8:8000::1", "2001:db8::/67", FALSE }, + { "2001:db8:8000::1", "2001:db8::/68", FALSE }, + { "2001:db8:8000::1", "2001:db8::/69", FALSE }, + { "2001:db8:8000::1", "2001:db8::/70", FALSE }, + { "2001:db8:8000::1", "2001:db8::/71", FALSE }, + { "2001:db8:8000::1", "2001:db8::/72", FALSE }, + { "2001:db8::1", "2001:db8::/65", TRUE }, + { "2001:db8::1", "2001:db8::/66", TRUE }, + { "2001:db8::1", "2001:db8::/67", TRUE }, + { "2001:db8::1", "2001:db8::/68", TRUE }, + { "2001:db8::1", "2001:db8::/69", TRUE }, + { "2001:db8::1", "2001:db8::/70", TRUE }, + { "2001:db8::1", "2001:db8::/71", TRUE }, + { "2001:db8::1", "2001:db8::/72", TRUE }, + { "::1", "::1/129", FALSE }, + { "bar", "foo, bar, ::1/64", TRUE }, + { "BAr", "foo, bar, ::1/64", TRUE }, + { "BAr", "foo,,,,, bar, ::1/64", TRUE }, #endif - { "www.example.com", "foo, .example.com", TRUE}, - { "www.example.com", "www2.example.com, .example.net", FALSE}, - { "example.com", ".example.com, .example.net", TRUE}, - { "nonexample.com", ".example.com, .example.net", FALSE}, - { NULL, NULL, FALSE} + { "www.example.com", "foo, .example.com", TRUE }, + { "www.example.com", "www2.example.com, .example.net", FALSE }, + { "example.com", ".example.com, .example.net", TRUE }, + { "nonexample.com", ".example.com, .example.net", FALSE }, + { NULL, NULL, FALSE } }; for(i = 0; list4[i].a; i++) { bool match = Curl_cidr4_match(list4[i].a, list4[i].n, list4[i].bits); diff --git a/tests/unit/unit1615.c b/tests/unit/unit1615.c index fadb1aaa59..93237db274 100644 --- a/tests/unit/unit1615.c +++ b/tests/unit/unit1615.c @@ -34,77 +34,78 @@ static CURLcode test_unit1615(const char *arg) static const char test_str1[] = "1"; static const unsigned char precomp_hash1[CURL_SHA512_256_DIGEST_LENGTH] = { - 0x18, 0xd2, 0x75, 0x66, 0xbd, 0x1a, 0xc6, 0x6b, 0x23, 0x32, 0xd8, - 0xc5, 0x4a, 0xd4, 0x3f, 0x7b, 0xb2, 0x20, 0x79, 0xc9, 0x06, 0xd0, - 0x5f, 0x49, 0x1f, 0x3f, 0x07, 0xa2, 0x8d, 0x5c, 0x69, 0x90 + 0x18, 0xd2, 0x75, 0x66, 0xbd, 0x1a, 0xc6, 0x6b, 0x23, 0x32, 0xd8, + 0xc5, 0x4a, 0xd4, 0x3f, 0x7b, 0xb2, 0x20, 0x79, 0xc9, 0x06, 0xd0, + 0x5f, 0x49, 0x1f, 0x3f, 0x07, 0xa2, 0x8d, 0x5c, 0x69, 0x90 }; static const char test_str2[] = "hello-you-fool"; static const unsigned char precomp_hash2[CURL_SHA512_256_DIGEST_LENGTH] = { - 0xaf, 0x6f, 0xb4, 0xb0, 0x13, 0x9b, 0xee, 0x13, 0xd1, 0x95, 0x3c, - 0xb8, 0xc7, 0xcd, 0x5b, 0x19, 0xf9, 0xcd, 0xcd, 0x21, 0xef, 0xdf, - 0xa7, 0x42, 0x5c, 0x07, 0x13, 0xea, 0xcc, 0x1a, 0x39, 0x76 + 0xaf, 0x6f, 0xb4, 0xb0, 0x13, 0x9b, 0xee, 0x13, 0xd1, 0x95, 0x3c, + 0xb8, 0xc7, 0xcd, 0x5b, 0x19, 0xf9, 0xcd, 0xcd, 0x21, 0xef, 0xdf, + 0xa7, 0x42, 0x5c, 0x07, 0x13, 0xea, 0xcc, 0x1a, 0x39, 0x76 }; static const char test_str3[] = "abc"; static const unsigned char precomp_hash3[CURL_SHA512_256_DIGEST_LENGTH] = { - 0x53, 0x04, 0x8E, 0x26, 0x81, 0x94, 0x1E, 0xF9, 0x9B, 0x2E, 0x29, - 0xB7, 0x6B, 0x4C, 0x7D, 0xAB, 0xE4, 0xC2, 0xD0, 0xC6, 0x34, 0xFC, - 0x6D, 0x46, 0xE0, 0xE2, 0xF1, 0x31, 0x07, 0xE7, 0xAF, 0x23 + 0x53, 0x04, 0x8E, 0x26, 0x81, 0x94, 0x1E, 0xF9, 0x9B, 0x2E, 0x29, + 0xB7, 0x6B, 0x4C, 0x7D, 0xAB, 0xE4, 0xC2, 0xD0, 0xC6, 0x34, 0xFC, + 0x6D, 0x46, 0xE0, 0xE2, 0xF1, 0x31, 0x07, 0xE7, 0xAF, 0x23 }; static const char test_str4[] = ""; /* empty, zero size input */ static const unsigned char precomp_hash4[CURL_SHA512_256_DIGEST_LENGTH] = { - 0xc6, 0x72, 0xb8, 0xd1, 0xef, 0x56, 0xed, 0x28, 0xab, 0x87, 0xc3, - 0x62, 0x2c, 0x51, 0x14, 0x06, 0x9b, 0xdd, 0x3a, 0xd7, 0xb8, 0xf9, - 0x73, 0x74, 0x98, 0xd0, 0xc0, 0x1e, 0xce, 0xf0, 0x96, 0x7a + 0xc6, 0x72, 0xb8, 0xd1, 0xef, 0x56, 0xed, 0x28, 0xab, 0x87, 0xc3, + 0x62, 0x2c, 0x51, 0x14, 0x06, 0x9b, 0xdd, 0x3a, 0xd7, 0xb8, 0xf9, + 0x73, 0x74, 0x98, 0xd0, 0xc0, 0x1e, 0xce, 0xf0, 0x96, 0x7a }; static const char test_str5[] = - "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA" \ - "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"; + "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA" + "abcdefghijklmnopqrstuvwxyzzyxwvutsrqponMLKJIHGFEDCBA"; static const unsigned char precomp_hash5[CURL_SHA512_256_DIGEST_LENGTH] = { - 0xad, 0xe9, 0x5d, 0x55, 0x3b, 0x9e, 0x45, 0x69, 0xdb, 0x53, 0xa4, - 0x04, 0x92, 0xe7, 0x87, 0x94, 0xff, 0xc9, 0x98, 0x5f, 0x93, 0x03, - 0x86, 0x45, 0xe1, 0x97, 0x17, 0x72, 0x7c, 0xbc, 0x31, 0x15 + 0xad, 0xe9, 0x5d, 0x55, 0x3b, 0x9e, 0x45, 0x69, 0xdb, 0x53, 0xa4, + 0x04, 0x92, 0xe7, 0x87, 0x94, 0xff, 0xc9, 0x98, 0x5f, 0x93, 0x03, + 0x86, 0x45, 0xe1, 0x97, 0x17, 0x72, 0x7c, 0xbc, 0x31, 0x15 }; static const char test_str6[] = - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/long/long/long/long/long/long/long" \ - "/long/long/long/long/path?with%20some=parameters"; + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/long/long/long/long/long/long/long" + "/long/long/long/long/path?with%20some=parameters"; static const unsigned char precomp_hash6[CURL_SHA512_256_DIGEST_LENGTH] = { - 0xbc, 0xab, 0xc6, 0x2c, 0x0a, 0x22, 0xd5, 0xcb, 0xac, 0xac, 0xe9, - 0x25, 0xcf, 0xce, 0xaa, 0xaf, 0x0e, 0xa1, 0xed, 0x42, 0x46, 0x8a, - 0xe2, 0x01, 0xee, 0x2f, 0xdb, 0x39, 0x75, 0x47, 0x73, 0xf1 + 0xbc, 0xab, 0xc6, 0x2c, 0x0a, 0x22, 0xd5, 0xcb, 0xac, 0xac, 0xe9, + 0x25, 0xcf, 0xce, 0xaa, 0xaf, 0x0e, 0xa1, 0xed, 0x42, 0x46, 0x8a, + 0xe2, 0x01, 0xee, 0x2f, 0xdb, 0x39, 0x75, 0x47, 0x73, 0xf1 }; static const char test_str7[] = "Simple string."; static const unsigned char precomp_hash7[CURL_SHA512_256_DIGEST_LENGTH] = { - 0xde, 0xcb, 0x3c, 0x81, 0x65, 0x4b, 0xa0, 0xf5, 0xf0, 0x45, 0x6b, - 0x7e, 0x61, 0xf5, 0x0d, 0xf5, 0x38, 0xa4, 0xfc, 0xb1, 0x8a, 0x95, - 0xff, 0x59, 0xbc, 0x04, 0x82, 0xcf, 0x23, 0xb2, 0x32, 0x56 + 0xde, 0xcb, 0x3c, 0x81, 0x65, 0x4b, 0xa0, 0xf5, 0xf0, 0x45, 0x6b, + 0x7e, 0x61, 0xf5, 0x0d, 0xf5, 0x38, 0xa4, 0xfc, 0xb1, 0x8a, 0x95, + 0xff, 0x59, 0xbc, 0x04, 0x82, 0xcf, 0x23, 0xb2, 0x32, 0x56 }; - static const unsigned char test_seq8[]= { - 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, - 241, 240, 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, - 227, 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, - 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, - 199, 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, - 185, 184, 183, 182, 181, 180, 179, 178, 177, 176, 175, 174, 173, 172, - 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, 158, - 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, - 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, - 129, 128, 127, 126, 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, - 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, - 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, - 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, - 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, - 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, - 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, - 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; /* 255..1 sequence */ + static const unsigned char test_seq8[] = { + 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, + 240, 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, + 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, 211, + 210, 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, 196, + 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, + 180, 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, + 165, 164, 163, 162, 161, 160, 159, 158, 157, 156, 155, 154, 153, 152, 151, + 150, 149, 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, 138, 137, 136, + 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, 123, 122, 121, + 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, + 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, + 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, + 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, + 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, + 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, + 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, + 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 + }; /* 255..1 sequence */ static const unsigned char precomp_hash8[CURL_SHA512_256_DIGEST_LENGTH] = { - 0x22, 0x31, 0xf2, 0xa1, 0xb4, 0x89, 0xb2, 0x44, 0xf7, 0x66, 0xa0, - 0xb8, 0x31, 0xed, 0xb7, 0x73, 0x8a, 0x34, 0xdc, 0x11, 0xc8, 0x2c, - 0xf2, 0xb5, 0x88, 0x60, 0x39, 0x6b, 0x5c, 0x06, 0x70, 0x37 + 0x22, 0x31, 0xf2, 0xa1, 0xb4, 0x89, 0xb2, 0x44, 0xf7, 0x66, 0xa0, + 0xb8, 0x31, 0xed, 0xb7, 0x73, 0x8a, 0x34, 0xdc, 0x11, 0xc8, 0x2c, + 0xf2, 0xb5, 0x88, 0x60, 0x39, 0x6b, 0x5c, 0x06, 0x70, 0x37 }; unsigned char output_buf[CURL_SHA512_256_DIGEST_LENGTH]; diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c index b04424ae3b..e6070ad157 100644 --- a/tests/unit/unit1620.c +++ b/tests/unit/unit1620.c @@ -33,17 +33,16 @@ static CURLcode t1620_setup(void) return res; } -static void t1620_parse( - const char *input, - const char *exp_username, - const char *exp_password, - const char *exp_options) +static void t1620_parse(const char *input, + const char *exp_username, + const char *exp_password, + const char *exp_options) { char *userstr = NULL; char *passwdstr = NULL; char *options = NULL; - CURLcode rc = Curl_parse_login_details(input, strlen(input), - &userstr, &passwdstr, &options); + CURLcode rc = Curl_parse_login_details(input, strlen(input), &userstr, + &passwdstr, &options); fail_unless(rc == CURLE_OK, "Curl_parse_login_details() failed"); fail_unless(!!exp_username == !!userstr, "username expectation failed"); @@ -52,13 +51,13 @@ static void t1620_parse( if(!unitfail) { fail_unless(!userstr || !exp_username || - strcmp(userstr, exp_username) == 0, + strcmp(userstr, exp_username) == 0, "userstr should be equal to exp_username"); fail_unless(!passwdstr || !exp_password || - strcmp(passwdstr, exp_password) == 0, + strcmp(passwdstr, exp_password) == 0, "passwdstr should be equal to exp_password"); fail_unless(!options || !exp_options || - strcmp(options, exp_options) == 0, + strcmp(options, exp_options) == 0, "options should be equal to exp_options"); } diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c index 309515d9b1..c9bb5745c7 100644 --- a/tests/unit/unit1650.c +++ b/tests/unit/unit1650.c @@ -31,13 +31,13 @@ static CURLcode test_unit1650(const char *arg) #ifndef CURL_DISABLE_DOH -#define DNS_PREAMBLE "\x00\x00\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00" -#define LABEL_TEST "\x04\x74\x65\x73\x74" -#define LABEL_HOST "\x04\x68\x6f\x73\x74" -#define LABEL_NAME "\x04\x6e\x61\x6d\x65" -#define DNSA_TYPE "\x01" -#define DNSAAAA_TYPE "\x1c" -#define DNSA_EPILOGUE "\x00\x00" DNSA_TYPE "\x00\x01" +#define DNS_PREAMBLE "\x00\x00\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00" +#define LABEL_TEST "\x04\x74\x65\x73\x74" +#define LABEL_HOST "\x04\x68\x6f\x73\x74" +#define LABEL_NAME "\x04\x6e\x61\x6d\x65" +#define DNSA_TYPE "\x01" +#define DNSAAAA_TYPE "\x1c" +#define DNSA_EPILOGUE "\x00\x00" DNSA_TYPE "\x00\x01" #define DNSAAAA_EPILOGUE "\x00\x00" DNSAAAA_TYPE "\x00\x01" #define DNS_Q1 DNS_PREAMBLE LABEL_TEST LABEL_HOST LABEL_NAME DNSA_EPILOGUE diff --git a/tests/unit/unit1651.c b/tests/unit/unit1651.c index ffaea47b20..251f2c1c80 100644 --- a/tests/unit/unit1651.c +++ b/tests/unit/unit1651.c @@ -32,312 +32,336 @@ static CURLcode test_unit1651(const char *arg) #if defined(USE_GNUTLS) || defined(USE_SCHANNEL) /* cert captured from gdb when connecting to curl.se on October 26 - 2018. - !checksrc! disable CLOSEBRACE 1 */ + 2018. */ static unsigned char cert[] = { - 0x30, 0x82, 0x0F, 0x5B, 0x30, 0x82, 0x0E, 0x43, 0xA0, 0x03, 0x02, 0x01, 0x02, - 0x02, 0x0C, 0x08, 0x77, 0x99, 0x2C, 0x6B, 0x67, 0xE1, 0x18, 0xD6, 0x66, 0x66, - 0x9E, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, - 0x0B, 0x05, 0x00, 0x30, 0x57, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, - 0x06, 0x13, 0x02, 0x42, 0x45, 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, - 0x0A, 0x13, 0x10, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x53, 0x69, 0x67, 0x6E, - 0x20, 0x6E, 0x76, 0x2D, 0x73, 0x61, 0x31, 0x2D, 0x30, 0x2B, 0x06, 0x03, 0x55, - 0x04, 0x03, 0x13, 0x24, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x53, 0x69, 0x67, - 0x6E, 0x20, 0x43, 0x6C, 0x6F, 0x75, 0x64, 0x53, 0x53, 0x4C, 0x20, 0x43, 0x41, - 0x20, 0x2D, 0x20, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x2D, 0x20, 0x47, - 0x33, 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x38, 0x31, 0x30, 0x32, 0x32, 0x31, 0x37, - 0x31, 0x38, 0x32, 0x31, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x33, 0x32, 0x31, - 0x31, 0x33, 0x34, 0x33, 0x34, 0x34, 0x5A, 0x30, 0x77, 0x31, 0x0B, 0x30, 0x09, - 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, - 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, - 0x72, 0x6E, 0x69, 0x61, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x07, - 0x0C, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x46, 0x72, 0x61, 0x6E, 0x63, 0x69, 0x73, - 0x63, 0x6F, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0C, - 0x46, 0x61, 0x73, 0x74, 0x6C, 0x79, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, - 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x1B, 0x6A, 0x32, 0x2E, - 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, - 0x2E, 0x66, 0x61, 0x73, 0x74, 0x6C, 0x79, 0x2E, 0x6E, 0x65, 0x74, 0x30, 0x82, - 0x01, 0x22, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, - 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, 0x01, 0x0A, - 0x02, 0x82, 0x01, 0x01, 0x00, 0xC2, 0x72, 0xA2, 0x4A, 0xEF, 0x26, 0x42, 0xD7, - 0x85, 0x74, 0xC9, 0xB4, 0x9F, 0xE3, 0x31, 0xD1, 0x40, 0x77, 0xC9, 0x4B, 0x4D, - 0xFE, 0xC8, 0x75, 0xF3, 0x32, 0x76, 0xAD, 0xF9, 0x08, 0x22, 0x9E, 0xFA, 0x2F, - 0xFE, 0xEC, 0x6C, 0xC4, 0xF5, 0x1F, 0x70, 0xC9, 0x8F, 0x07, 0x48, 0x31, 0xAD, - 0x75, 0x18, 0xFC, 0x06, 0x5A, 0x4F, 0xDD, 0xFD, 0x05, 0x39, 0x6F, 0x22, 0xF9, - 0xAD, 0x62, 0x1A, 0x9E, 0xA6, 0x16, 0x48, 0x75, 0x8F, 0xB8, 0x07, 0x18, 0x25, - 0x1A, 0x87, 0x30, 0xB0, 0x3C, 0x6F, 0xE0, 0x9D, 0x90, 0x63, 0x2A, 0x16, 0x1F, - 0x0D, 0x10, 0xFC, 0x06, 0x7E, 0xEA, 0x51, 0xE2, 0xB0, 0x6D, 0x42, 0x4C, 0x2C, - 0x59, 0xF4, 0x6B, 0x99, 0x3E, 0x82, 0x1D, 0x08, 0x04, 0x2F, 0xA0, 0x63, 0x3C, - 0xAA, 0x0E, 0xE1, 0x5D, 0x67, 0x2D, 0xB3, 0xF4, 0x15, 0xD6, 0x16, 0x4E, 0xAA, - 0x91, 0x45, 0x6B, 0xC5, 0xA6, 0xED, 0x83, 0xAF, 0xF1, 0xD7, 0x42, 0x5E, 0x9B, - 0xC8, 0x39, 0x0C, 0x06, 0x76, 0x7A, 0xB8, 0x3E, 0x16, 0x70, 0xF5, 0xEB, 0x8B, - 0x33, 0x5A, 0xA9, 0x03, 0xED, 0x79, 0x0E, 0xAD, 0xBB, 0xC4, 0xF8, 0xDA, 0x93, - 0x53, 0x2A, 0xC4, 0xC9, 0x1A, 0xD1, 0xC3, 0x44, 0xD7, 0xC6, 0xD0, 0xC6, 0xAC, - 0x13, 0xE3, 0xB5, 0x73, 0x3A, 0xDF, 0x54, 0x15, 0xFB, 0xB4, 0x6B, 0x36, 0x39, - 0x18, 0xB5, 0x61, 0x12, 0xF0, 0x37, 0xAB, 0x81, 0x5F, 0x0C, 0xE7, 0xDF, 0xC1, - 0xC5, 0x5E, 0x99, 0x67, 0x85, 0xFF, 0xAD, 0xD6, 0x82, 0x09, 0x1F, 0x27, 0xE5, - 0x32, 0x52, 0x18, 0xEC, 0x35, 0x2F, 0x6C, 0xC9, 0xE6, 0x87, 0xCE, 0x30, 0xF6, - 0xDA, 0x04, 0x3F, 0xA5, 0x8A, 0x0C, 0xAE, 0x5B, 0xB0, 0xEC, 0x29, 0x9B, 0xEE, - 0x8F, 0x52, 0x1E, 0xE2, 0x56, 0x19, 0x45, 0x80, 0x3C, 0x02, 0x57, 0x5C, 0x52, - 0xD9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xA3, 0x82, 0x0C, 0x05, 0x30, 0x82, 0x0C, - 0x01, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01, 0x01, 0xFF, 0x04, 0x04, - 0x03, 0x02, 0x05, 0xA0, 0x30, 0x81, 0x8A, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, - 0x05, 0x07, 0x01, 0x01, 0x04, 0x7E, 0x30, 0x7C, 0x30, 0x42, 0x06, 0x08, 0x2B, - 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, 0x36, 0x68, 0x74, 0x74, 0x70, - 0x3A, 0x2F, 0x2F, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x2E, 0x67, 0x6C, 0x6F, - 0x62, 0x61, 0x6C, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x63, - 0x61, 0x63, 0x65, 0x72, 0x74, 0x2F, 0x63, 0x6C, 0x6F, 0x75, 0x64, 0x73, 0x73, - 0x6C, 0x73, 0x68, 0x61, 0x32, 0x67, 0x33, 0x2E, 0x63, 0x72, 0x74, 0x30, 0x36, - 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x2A, 0x68, - 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x6F, 0x63, 0x73, 0x70, 0x32, 0x2E, 0x67, - 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, - 0x2F, 0x63, 0x6C, 0x6F, 0x75, 0x64, 0x73, 0x73, 0x6C, 0x73, 0x68, 0x61, 0x32, - 0x67, 0x33, 0x30, 0x56, 0x06, 0x03, 0x55, 0x1D, 0x20, 0x04, 0x4F, 0x30, 0x4D, - 0x30, 0x41, 0x06, 0x09, 0x2B, 0x06, 0x01, 0x04, 0x01, 0xA0, 0x32, 0x01, 0x14, - 0x30, 0x34, 0x30, 0x32, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, - 0x01, 0x16, 0x26, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, 0x2F, 0x77, 0x77, - 0x77, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x73, 0x69, 0x67, 0x6E, 0x2E, - 0x63, 0x6F, 0x6D, 0x2F, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, - 0x79, 0x2F, 0x30, 0x08, 0x06, 0x06, 0x67, 0x81, 0x0C, 0x01, 0x02, 0x02, 0x30, - 0x09, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x82, 0x09, - 0x96, 0x06, 0x03, 0x55, 0x1D, 0x11, 0x04, 0x82, 0x09, 0x8D, 0x30, 0x82, 0x09, - 0x89, 0x82, 0x1B, 0x6A, 0x32, 0x2E, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2E, - 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x2E, 0x66, 0x61, 0x73, 0x74, 0x6C, 0x79, - 0x2E, 0x6E, 0x65, 0x74, 0x82, 0x0D, 0x2A, 0x2E, 0x61, 0x32, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x65, 0x2E, 0x66, 0x72, 0x82, 0x19, 0x2A, 0x2E, 0x61, 0x64, 0x76, - 0x65, 0x6E, 0x74, 0x69, 0x73, 0x74, 0x62, 0x6F, 0x6F, 0x6B, 0x63, 0x65, 0x6E, - 0x74, 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x61, 0x70, - 0x69, 0x2E, 0x6C, 0x6F, 0x6C, 0x65, 0x73, 0x70, 0x6F, 0x72, 0x74, 0x73, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x62, 0x61, 0x61, 0x74, 0x63, 0x68, - 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x17, 0x2A, 0x2E, 0x62, 0x69, 0x6F, 0x74, 0x65, - 0x63, 0x68, 0x77, 0x65, 0x65, 0x6B, 0x62, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, 0x62, 0x6F, 0x78, 0x6F, 0x66, 0x73, - 0x74, 0x79, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x63, - 0x61, 0x73, 0x70, 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x2A, 0x2E, - 0x63, 0x68, 0x61, 0x6B, 0x72, 0x61, 0x6C, 0x69, 0x6E, 0x75, 0x78, 0x2E, 0x6F, - 0x72, 0x67, 0x82, 0x18, 0x2A, 0x2E, 0x63, 0x6F, 0x6E, 0x76, 0x65, 0x72, 0x74, - 0x2E, 0x64, 0x73, 0x2E, 0x76, 0x65, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x15, 0x2A, 0x2E, 0x64, 0x65, 0x76, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x73, 0x68, 0x69, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x2E, 0x61, 0x75, 0x82, - 0x1B, 0x2A, 0x2E, 0x64, 0x65, 0x76, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x68, - 0x69, 0x70, 0x69, 0x6E, 0x76, 0x65, 0x73, 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x2E, - 0x61, 0x75, 0x82, 0x0A, 0x2A, 0x2E, 0x65, 0x63, 0x68, 0x6C, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x0F, 0x2A, 0x2E, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x74, 0x61, 0x63, - 0x6B, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x2A, 0x2E, 0x66, 0x69, 0x6C, 0x65, - 0x73, 0x74, 0x61, 0x63, 0x6B, 0x2E, 0x6F, 0x6E, 0x65, 0x6D, 0x6F, 0x62, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x2A, 0x2E, 0x66, 0x69, 0x73, 0x2D, 0x73, 0x6B, - 0x69, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x66, 0x69, 0x73, 0x73, - 0x6B, 0x69, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x66, 0x70, 0x2E, - 0x62, 0x72, 0x61, 0x6E, 0x64, 0x66, 0x6F, 0x6C, 0x64, 0x65, 0x72, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0F, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x65, 0x6E, 0x70, 0x6C, - 0x75, 0x67, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x2A, 0x2E, 0x66, 0x73, 0x2E, - 0x65, 0x6E, 0x70, 0x6C, 0x75, 0x67, 0x2E, 0x69, 0x6E, 0x82, 0x10, 0x2A, 0x2E, - 0x66, 0x73, 0x2E, 0x68, 0x65, 0x72, 0x6F, 0x69, 0x6E, 0x65, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x18, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x6C, 0x65, 0x61, 0x72, 0x6E, - 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x18, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x6C, 0x6F, 0x63, 0x61, 0x6C, - 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x12, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x6D, 0x69, 0x6E, 0x64, 0x66, - 0x6C, 0x61, 0x73, 0x68, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x2A, 0x2E, 0x66, - 0x73, 0x2E, 0x6F, 0x70, 0x73, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, - 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, 0x66, 0x73, 0x2E, - 0x70, 0x69, 0x78, 0x76, 0x61, 0x6E, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x15, - 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x71, 0x61, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, - 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x17, 0x2A, 0x2E, 0x66, - 0x73, 0x2E, 0x74, 0x65, 0x73, 0x74, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, - 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x2A, 0x2E, 0x68, 0x61, - 0x78, 0x78, 0x2E, 0x73, 0x65, 0x82, 0x0D, 0x2A, 0x2E, 0x68, 0x6F, 0x6D, 0x65, - 0x61, 0x77, 0x61, 0x79, 0x2E, 0x6C, 0x6B, 0x82, 0x0F, 0x2A, 0x2E, 0x69, 0x64, - 0x61, 0x74, 0x61, 0x6C, 0x69, 0x6E, 0x6B, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, - 0x2A, 0x2E, 0x69, 0x64, 0x61, 0x74, 0x61, 0x6C, 0x69, 0x6E, 0x6B, 0x6D, 0x61, - 0x65, 0x73, 0x74, 0x72, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x2A, 0x2E, - 0x69, 0x6D, 0x67, 0x2D, 0x74, 0x61, 0x62, 0x6F, 0x6F, 0x6C, 0x61, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0F, 0x2A, 0x2E, 0x6A, 0x75, 0x6C, 0x69, 0x61, 0x6C, 0x61, - 0x6E, 0x67, 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x10, 0x2A, 0x2E, 0x6B, 0x69, 0x6E, - 0x64, 0x73, 0x6E, 0x61, 0x63, 0x6B, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, - 0x2A, 0x2E, 0x6B, 0x73, 0x73, 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, 0x61, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x2A, 0x2E, 0x6B, 0x73, 0x74, 0x63, 0x6F, 0x72, - 0x72, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, 0x6B, 0x73, 0x74, - 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, - 0x2A, 0x2E, 0x6E, 0x65, 0x77, 0x73, 0x31, 0x32, 0x2E, 0x63, 0x6F, 0x6D, 0x82, - 0x1B, 0x2A, 0x2E, 0x70, 0x61, 0x72, 0x74, 0x69, 0x64, 0x65, 0x6E, 0x74, 0x69, - 0x66, 0x69, 0x65, 0x72, 0x2E, 0x73, 0x77, 0x69, 0x73, 0x63, 0x6F, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x13, 0x2A, 0x2E, 0x73, 0x68, 0x6F, 0x70, 0x72, 0x61, 0x63, - 0x68, 0x65, 0x6C, 0x7A, 0x6F, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0A, 0x2A, - 0x2E, 0x74, 0x61, 0x73, 0x74, 0x79, 0x2E, 0x63, 0x6F, 0x82, 0x0C, 0x2A, 0x2E, - 0x74, 0x65, 0x64, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x15, 0x2A, - 0x2E, 0x75, 0x70, 0x6C, 0x6F, 0x61, 0x64, 0x73, 0x2E, 0x66, 0x6F, 0x6C, 0x69, - 0x6F, 0x68, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x76, 0x6F, - 0x75, 0x63, 0x68, 0x65, 0x72, 0x63, 0x6F, 0x64, 0x65, 0x73, 0x2E, 0x63, 0x6F, - 0x2E, 0x75, 0x6B, 0x82, 0x0D, 0x2A, 0x2E, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, - 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x61, 0x2E, 0x69, 0x63, 0x61, 0x6E, - 0x76, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0B, 0x61, 0x32, 0x70, 0x72, - 0x65, 0x73, 0x73, 0x65, 0x2E, 0x66, 0x72, 0x82, 0x17, 0x61, 0x64, 0x76, 0x65, - 0x6E, 0x74, 0x69, 0x73, 0x74, 0x62, 0x6F, 0x6F, 0x6B, 0x63, 0x65, 0x6E, 0x74, - 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x61, 0x70, 0x69, 0x2D, 0x6D, - 0x65, 0x72, 0x72, 0x79, 0x6A, 0x61, 0x6E, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, - 0x12, 0x61, 0x70, 0x69, 0x73, 0x2E, 0x69, 0x64, 0x61, 0x74, 0x61, 0x6C, 0x69, - 0x76, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0F, 0x61, 0x70, 0x70, 0x2D, 0x61, - 0x70, 0x69, 0x2E, 0x74, 0x65, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x61, - 0x70, 0x70, 0x2E, 0x62, 0x69, 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x63, - 0x6F, 0x2E, 0x75, 0x6B, 0x82, 0x0F, 0x61, 0x70, 0x70, 0x2E, 0x62, 0x69, 0x72, - 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x65, 0x73, 0x82, 0x1A, 0x61, 0x70, 0x70, - 0x2E, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, 0x62, 0x69, 0x72, 0x63, - 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x63, 0x6F, 0x2E, 0x75, 0x6B, 0x82, 0x17, 0x61, - 0x70, 0x70, 0x2E, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, 0x62, 0x69, - 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x65, 0x73, 0x82, 0x0A, 0x62, 0x61, - 0x61, 0x74, 0x63, 0x68, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x62, 0x65, 0x72, - 0x6E, 0x61, 0x72, 0x64, 0x63, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x15, 0x62, 0x69, 0x6F, 0x74, 0x65, 0x63, 0x68, 0x77, - 0x65, 0x65, 0x6B, 0x62, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x0E, 0x62, 0x6F, 0x78, 0x6F, 0x66, 0x73, 0x74, 0x79, 0x6C, 0x65, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x0A, 0x63, 0x61, 0x73, 0x70, 0x65, 0x72, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0D, 0x63, 0x64, 0x6E, 0x2E, 0x69, 0x72, 0x73, 0x64, 0x6E, - 0x2E, 0x6E, 0x65, 0x74, 0x82, 0x0F, 0x63, 0x68, 0x61, 0x6B, 0x72, 0x61, 0x6C, - 0x69, 0x6E, 0x75, 0x78, 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x13, 0x64, 0x65, 0x76, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x68, 0x69, 0x70, 0x2E, 0x63, 0x6F, 0x6D, - 0x2E, 0x61, 0x75, 0x82, 0x0B, 0x64, 0x69, 0x67, 0x69, 0x64, 0x61, 0x79, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x22, 0x64, 0x69, 0x67, 0x69, 0x74, 0x61, 0x6C, 0x4C, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2E, 0x62, 0x65, 0x72, 0x6E, 0x61, 0x72, - 0x64, 0x63, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x14, 0x64, 0x72, 0x77, 0x70, 0x2E, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, - 0x67, 0x2E, 0x6D, 0x6F, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x08, 0x65, 0x63, - 0x68, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x66, 0x69, 0x6C, 0x65, 0x73, - 0x74, 0x61, 0x63, 0x6B, 0x2E, 0x6F, 0x6E, 0x65, 0x6D, 0x6F, 0x62, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0D, 0x66, 0x73, 0x2E, 0x65, 0x6E, 0x70, 0x6C, 0x75, 0x67, - 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x66, 0x73, 0x2E, 0x6C, 0x65, 0x61, 0x72, - 0x6E, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x16, 0x66, 0x73, 0x2E, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x7A, - 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x14, 0x66, 0x73, 0x2E, 0x6F, 0x70, 0x73, 0x7A, 0x69, 0x6C, 0x6C, 0x69, - 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x66, 0x73, - 0x2E, 0x71, 0x61, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, - 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x15, 0x66, 0x73, 0x2E, 0x74, 0x65, 0x73, 0x74, - 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x0B, 0x68, 0x6F, 0x6D, 0x65, 0x61, 0x77, 0x61, 0x79, 0x2E, 0x6C, - 0x6B, 0x82, 0x12, 0x69, 0x6D, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x6D, 0x61, 0x69, 0x6C, 0x2E, 0x69, 0x6F, 0x82, 0x0E, 0x6B, 0x69, 0x6E, - 0x64, 0x73, 0x6E, 0x61, 0x63, 0x6B, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, - 0x6B, 0x73, 0x73, 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, 0x61, 0x2E, 0x63, 0x6F, - 0x6D, 0x82, 0x0C, 0x6B, 0x73, 0x74, 0x63, 0x6F, 0x72, 0x72, 0x61, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0D, 0x6D, 0x65, 0x6E, 0x75, 0x2E, 0x74, 0x72, 0x65, 0x65, - 0x7A, 0x2E, 0x69, 0x6F, 0x82, 0x17, 0x6D, 0x6F, 0x62, 0x69, 0x6C, 0x65, 0x61, - 0x70, 0x69, 0x2E, 0x69, 0x64, 0x61, 0x74, 0x61, 0x6C, 0x69, 0x6E, 0x6B, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x0A, 0x6E, 0x65, 0x77, 0x73, 0x31, 0x32, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0B, 0x6F, 0x6D, 0x6E, 0x69, 0x67, 0x6F, 0x6E, 0x2E, 0x63, - 0x6F, 0x6D, 0x82, 0x0E, 0x6F, 0x72, 0x65, 0x69, 0x6C, 0x6C, 0x79, 0x2E, 0x72, - 0x65, 0x76, 0x69, 0x65, 0x77, 0x82, 0x11, 0x70, 0x6F, 0x70, 0x79, 0x6F, 0x75, - 0x72, 0x62, 0x75, 0x62, 0x62, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x18, - 0x70, 0x72, 0x6F, 0x64, 0x2E, 0x62, 0x65, 0x72, 0x6E, 0x61, 0x72, 0x64, 0x63, - 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x18, - 0x72, 0x65, 0x6C, 0x65, 0x61, 0x73, 0x65, 0x2D, 0x70, 0x72, 0x69, 0x6D, 0x65, - 0x2E, 0x73, 0x70, 0x6F, 0x6B, 0x65, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x19, - 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x69, 0x65, 0x73, 0x2E, - 0x73, 0x65, 0x6E, 0x73, 0x75, 0x61, 0x70, 0x70, 0x2E, 0x6F, 0x72, 0x67, 0x82, - 0x0C, 0x72, 0x6C, 0x2E, 0x74, 0x61, 0x6C, 0x69, 0x73, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x11, 0x73, 0x68, 0x6F, 0x70, 0x72, 0x61, 0x63, 0x68, 0x65, 0x6C, 0x7A, - 0x6F, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0F, 0x73, 0x74, 0x61, 0x67, 0x69, - 0x6E, 0x67, 0x2E, 0x6D, 0x6F, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x73, - 0x74, 0x61, 0x74, 0x69, 0x63, 0x2E, 0x70, 0x6C, 0x75, 0x6D, 0x63, 0x61, 0x63, - 0x68, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x73, 0x74, 0x61, 0x79, 0x69, - 0x6E, 0x67, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x2E, 0x6D, 0x73, 0x66, 0x2E, 0x6F, - 0x72, 0x67, 0x82, 0x08, 0x74, 0x61, 0x73, 0x74, 0x79, 0x2E, 0x63, 0x6F, 0x82, - 0x0C, 0x74, 0x6F, 0x70, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x13, 0x75, 0x70, 0x6C, 0x6F, 0x61, 0x64, 0x73, 0x2E, 0x66, 0x6F, 0x6C, - 0x69, 0x6F, 0x68, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x1A, 0x75, 0x73, 0x2D, - 0x65, 0x75, 0x2E, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x74, 0x61, 0x63, 0x6B, 0x63, - 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x76, - 0x6F, 0x75, 0x63, 0x68, 0x65, 0x72, 0x63, 0x6F, 0x64, 0x65, 0x73, 0x2E, 0x63, - 0x6F, 0x2E, 0x75, 0x6B, 0x82, 0x0B, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, - 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x77, 0x6F, 0x6D, 0x65, 0x6E, 0x73, 0x68, - 0x65, 0x61, 0x6C, 0x74, 0x68, 0x2D, 0x6A, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x82, - 0x19, 0x77, 0x6F, 0x72, 0x6B, 0x65, 0x72, 0x62, 0x65, 0x65, 0x2E, 0x73, 0x74, - 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, 0x6D, 0x6F, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x0A, 0x77, 0x77, 0x77, 0x2E, 0x61, 0x67, 0x66, 0x2E, 0x64, 0x6B, 0x82, - 0x14, 0x77, 0x77, 0x77, 0x2E, 0x61, 0x76, 0x65, 0x6E, 0x69, 0x72, 0x2D, 0x73, - 0x75, 0x69, 0x73, 0x73, 0x65, 0x2E, 0x63, 0x68, 0x82, 0x11, 0x77, 0x77, 0x77, - 0x2E, 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, 0x72, 0x2E, 0x63, 0x6F, 0x2E, 0x6E, - 0x7A, 0x82, 0x15, 0x77, 0x77, 0x77, 0x2E, 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, - 0x72, 0x62, 0x6C, 0x75, 0x65, 0x2E, 0x63, 0x6F, 0x2E, 0x6E, 0x7A, 0x82, 0x16, - 0x77, 0x77, 0x77, 0x2E, 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, 0x72, 0x62, 0x6C, - 0x75, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x2E, 0x61, 0x75, 0x82, 0x1D, 0x77, 0x77, - 0x77, 0x2E, 0x63, 0x68, 0x61, 0x6D, 0x70, 0x69, 0x6F, 0x6E, 0x73, 0x68, 0x6F, - 0x63, 0x6B, 0x65, 0x79, 0x6C, 0x65, 0x61, 0x67, 0x75, 0x65, 0x2E, 0x6E, 0x65, - 0x74, 0x82, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x65, 0x78, 0x74, 0x65, 0x72, 0x72, - 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x77, 0x77, 0x77, 0x2E, 0x65, 0x7A, - 0x75, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0B, 0x77, 0x77, 0x77, 0x2E, 0x65, - 0x7A, 0x75, 0x70, 0x2E, 0x64, 0x65, 0x82, 0x0B, 0x77, 0x77, 0x77, 0x2E, 0x65, - 0x7A, 0x75, 0x70, 0x2E, 0x65, 0x75, 0x82, 0x0B, 0x77, 0x77, 0x77, 0x2E, 0x65, - 0x7A, 0x75, 0x70, 0x2E, 0x6E, 0x6C, 0x82, 0x11, 0x77, 0x77, 0x77, 0x2E, 0x66, - 0x72, 0x61, 0x6E, 0x6B, 0x62, 0x6F, 0x64, 0x79, 0x2E, 0x63, 0x6F, 0x6D, 0x82, - 0x0D, 0x77, 0x77, 0x77, 0x2E, 0x67, 0x6C, 0x6F, 0x73, 0x73, 0x79, 0x2E, 0x63, - 0x6F, 0x82, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x67, 0x6F, 0x6C, 0x64, 0x63, 0x75, - 0x70, 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x69, 0x63, - 0x61, 0x6E, 0x76, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x77, 0x77, - 0x77, 0x2E, 0x6D, 0x6F, 0x6E, 0x69, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, - 0x77, 0x77, 0x77, 0x2E, 0x6F, 0x64, 0x65, 0x6E, 0x73, 0x65, 0x2D, 0x6D, 0x61, - 0x72, 0x63, 0x69, 0x70, 0x61, 0x6E, 0x2E, 0x64, 0x6B, 0x82, 0x15, 0x77, 0x77, - 0x77, 0x2E, 0x6F, 0x6E, 0x65, 0x63, 0x6C, 0x69, 0x63, 0x6B, 0x64, 0x72, 0x69, - 0x76, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x77, 0x77, 0x77, 0x2E, 0x6F, - 0x72, 0x65, 0x69, 0x6C, 0x6C, 0x79, 0x2E, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, - 0x82, 0x15, 0x77, 0x77, 0x77, 0x2E, 0x70, 0x6F, 0x70, 0x79, 0x6F, 0x75, 0x72, - 0x62, 0x75, 0x62, 0x62, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x77, - 0x77, 0x77, 0x2E, 0x72, 0x61, 0x77, 0x6E, 0x65, 0x74, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x0E, 0x77, 0x77, 0x77, 0x2E, 0x73, 0x70, 0x6F, 0x6B, 0x65, 0x6F, 0x2E, - 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x77, 0x77, 0x77, 0x2E, 0x74, 0x65, 0x61, 0x72, - 0x73, 0x68, 0x65, 0x65, 0x74, 0x2E, 0x63, 0x6F, 0x82, 0x10, 0x77, 0x77, 0x77, - 0x2E, 0x74, 0x6F, 0x70, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2E, 0x63, 0x6F, 0x6D, - 0x82, 0x16, 0x77, 0x77, 0x77, 0x2E, 0x77, 0x68, 0x69, 0x74, 0x65, 0x6B, 0x65, - 0x79, 0x76, 0x69, 0x6C, 0x6C, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x1D, - 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2B, 0x06, - 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, - 0x07, 0x03, 0x02, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, - 0x14, 0xA8, 0x29, 0xFD, 0xA9, 0xA5, 0x1A, 0x1C, 0x37, 0x0B, 0x20, 0x3B, 0x98, - 0xB7, 0x25, 0x39, 0xCC, 0xE5, 0x2F, 0xF4, 0x94, 0x30, 0x1F, 0x06, 0x03, 0x55, - 0x1D, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xA9, 0x2B, 0x87, 0xE1, 0xCE, - 0x24, 0x47, 0x3B, 0x1B, 0xBF, 0xCF, 0x85, 0x37, 0x02, 0x55, 0x9D, 0x0D, 0x94, - 0x58, 0xE6, 0x30, 0x82, 0x01, 0x04, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, - 0xD6, 0x79, 0x02, 0x04, 0x02, 0x04, 0x81, 0xF5, 0x04, 0x81, 0xF2, 0x00, 0xF0, - 0x00, 0x77, 0x00, 0xA4, 0xB9, 0x09, 0x90, 0xB4, 0x18, 0x58, 0x14, 0x87, 0xBB, - 0x13, 0xA2, 0xCC, 0x67, 0x70, 0x0A, 0x3C, 0x35, 0x98, 0x04, 0xF9, 0x1B, 0xDF, - 0xB8, 0xE3, 0x77, 0xCD, 0x0E, 0xC8, 0x0D, 0xDC, 0x10, 0x00, 0x00, 0x01, 0x66, - 0x9C, 0xC8, 0xE7, 0x38, 0x00, 0x00, 0x04, 0x03, 0x00, 0x48, 0x30, 0x46, 0x02, - 0x21, 0x00, 0xD9, 0x58, 0x6E, 0xFC, 0x4C, 0x3C, 0xAF, 0xF9, 0x5B, 0x7F, 0xDA, - 0x54, 0x95, 0xAF, 0xCF, 0xB3, 0x57, 0xB9, 0x56, 0x2C, 0xE8, 0xE0, 0xB1, 0x20, - 0x9B, 0xCB, 0x75, 0xAC, 0x4E, 0x54, 0xE9, 0x9D, 0x02, 0x21, 0x00, 0xE8, 0xF0, - 0xC0, 0x49, 0x23, 0x8E, 0x3D, 0x9B, 0xA5, 0x87, 0xA3, 0xBE, 0x6C, 0x21, 0x62, - 0xBB, 0xD2, 0x44, 0x5C, 0xE4, 0x7A, 0xCC, 0x46, 0x26, 0x04, 0x19, 0xA4, 0x2D, - 0x9B, 0x1C, 0x5D, 0x3A, 0x00, 0x75, 0x00, 0x6F, 0x53, 0x76, 0xAC, 0x31, 0xF0, - 0x31, 0x19, 0xD8, 0x99, 0x00, 0xA4, 0x51, 0x15, 0xFF, 0x77, 0x15, 0x1C, 0x11, - 0xD9, 0x02, 0xC1, 0x00, 0x29, 0x06, 0x8D, 0xB2, 0x08, 0x9A, 0x37, 0xD9, 0x13, - 0x00, 0x00, 0x01, 0x66, 0x9C, 0xC8, 0xE6, 0x20, 0x00, 0x00, 0x04, 0x03, 0x00, - 0x46, 0x30, 0x44, 0x02, 0x20, 0x14, 0xC8, 0x9F, 0xAC, 0x27, 0x48, 0xBE, 0x4D, - 0x0E, 0xC3, 0x26, 0x2E, 0x34, 0xCA, 0x38, 0xBA, 0x11, 0x3A, 0x68, 0x71, 0x88, - 0xEB, 0x24, 0x26, 0x59, 0x3E, 0xAC, 0xA8, 0x63, 0xCC, 0x8A, 0x0A, 0x02, 0x20, - 0x0F, 0x22, 0xBF, 0x0D, 0x1F, 0x8A, 0x8D, 0x1D, 0x91, 0x33, 0x3A, 0x40, 0xE4, - 0x23, 0x78, 0xFA, 0x22, 0xF5, 0x9B, 0xCB, 0x04, 0x4F, 0x53, 0x2D, 0x20, 0x75, - 0x2F, 0x76, 0x8A, 0xB1, 0xCD, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, - 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, - 0x03, 0x41, 0x0F, 0xF3, 0xA6, 0x62, 0xA2, 0xE5, 0xB4, 0x8D, 0xA8, 0x08, 0x71, - 0x7B, 0xB3, 0xE3, 0x51, 0x61, 0x0D, 0xC0, 0x67, 0x6C, 0x3C, 0x9C, 0x00, 0x0B, - 0x63, 0x77, 0xB6, 0xB6, 0x11, 0x67, 0x77, 0xA5, 0xE1, 0x49, 0xE0, 0x7F, 0xB7, - 0x1D, 0x61, 0xFB, 0x83, 0x9C, 0x83, 0x42, 0xE9, 0x31, 0xCA, 0x51, 0xE3, 0xC1, - 0xBD, 0x9B, 0x2F, 0xB5, 0x35, 0x05, 0x72, 0x7F, 0x40, 0xA6, 0x7C, 0xC9, 0xF1, - 0x59, 0xA7, 0x15, 0xB8, 0x12, 0xDA, 0xF8, 0xCE, 0x83, 0x61, 0xFC, 0x47, 0x96, - 0x9E, 0x74, 0xFE, 0xCD, 0xE4, 0x61, 0x92, 0xF2, 0x2E, 0x0C, 0x08, 0x4B, 0x60, - 0x2D, 0xF6, 0x50, 0x07, 0x83, 0xCA, 0xAF, 0xB9, 0x41, 0x33, 0x4A, 0x3E, 0x84, - 0xC7, 0x73, 0xC6, 0x1F, 0xFF, 0x7A, 0xDF, 0xAE, 0x47, 0x25, 0x32, 0xEB, 0xC0, - 0x43, 0x0C, 0xA6, 0x23, 0x13, 0x46, 0xC3, 0xFA, 0x44, 0xEA, 0x20, 0xEA, 0xCB, - 0x18, 0x17, 0x00, 0xB6, 0xE7, 0x6D, 0x8A, 0x14, 0x8C, 0x6A, 0xCA, 0x88, 0x4C, - 0xDA, 0xA8, 0xB9, 0x08, 0xAF, 0x39, 0xEE, 0xCF, 0xD7, 0xF7, 0x32, 0xC0, 0xF4, - 0xCF, 0x4E, 0x22, 0x38, 0xF7, 0xAF, 0xAE, 0x7D, 0x58, 0x5F, 0xA5, 0x2D, 0x4D, - 0xBB, 0x86, 0x10, 0xB3, 0x93, 0x62, 0x64, 0x27, 0xBF, 0xB1, 0xBB, 0x8F, 0x9F, - 0xFC, 0x07, 0x3C, 0x4B, 0x16, 0x7A, 0x84, 0x5E, 0xAF, 0xAD, 0x57, 0x9C, 0xFF, - 0x7A, 0xA7, 0xE0, 0x90, 0x89, 0x1C, 0xE8, 0xE5, 0x11, 0xF7, 0xB6, 0xDC, 0xCD, - 0x5E, 0xF7, 0x30, 0xA2, 0x2E, 0x67, 0x6D, 0x4A, 0x70, 0x26, 0xEA, 0xCD, 0x27, - 0x70, 0x77, 0x54, 0x57, 0x09, 0x03, 0x56, 0x4A, 0x33, 0x60, 0x00, 0x27, 0xFE, - 0xA7, 0xD7, 0xA9, 0xC4, 0xEC, 0x17, 0x17, 0x8D, 0x87, 0x70, 0x6B, 0x48, 0x88, - 0x61, 0x54, 0x4A, 0x2B, 0xB7, 0x6A, 0x12, 0x08, 0xFB, + 0x30, 0x82, 0x0F, 0x5B, 0x30, 0x82, 0x0E, 0x43, 0xA0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x0C, 0x08, 0x77, 0x99, 0x2C, 0x6B, 0x67, 0xE1, 0x18, 0xD6, + 0x66, 0x66, 0x9E, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, + 0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x30, 0x57, 0x31, 0x0B, 0x30, 0x09, + 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x42, 0x45, 0x31, 0x19, 0x30, + 0x17, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x10, 0x47, 0x6C, 0x6F, 0x62, + 0x61, 0x6C, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x6E, 0x76, 0x2D, 0x73, 0x61, + 0x31, 0x2D, 0x30, 0x2B, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x24, 0x47, + 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x43, 0x6C, + 0x6F, 0x75, 0x64, 0x53, 0x53, 0x4C, 0x20, 0x43, 0x41, 0x20, 0x2D, 0x20, + 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x2D, 0x20, 0x47, 0x33, 0x30, + 0x1E, 0x17, 0x0D, 0x31, 0x38, 0x31, 0x30, 0x32, 0x32, 0x31, 0x37, 0x31, + 0x38, 0x32, 0x31, 0x5A, 0x17, 0x0D, 0x31, 0x39, 0x30, 0x33, 0x32, 0x31, + 0x31, 0x33, 0x34, 0x33, 0x34, 0x34, 0x5A, 0x30, 0x77, 0x31, 0x0B, 0x30, + 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, + 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x0A, 0x43, 0x61, 0x6C, + 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x31, 0x16, 0x30, 0x14, 0x06, + 0x03, 0x55, 0x04, 0x07, 0x0C, 0x0D, 0x53, 0x61, 0x6E, 0x20, 0x46, 0x72, + 0x61, 0x6E, 0x63, 0x69, 0x73, 0x63, 0x6F, 0x31, 0x15, 0x30, 0x13, 0x06, + 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0C, 0x46, 0x61, 0x73, 0x74, 0x6C, 0x79, + 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, + 0x55, 0x04, 0x03, 0x0C, 0x1B, 0x6A, 0x32, 0x2E, 0x73, 0x68, 0x61, 0x72, + 0x65, 0x64, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x2E, 0x66, 0x61, + 0x73, 0x74, 0x6C, 0x79, 0x2E, 0x6E, 0x65, 0x74, 0x30, 0x82, 0x01, 0x22, + 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, + 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0F, 0x00, 0x30, 0x82, 0x01, 0x0A, + 0x02, 0x82, 0x01, 0x01, 0x00, 0xC2, 0x72, 0xA2, 0x4A, 0xEF, 0x26, 0x42, + 0xD7, 0x85, 0x74, 0xC9, 0xB4, 0x9F, 0xE3, 0x31, 0xD1, 0x40, 0x77, 0xC9, + 0x4B, 0x4D, 0xFE, 0xC8, 0x75, 0xF3, 0x32, 0x76, 0xAD, 0xF9, 0x08, 0x22, + 0x9E, 0xFA, 0x2F, 0xFE, 0xEC, 0x6C, 0xC4, 0xF5, 0x1F, 0x70, 0xC9, 0x8F, + 0x07, 0x48, 0x31, 0xAD, 0x75, 0x18, 0xFC, 0x06, 0x5A, 0x4F, 0xDD, 0xFD, + 0x05, 0x39, 0x6F, 0x22, 0xF9, 0xAD, 0x62, 0x1A, 0x9E, 0xA6, 0x16, 0x48, + 0x75, 0x8F, 0xB8, 0x07, 0x18, 0x25, 0x1A, 0x87, 0x30, 0xB0, 0x3C, 0x6F, + 0xE0, 0x9D, 0x90, 0x63, 0x2A, 0x16, 0x1F, 0x0D, 0x10, 0xFC, 0x06, 0x7E, + 0xEA, 0x51, 0xE2, 0xB0, 0x6D, 0x42, 0x4C, 0x2C, 0x59, 0xF4, 0x6B, 0x99, + 0x3E, 0x82, 0x1D, 0x08, 0x04, 0x2F, 0xA0, 0x63, 0x3C, 0xAA, 0x0E, 0xE1, + 0x5D, 0x67, 0x2D, 0xB3, 0xF4, 0x15, 0xD6, 0x16, 0x4E, 0xAA, 0x91, 0x45, + 0x6B, 0xC5, 0xA6, 0xED, 0x83, 0xAF, 0xF1, 0xD7, 0x42, 0x5E, 0x9B, 0xC8, + 0x39, 0x0C, 0x06, 0x76, 0x7A, 0xB8, 0x3E, 0x16, 0x70, 0xF5, 0xEB, 0x8B, + 0x33, 0x5A, 0xA9, 0x03, 0xED, 0x79, 0x0E, 0xAD, 0xBB, 0xC4, 0xF8, 0xDA, + 0x93, 0x53, 0x2A, 0xC4, 0xC9, 0x1A, 0xD1, 0xC3, 0x44, 0xD7, 0xC6, 0xD0, + 0xC6, 0xAC, 0x13, 0xE3, 0xB5, 0x73, 0x3A, 0xDF, 0x54, 0x15, 0xFB, 0xB4, + 0x6B, 0x36, 0x39, 0x18, 0xB5, 0x61, 0x12, 0xF0, 0x37, 0xAB, 0x81, 0x5F, + 0x0C, 0xE7, 0xDF, 0xC1, 0xC5, 0x5E, 0x99, 0x67, 0x85, 0xFF, 0xAD, 0xD6, + 0x82, 0x09, 0x1F, 0x27, 0xE5, 0x32, 0x52, 0x18, 0xEC, 0x35, 0x2F, 0x6C, + 0xC9, 0xE6, 0x87, 0xCE, 0x30, 0xF6, 0xDA, 0x04, 0x3F, 0xA5, 0x8A, 0x0C, + 0xAE, 0x5B, 0xB0, 0xEC, 0x29, 0x9B, 0xEE, 0x8F, 0x52, 0x1E, 0xE2, 0x56, + 0x19, 0x45, 0x80, 0x3C, 0x02, 0x57, 0x5C, 0x52, 0xD9, 0x02, 0x03, 0x01, + 0x00, 0x01, 0xA3, 0x82, 0x0C, 0x05, 0x30, 0x82, 0x0C, 0x01, 0x30, 0x0E, + 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01, 0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, + 0x05, 0xA0, 0x30, 0x81, 0x8A, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, + 0x07, 0x01, 0x01, 0x04, 0x7E, 0x30, 0x7C, 0x30, 0x42, 0x06, 0x08, 0x2B, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, 0x36, 0x68, 0x74, 0x74, + 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x2E, 0x67, + 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, + 0x6D, 0x2F, 0x63, 0x61, 0x63, 0x65, 0x72, 0x74, 0x2F, 0x63, 0x6C, 0x6F, + 0x75, 0x64, 0x73, 0x73, 0x6C, 0x73, 0x68, 0x61, 0x32, 0x67, 0x33, 0x2E, + 0x63, 0x72, 0x74, 0x30, 0x36, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, + 0x07, 0x30, 0x01, 0x86, 0x2A, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, + 0x6F, 0x63, 0x73, 0x70, 0x32, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, + 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x63, 0x6C, 0x6F, + 0x75, 0x64, 0x73, 0x73, 0x6C, 0x73, 0x68, 0x61, 0x32, 0x67, 0x33, 0x30, + 0x56, 0x06, 0x03, 0x55, 0x1D, 0x20, 0x04, 0x4F, 0x30, 0x4D, 0x30, 0x41, + 0x06, 0x09, 0x2B, 0x06, 0x01, 0x04, 0x01, 0xA0, 0x32, 0x01, 0x14, 0x30, + 0x34, 0x30, 0x32, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, + 0x01, 0x16, 0x26, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, 0x2F, 0x77, + 0x77, 0x77, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x73, 0x69, 0x67, + 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, + 0x74, 0x6F, 0x72, 0x79, 0x2F, 0x30, 0x08, 0x06, 0x06, 0x67, 0x81, 0x0C, + 0x01, 0x02, 0x02, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x02, + 0x30, 0x00, 0x30, 0x82, 0x09, 0x96, 0x06, 0x03, 0x55, 0x1D, 0x11, 0x04, + 0x82, 0x09, 0x8D, 0x30, 0x82, 0x09, 0x89, 0x82, 0x1B, 0x6A, 0x32, 0x2E, + 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2E, 0x67, 0x6C, 0x6F, 0x62, 0x61, + 0x6C, 0x2E, 0x66, 0x61, 0x73, 0x74, 0x6C, 0x79, 0x2E, 0x6E, 0x65, 0x74, + 0x82, 0x0D, 0x2A, 0x2E, 0x61, 0x32, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, + 0x2E, 0x66, 0x72, 0x82, 0x19, 0x2A, 0x2E, 0x61, 0x64, 0x76, 0x65, 0x6E, + 0x74, 0x69, 0x73, 0x74, 0x62, 0x6F, 0x6F, 0x6B, 0x63, 0x65, 0x6E, 0x74, + 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x61, 0x70, + 0x69, 0x2E, 0x6C, 0x6F, 0x6C, 0x65, 0x73, 0x70, 0x6F, 0x72, 0x74, 0x73, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x62, 0x61, 0x61, 0x74, + 0x63, 0x68, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x17, 0x2A, 0x2E, 0x62, 0x69, + 0x6F, 0x74, 0x65, 0x63, 0x68, 0x77, 0x65, 0x65, 0x6B, 0x62, 0x6F, 0x73, + 0x74, 0x6F, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, 0x62, + 0x6F, 0x78, 0x6F, 0x66, 0x73, 0x74, 0x79, 0x6C, 0x65, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x63, 0x61, 0x73, 0x70, 0x65, 0x72, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x2A, 0x2E, 0x63, 0x68, 0x61, 0x6B, 0x72, + 0x61, 0x6C, 0x69, 0x6E, 0x75, 0x78, 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x18, + 0x2A, 0x2E, 0x63, 0x6F, 0x6E, 0x76, 0x65, 0x72, 0x74, 0x2E, 0x64, 0x73, + 0x2E, 0x76, 0x65, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x15, 0x2A, 0x2E, 0x64, 0x65, 0x76, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x73, 0x68, 0x69, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x2E, 0x61, 0x75, 0x82, + 0x1B, 0x2A, 0x2E, 0x64, 0x65, 0x76, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, + 0x68, 0x69, 0x70, 0x69, 0x6E, 0x76, 0x65, 0x73, 0x74, 0x2E, 0x63, 0x6F, + 0x6D, 0x2E, 0x61, 0x75, 0x82, 0x0A, 0x2A, 0x2E, 0x65, 0x63, 0x68, 0x6C, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0F, 0x2A, 0x2E, 0x66, 0x69, 0x6C, 0x65, + 0x73, 0x74, 0x61, 0x63, 0x6B, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x2A, + 0x2E, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x74, 0x61, 0x63, 0x6B, 0x2E, 0x6F, + 0x6E, 0x65, 0x6D, 0x6F, 0x62, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x2A, + 0x2E, 0x66, 0x69, 0x73, 0x2D, 0x73, 0x6B, 0x69, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x0C, 0x2A, 0x2E, 0x66, 0x69, 0x73, 0x73, 0x6B, 0x69, 0x2E, 0x63, + 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x66, 0x70, 0x2E, 0x62, 0x72, 0x61, + 0x6E, 0x64, 0x66, 0x6F, 0x6C, 0x64, 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x0F, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x65, 0x6E, 0x70, 0x6C, 0x75, + 0x67, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x2A, 0x2E, 0x66, 0x73, 0x2E, + 0x65, 0x6E, 0x70, 0x6C, 0x75, 0x67, 0x2E, 0x69, 0x6E, 0x82, 0x10, 0x2A, + 0x2E, 0x66, 0x73, 0x2E, 0x68, 0x65, 0x72, 0x6F, 0x69, 0x6E, 0x65, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x18, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x6C, 0x65, + 0x61, 0x72, 0x6E, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, + 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x18, 0x2A, 0x2E, 0x66, 0x73, 0x2E, + 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, + 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x2A, 0x2E, 0x66, + 0x73, 0x2E, 0x6D, 0x69, 0x6E, 0x64, 0x66, 0x6C, 0x61, 0x73, 0x68, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x6F, 0x70, + 0x73, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, 0x66, 0x73, 0x2E, 0x70, 0x69, + 0x78, 0x76, 0x61, 0x6E, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x15, 0x2A, + 0x2E, 0x66, 0x73, 0x2E, 0x71, 0x61, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, + 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x17, 0x2A, 0x2E, + 0x66, 0x73, 0x2E, 0x74, 0x65, 0x73, 0x74, 0x7A, 0x69, 0x6C, 0x6C, 0x69, + 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x2A, + 0x2E, 0x68, 0x61, 0x78, 0x78, 0x2E, 0x73, 0x65, 0x82, 0x0D, 0x2A, 0x2E, + 0x68, 0x6F, 0x6D, 0x65, 0x61, 0x77, 0x61, 0x79, 0x2E, 0x6C, 0x6B, 0x82, + 0x0F, 0x2A, 0x2E, 0x69, 0x64, 0x61, 0x74, 0x61, 0x6C, 0x69, 0x6E, 0x6B, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x2A, 0x2E, 0x69, 0x64, 0x61, 0x74, + 0x61, 0x6C, 0x69, 0x6E, 0x6B, 0x6D, 0x61, 0x65, 0x73, 0x74, 0x72, 0x6F, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x2A, 0x2E, 0x69, 0x6D, 0x67, 0x2D, + 0x74, 0x61, 0x62, 0x6F, 0x6F, 0x6C, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x0F, 0x2A, 0x2E, 0x6A, 0x75, 0x6C, 0x69, 0x61, 0x6C, 0x61, 0x6E, 0x67, + 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x10, 0x2A, 0x2E, 0x6B, 0x69, 0x6E, 0x64, + 0x73, 0x6E, 0x61, 0x63, 0x6B, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, + 0x2A, 0x2E, 0x6B, 0x73, 0x73, 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, 0x61, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x2A, 0x2E, 0x6B, 0x73, 0x74, 0x63, + 0x6F, 0x72, 0x72, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x10, 0x2A, 0x2E, + 0x6B, 0x73, 0x74, 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, 0x61, 0x2E, 0x63, + 0x6F, 0x6D, 0x82, 0x0C, 0x2A, 0x2E, 0x6E, 0x65, 0x77, 0x73, 0x31, 0x32, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x1B, 0x2A, 0x2E, 0x70, 0x61, 0x72, 0x74, + 0x69, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x2E, 0x73, + 0x77, 0x69, 0x73, 0x63, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x2A, + 0x2E, 0x73, 0x68, 0x6F, 0x70, 0x72, 0x61, 0x63, 0x68, 0x65, 0x6C, 0x7A, + 0x6F, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0A, 0x2A, 0x2E, 0x74, 0x61, + 0x73, 0x74, 0x79, 0x2E, 0x63, 0x6F, 0x82, 0x0C, 0x2A, 0x2E, 0x74, 0x65, + 0x64, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x15, 0x2A, 0x2E, + 0x75, 0x70, 0x6C, 0x6F, 0x61, 0x64, 0x73, 0x2E, 0x66, 0x6F, 0x6C, 0x69, + 0x6F, 0x68, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x2A, 0x2E, 0x76, + 0x6F, 0x75, 0x63, 0x68, 0x65, 0x72, 0x63, 0x6F, 0x64, 0x65, 0x73, 0x2E, + 0x63, 0x6F, 0x2E, 0x75, 0x6B, 0x82, 0x0D, 0x2A, 0x2E, 0x77, 0x65, 0x61, + 0x74, 0x68, 0x65, 0x72, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x61, 0x2E, + 0x69, 0x63, 0x61, 0x6E, 0x76, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x0B, 0x61, 0x32, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x2E, 0x66, 0x72, + 0x82, 0x17, 0x61, 0x64, 0x76, 0x65, 0x6E, 0x74, 0x69, 0x73, 0x74, 0x62, + 0x6F, 0x6F, 0x6B, 0x63, 0x65, 0x6E, 0x74, 0x65, 0x72, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x11, 0x61, 0x70, 0x69, 0x2D, 0x6D, 0x65, 0x72, 0x72, 0x79, + 0x6A, 0x61, 0x6E, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x61, 0x70, + 0x69, 0x73, 0x2E, 0x69, 0x64, 0x61, 0x74, 0x61, 0x6C, 0x69, 0x76, 0x65, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0F, 0x61, 0x70, 0x70, 0x2D, 0x61, 0x70, + 0x69, 0x2E, 0x74, 0x65, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x61, + 0x70, 0x70, 0x2E, 0x62, 0x69, 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, + 0x63, 0x6F, 0x2E, 0x75, 0x6B, 0x82, 0x0F, 0x61, 0x70, 0x70, 0x2E, 0x62, + 0x69, 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x65, 0x73, 0x82, 0x1A, + 0x61, 0x70, 0x70, 0x2E, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, + 0x62, 0x69, 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, 0x2E, 0x63, 0x6F, 0x2E, + 0x75, 0x6B, 0x82, 0x17, 0x61, 0x70, 0x70, 0x2E, 0x73, 0x74, 0x61, 0x67, + 0x69, 0x6E, 0x67, 0x2E, 0x62, 0x69, 0x72, 0x63, 0x68, 0x62, 0x6F, 0x78, + 0x2E, 0x65, 0x73, 0x82, 0x0A, 0x62, 0x61, 0x61, 0x74, 0x63, 0x68, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x62, 0x65, 0x72, 0x6E, 0x61, 0x72, 0x64, + 0x63, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x15, 0x62, 0x69, 0x6F, 0x74, 0x65, 0x63, 0x68, 0x77, 0x65, 0x65, + 0x6B, 0x62, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x0E, 0x62, 0x6F, 0x78, 0x6F, 0x66, 0x73, 0x74, 0x79, 0x6C, 0x65, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x0A, 0x63, 0x61, 0x73, 0x70, 0x65, 0x72, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x63, 0x64, 0x6E, 0x2E, 0x69, 0x72, 0x73, + 0x64, 0x6E, 0x2E, 0x6E, 0x65, 0x74, 0x82, 0x0F, 0x63, 0x68, 0x61, 0x6B, + 0x72, 0x61, 0x6C, 0x69, 0x6E, 0x75, 0x78, 0x2E, 0x6F, 0x72, 0x67, 0x82, + 0x13, 0x64, 0x65, 0x76, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x68, 0x69, + 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x2E, 0x61, 0x75, 0x82, 0x0B, 0x64, 0x69, + 0x67, 0x69, 0x64, 0x61, 0x79, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x22, 0x64, + 0x69, 0x67, 0x69, 0x74, 0x61, 0x6C, 0x4C, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x2E, 0x62, 0x65, 0x72, 0x6E, 0x61, 0x72, 0x64, 0x63, 0x6F, 0x6E, + 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x64, + 0x72, 0x77, 0x70, 0x2E, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, + 0x6D, 0x6F, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x08, 0x65, 0x63, 0x68, + 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x66, 0x69, 0x6C, 0x65, 0x73, + 0x74, 0x61, 0x63, 0x6B, 0x2E, 0x6F, 0x6E, 0x65, 0x6D, 0x6F, 0x62, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x66, 0x73, 0x2E, 0x65, 0x6E, 0x70, 0x6C, + 0x75, 0x67, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x66, 0x73, 0x2E, 0x6C, + 0x65, 0x61, 0x72, 0x6E, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, + 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, 0x66, 0x73, 0x2E, 0x6C, + 0x6F, 0x63, 0x61, 0x6C, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, + 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x66, 0x73, 0x2E, 0x6F, + 0x70, 0x73, 0x7A, 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x66, 0x73, 0x2E, 0x71, 0x61, 0x7A, + 0x69, 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x15, 0x66, 0x73, 0x2E, 0x74, 0x65, 0x73, 0x74, 0x7A, 0x69, + 0x6C, 0x6C, 0x69, 0x6F, 0x6E, 0x63, 0x64, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x0B, 0x68, 0x6F, 0x6D, 0x65, 0x61, 0x77, 0x61, 0x79, 0x2E, 0x6C, + 0x6B, 0x82, 0x12, 0x69, 0x6D, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x67, 0x67, + 0x65, 0x72, 0x6D, 0x61, 0x69, 0x6C, 0x2E, 0x69, 0x6F, 0x82, 0x0E, 0x6B, + 0x69, 0x6E, 0x64, 0x73, 0x6E, 0x61, 0x63, 0x6B, 0x73, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x0E, 0x6B, 0x73, 0x73, 0x76, 0x61, 0x6E, 0x69, 0x6C, 0x6C, + 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x6B, 0x73, 0x74, 0x63, 0x6F, + 0x72, 0x72, 0x61, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x6D, 0x65, 0x6E, + 0x75, 0x2E, 0x74, 0x72, 0x65, 0x65, 0x7A, 0x2E, 0x69, 0x6F, 0x82, 0x17, + 0x6D, 0x6F, 0x62, 0x69, 0x6C, 0x65, 0x61, 0x70, 0x69, 0x2E, 0x69, 0x64, + 0x61, 0x74, 0x61, 0x6C, 0x69, 0x6E, 0x6B, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x0A, 0x6E, 0x65, 0x77, 0x73, 0x31, 0x32, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x0B, 0x6F, 0x6D, 0x6E, 0x69, 0x67, 0x6F, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x0E, 0x6F, 0x72, 0x65, 0x69, 0x6C, 0x6C, 0x79, 0x2E, 0x72, 0x65, + 0x76, 0x69, 0x65, 0x77, 0x82, 0x11, 0x70, 0x6F, 0x70, 0x79, 0x6F, 0x75, + 0x72, 0x62, 0x75, 0x62, 0x62, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x18, 0x70, 0x72, 0x6F, 0x64, 0x2E, 0x62, 0x65, 0x72, 0x6E, 0x61, 0x72, + 0x64, 0x63, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x73, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x18, 0x72, 0x65, 0x6C, 0x65, 0x61, 0x73, 0x65, 0x2D, 0x70, + 0x72, 0x69, 0x6D, 0x65, 0x2E, 0x73, 0x70, 0x6F, 0x6B, 0x65, 0x6F, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x19, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, + 0x6F, 0x72, 0x69, 0x65, 0x73, 0x2E, 0x73, 0x65, 0x6E, 0x73, 0x75, 0x61, + 0x70, 0x70, 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x0C, 0x72, 0x6C, 0x2E, 0x74, + 0x61, 0x6C, 0x69, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x11, 0x73, 0x68, + 0x6F, 0x70, 0x72, 0x61, 0x63, 0x68, 0x65, 0x6C, 0x7A, 0x6F, 0x65, 0x2E, + 0x63, 0x6F, 0x6D, 0x82, 0x0F, 0x73, 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, + 0x2E, 0x6D, 0x6F, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x73, 0x74, + 0x61, 0x74, 0x69, 0x63, 0x2E, 0x70, 0x6C, 0x75, 0x6D, 0x63, 0x61, 0x63, + 0x68, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x73, 0x74, 0x61, 0x79, + 0x69, 0x6E, 0x67, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x2E, 0x6D, 0x73, 0x66, + 0x2E, 0x6F, 0x72, 0x67, 0x82, 0x08, 0x74, 0x61, 0x73, 0x74, 0x79, 0x2E, + 0x63, 0x6F, 0x82, 0x0C, 0x74, 0x6F, 0x70, 0x73, 0x70, 0x65, 0x65, 0x64, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x13, 0x75, 0x70, 0x6C, 0x6F, 0x61, 0x64, + 0x73, 0x2E, 0x66, 0x6F, 0x6C, 0x69, 0x6F, 0x68, 0x64, 0x2E, 0x63, 0x6F, + 0x6D, 0x82, 0x1A, 0x75, 0x73, 0x2D, 0x65, 0x75, 0x2E, 0x66, 0x69, 0x6C, + 0x65, 0x73, 0x74, 0x61, 0x63, 0x6B, 0x63, 0x6F, 0x6E, 0x74, 0x65, 0x6E, + 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x76, 0x6F, 0x75, 0x63, 0x68, + 0x65, 0x72, 0x63, 0x6F, 0x64, 0x65, 0x73, 0x2E, 0x63, 0x6F, 0x2E, 0x75, + 0x6B, 0x82, 0x0B, 0x77, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2E, 0x63, + 0x6F, 0x6D, 0x82, 0x13, 0x77, 0x6F, 0x6D, 0x65, 0x6E, 0x73, 0x68, 0x65, + 0x61, 0x6C, 0x74, 0x68, 0x2D, 0x6A, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x82, + 0x19, 0x77, 0x6F, 0x72, 0x6B, 0x65, 0x72, 0x62, 0x65, 0x65, 0x2E, 0x73, + 0x74, 0x61, 0x67, 0x69, 0x6E, 0x67, 0x2E, 0x6D, 0x6F, 0x6F, 0x2E, 0x63, + 0x6F, 0x6D, 0x82, 0x0A, 0x77, 0x77, 0x77, 0x2E, 0x61, 0x67, 0x66, 0x2E, + 0x64, 0x6B, 0x82, 0x14, 0x77, 0x77, 0x77, 0x2E, 0x61, 0x76, 0x65, 0x6E, + 0x69, 0x72, 0x2D, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x2E, 0x63, 0x68, + 0x82, 0x11, 0x77, 0x77, 0x77, 0x2E, 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, + 0x72, 0x2E, 0x63, 0x6F, 0x2E, 0x6E, 0x7A, 0x82, 0x15, 0x77, 0x77, 0x77, + 0x2E, 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, 0x72, 0x62, 0x6C, 0x75, 0x65, + 0x2E, 0x63, 0x6F, 0x2E, 0x6E, 0x7A, 0x82, 0x16, 0x77, 0x77, 0x77, 0x2E, + 0x63, 0x61, 0x6E, 0x73, 0x74, 0x61, 0x72, 0x62, 0x6C, 0x75, 0x65, 0x2E, + 0x63, 0x6F, 0x6D, 0x2E, 0x61, 0x75, 0x82, 0x1D, 0x77, 0x77, 0x77, 0x2E, + 0x63, 0x68, 0x61, 0x6D, 0x70, 0x69, 0x6F, 0x6E, 0x73, 0x68, 0x6F, 0x63, + 0x6B, 0x65, 0x79, 0x6C, 0x65, 0x61, 0x67, 0x75, 0x65, 0x2E, 0x6E, 0x65, + 0x74, 0x82, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x65, 0x78, 0x74, 0x65, 0x72, + 0x72, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0C, 0x77, 0x77, 0x77, 0x2E, + 0x65, 0x7A, 0x75, 0x70, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0B, 0x77, 0x77, + 0x77, 0x2E, 0x65, 0x7A, 0x75, 0x70, 0x2E, 0x64, 0x65, 0x82, 0x0B, 0x77, + 0x77, 0x77, 0x2E, 0x65, 0x7A, 0x75, 0x70, 0x2E, 0x65, 0x75, 0x82, 0x0B, + 0x77, 0x77, 0x77, 0x2E, 0x65, 0x7A, 0x75, 0x70, 0x2E, 0x6E, 0x6C, 0x82, + 0x11, 0x77, 0x77, 0x77, 0x2E, 0x66, 0x72, 0x61, 0x6E, 0x6B, 0x62, 0x6F, + 0x64, 0x79, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x77, 0x77, 0x77, 0x2E, + 0x67, 0x6C, 0x6F, 0x73, 0x73, 0x79, 0x2E, 0x63, 0x6F, 0x82, 0x0F, 0x77, + 0x77, 0x77, 0x2E, 0x67, 0x6F, 0x6C, 0x64, 0x63, 0x75, 0x70, 0x2E, 0x6F, + 0x72, 0x67, 0x82, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x69, 0x63, 0x61, 0x6E, + 0x76, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0D, 0x77, 0x77, 0x77, + 0x2E, 0x6D, 0x6F, 0x6E, 0x69, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x16, + 0x77, 0x77, 0x77, 0x2E, 0x6F, 0x64, 0x65, 0x6E, 0x73, 0x65, 0x2D, 0x6D, + 0x61, 0x72, 0x63, 0x69, 0x70, 0x61, 0x6E, 0x2E, 0x64, 0x6B, 0x82, 0x15, + 0x77, 0x77, 0x77, 0x2E, 0x6F, 0x6E, 0x65, 0x63, 0x6C, 0x69, 0x63, 0x6B, + 0x64, 0x72, 0x69, 0x76, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x12, 0x77, + 0x77, 0x77, 0x2E, 0x6F, 0x72, 0x65, 0x69, 0x6C, 0x6C, 0x79, 0x2E, 0x72, + 0x65, 0x76, 0x69, 0x65, 0x77, 0x82, 0x15, 0x77, 0x77, 0x77, 0x2E, 0x70, + 0x6F, 0x70, 0x79, 0x6F, 0x75, 0x72, 0x62, 0x75, 0x62, 0x62, 0x6C, 0x65, + 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x77, 0x77, 0x77, 0x2E, 0x72, 0x61, + 0x77, 0x6E, 0x65, 0x74, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x0E, 0x77, 0x77, + 0x77, 0x2E, 0x73, 0x70, 0x6F, 0x6B, 0x65, 0x6F, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x10, 0x77, 0x77, 0x77, 0x2E, 0x74, 0x65, 0x61, 0x72, 0x73, 0x68, + 0x65, 0x65, 0x74, 0x2E, 0x63, 0x6F, 0x82, 0x10, 0x77, 0x77, 0x77, 0x2E, + 0x74, 0x6F, 0x70, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2E, 0x63, 0x6F, 0x6D, + 0x82, 0x16, 0x77, 0x77, 0x77, 0x2E, 0x77, 0x68, 0x69, 0x74, 0x65, 0x6B, + 0x65, 0x79, 0x76, 0x69, 0x6C, 0x6C, 0x61, 0x73, 0x2E, 0x63, 0x6F, 0x6D, + 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, + 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2B, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x1D, 0x06, 0x03, 0x55, + 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0xA8, 0x29, 0xFD, 0xA9, 0xA5, 0x1A, + 0x1C, 0x37, 0x0B, 0x20, 0x3B, 0x98, 0xB7, 0x25, 0x39, 0xCC, 0xE5, 0x2F, + 0xF4, 0x94, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30, + 0x16, 0x80, 0x14, 0xA9, 0x2B, 0x87, 0xE1, 0xCE, 0x24, 0x47, 0x3B, 0x1B, + 0xBF, 0xCF, 0x85, 0x37, 0x02, 0x55, 0x9D, 0x0D, 0x94, 0x58, 0xE6, 0x30, + 0x82, 0x01, 0x04, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0xD6, 0x79, + 0x02, 0x04, 0x02, 0x04, 0x81, 0xF5, 0x04, 0x81, 0xF2, 0x00, 0xF0, 0x00, + 0x77, 0x00, 0xA4, 0xB9, 0x09, 0x90, 0xB4, 0x18, 0x58, 0x14, 0x87, 0xBB, + 0x13, 0xA2, 0xCC, 0x67, 0x70, 0x0A, 0x3C, 0x35, 0x98, 0x04, 0xF9, 0x1B, + 0xDF, 0xB8, 0xE3, 0x77, 0xCD, 0x0E, 0xC8, 0x0D, 0xDC, 0x10, 0x00, 0x00, + 0x01, 0x66, 0x9C, 0xC8, 0xE7, 0x38, 0x00, 0x00, 0x04, 0x03, 0x00, 0x48, + 0x30, 0x46, 0x02, 0x21, 0x00, 0xD9, 0x58, 0x6E, 0xFC, 0x4C, 0x3C, 0xAF, + 0xF9, 0x5B, 0x7F, 0xDA, 0x54, 0x95, 0xAF, 0xCF, 0xB3, 0x57, 0xB9, 0x56, + 0x2C, 0xE8, 0xE0, 0xB1, 0x20, 0x9B, 0xCB, 0x75, 0xAC, 0x4E, 0x54, 0xE9, + 0x9D, 0x02, 0x21, 0x00, 0xE8, 0xF0, 0xC0, 0x49, 0x23, 0x8E, 0x3D, 0x9B, + 0xA5, 0x87, 0xA3, 0xBE, 0x6C, 0x21, 0x62, 0xBB, 0xD2, 0x44, 0x5C, 0xE4, + 0x7A, 0xCC, 0x46, 0x26, 0x04, 0x19, 0xA4, 0x2D, 0x9B, 0x1C, 0x5D, 0x3A, + 0x00, 0x75, 0x00, 0x6F, 0x53, 0x76, 0xAC, 0x31, 0xF0, 0x31, 0x19, 0xD8, + 0x99, 0x00, 0xA4, 0x51, 0x15, 0xFF, 0x77, 0x15, 0x1C, 0x11, 0xD9, 0x02, + 0xC1, 0x00, 0x29, 0x06, 0x8D, 0xB2, 0x08, 0x9A, 0x37, 0xD9, 0x13, 0x00, + 0x00, 0x01, 0x66, 0x9C, 0xC8, 0xE6, 0x20, 0x00, 0x00, 0x04, 0x03, 0x00, + 0x46, 0x30, 0x44, 0x02, 0x20, 0x14, 0xC8, 0x9F, 0xAC, 0x27, 0x48, 0xBE, + 0x4D, 0x0E, 0xC3, 0x26, 0x2E, 0x34, 0xCA, 0x38, 0xBA, 0x11, 0x3A, 0x68, + 0x71, 0x88, 0xEB, 0x24, 0x26, 0x59, 0x3E, 0xAC, 0xA8, 0x63, 0xCC, 0x8A, + 0x0A, 0x02, 0x20, 0x0F, 0x22, 0xBF, 0x0D, 0x1F, 0x8A, 0x8D, 0x1D, 0x91, + 0x33, 0x3A, 0x40, 0xE4, 0x23, 0x78, 0xFA, 0x22, 0xF5, 0x9B, 0xCB, 0x04, + 0x4F, 0x53, 0x2D, 0x20, 0x75, 0x2F, 0x76, 0x8A, 0xB1, 0xCD, 0x9D, 0x30, + 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B, + 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x03, 0x41, 0x0F, 0xF3, 0xA6, + 0x62, 0xA2, 0xE5, 0xB4, 0x8D, 0xA8, 0x08, 0x71, 0x7B, 0xB3, 0xE3, 0x51, + 0x61, 0x0D, 0xC0, 0x67, 0x6C, 0x3C, 0x9C, 0x00, 0x0B, 0x63, 0x77, 0xB6, + 0xB6, 0x11, 0x67, 0x77, 0xA5, 0xE1, 0x49, 0xE0, 0x7F, 0xB7, 0x1D, 0x61, + 0xFB, 0x83, 0x9C, 0x83, 0x42, 0xE9, 0x31, 0xCA, 0x51, 0xE3, 0xC1, 0xBD, + 0x9B, 0x2F, 0xB5, 0x35, 0x05, 0x72, 0x7F, 0x40, 0xA6, 0x7C, 0xC9, 0xF1, + 0x59, 0xA7, 0x15, 0xB8, 0x12, 0xDA, 0xF8, 0xCE, 0x83, 0x61, 0xFC, 0x47, + 0x96, 0x9E, 0x74, 0xFE, 0xCD, 0xE4, 0x61, 0x92, 0xF2, 0x2E, 0x0C, 0x08, + 0x4B, 0x60, 0x2D, 0xF6, 0x50, 0x07, 0x83, 0xCA, 0xAF, 0xB9, 0x41, 0x33, + 0x4A, 0x3E, 0x84, 0xC7, 0x73, 0xC6, 0x1F, 0xFF, 0x7A, 0xDF, 0xAE, 0x47, + 0x25, 0x32, 0xEB, 0xC0, 0x43, 0x0C, 0xA6, 0x23, 0x13, 0x46, 0xC3, 0xFA, + 0x44, 0xEA, 0x20, 0xEA, 0xCB, 0x18, 0x17, 0x00, 0xB6, 0xE7, 0x6D, 0x8A, + 0x14, 0x8C, 0x6A, 0xCA, 0x88, 0x4C, 0xDA, 0xA8, 0xB9, 0x08, 0xAF, 0x39, + 0xEE, 0xCF, 0xD7, 0xF7, 0x32, 0xC0, 0xF4, 0xCF, 0x4E, 0x22, 0x38, 0xF7, + 0xAF, 0xAE, 0x7D, 0x58, 0x5F, 0xA5, 0x2D, 0x4D, 0xBB, 0x86, 0x10, 0xB3, + 0x93, 0x62, 0x64, 0x27, 0xBF, 0xB1, 0xBB, 0x8F, 0x9F, 0xFC, 0x07, 0x3C, + 0x4B, 0x16, 0x7A, 0x84, 0x5E, 0xAF, 0xAD, 0x57, 0x9C, 0xFF, 0x7A, 0xA7, + 0xE0, 0x90, 0x89, 0x1C, 0xE8, 0xE5, 0x11, 0xF7, 0xB6, 0xDC, 0xCD, 0x5E, + 0xF7, 0x30, 0xA2, 0x2E, 0x67, 0x6D, 0x4A, 0x70, 0x26, 0xEA, 0xCD, 0x27, + 0x70, 0x77, 0x54, 0x57, 0x09, 0x03, 0x56, 0x4A, 0x33, 0x60, 0x00, 0x27, + 0xFE, 0xA7, 0xD7, 0xA9, 0xC4, 0xEC, 0x17, 0x17, 0x8D, 0x87, 0x70, 0x6B, + 0x48, 0x88, 0x61, 0x54, 0x4A, 0x2B, 0xB7, 0x6A, 0x12, 0x08, 0xFB, }; CURLcode res; diff --git a/tests/unit/unit1660.c b/tests/unit/unit1660.c index 6b1dcce9fc..77d72a0631 100644 --- a/tests/unit/unit1660.c +++ b/tests/unit/unit1660.c @@ -52,17 +52,17 @@ static CURLcode test_unit1660(const char *arg) struct testit { const char *host; - const char *chost; /* if non-NULL, use to lookup with */ - const char *hdr; /* if NULL, just do the lookup */ + const char *chost; /* if non-NULL, use to lookup with */ + const char *hdr; /* if NULL, just do the lookup */ const CURLcode res; /* parse result */ }; static const struct testit headers[] = { /* two entries read from disk cache, verify first */ - { "-", "readfrom.example", NULL, CURLE_OK}, - { "-", "old.example", NULL, CURLE_OK}, + { "-", "readfrom.example", NULL, CURLE_OK }, + { "-", "old.example", NULL, CURLE_OK }, /* delete the remaining one read from disk */ - { "readfrom.example", NULL, "max-age=\"0\"", CURLE_OK}, + { "readfrom.example", NULL, "max-age=\"0\"", CURLE_OK }, { "example.com", NULL, "max-age=\"31536000\"\r\n", CURLE_OK }, { "example.com", NULL, "max-age=\"21536000\"\r\n", CURLE_OK }, @@ -90,10 +90,9 @@ static CURLcode test_unit1660(const char *arg) { "3.example.com", NULL, "max-age=\"21536000\"; include; includeSubDomains;", CURLE_OK }, /* remove the "3.example.com" one, should still match the example.com */ - { "3.example.com", NULL, "max-age=\"0\"; includeSubDomains;", - CURLE_OK }, - { "-", "foo.example.com", NULL, CURLE_OK}, - { "-", "foo.xample.com", NULL, CURLE_OK}, + { "3.example.com", NULL, "max-age=\"0\"; includeSubDomains;", CURLE_OK }, + { "-", "foo.example.com", NULL, CURLE_OK }, + { "-", "foo.xample.com", NULL, CURLE_OK }, /* should not match */ { "example.net", "forexample.net", "max-age=\"31536000\"\r\n", CURLE_OK }, diff --git a/tests/unit/unit1979.c b/tests/unit/unit1979.c index c3925d1bc0..796099d592 100644 --- a/tests/unit/unit1979.c +++ b/tests/unit/unit1979.c @@ -127,7 +127,7 @@ static CURLcode test_unit1979(const char *arg) testcases[i].normalize); fail_unless(msnprintf_result >= 0, "curl_msnprintf fails"); fail_unless(!result && canonical_path_string && - !strcmp(canonical_path_string, testcases[i].canonical_url), + !strcmp(canonical_path_string, testcases[i].canonical_url), buffer); curlx_dyn_free(&canonical_path); } diff --git a/tests/unit/unit1980.c b/tests/unit/unit1980.c index 9e38d8a678..82bea8415a 100644 --- a/tests/unit/unit1980.c +++ b/tests/unit/unit1980.c @@ -98,7 +98,7 @@ static CURLcode test_unit1980(const char *arg) testcases[i].canonical_query); fail_unless(msnprintf_result >= 0, "curl_msnprintf fails"); fail_unless(!result && canonical_query_ptr && - !strcmp(canonical_query_ptr, testcases[i].canonical_query), + !strcmp(canonical_query_ptr, testcases[i].canonical_query), buffer); curlx_dyn_free(&canonical_query); } diff --git a/tests/unit/unit2604.c b/tests/unit/unit2604.c index fb05189714..2e61efc0a5 100644 --- a/tests/unit/unit2604.c +++ b/tests/unit/unit2604.c @@ -50,27 +50,27 @@ static CURLcode test_unit2604(const char *arg) int i; const size_t too_long = 90720; struct set list[] = { - { "-too-long-", "", "", "", CURLE_TOO_LARGE}, - { SA540 " c", SA540, "c", "/", CURLE_OK}, - { "\" " SA540 "\" c", " " SA540, "c", "/", CURLE_OK}, - { "a a", "a", "a", "/home/", CURLE_OK}, - { "b a", "b", "a", "/", CURLE_OK}, - { "a", "a", "", "/home/", CURLE_OK}, - { "b", "b", "", "/", CURLE_OK}, - { "\"foo bar\"\tb", "foo bar", "b", "/", CURLE_OK}, - { "/~/hej", "/home/user/hej", "", "/home/user", CURLE_OK}, - { "\"foo bar", "", "", "/", CURLE_QUOTE_ERROR}, - { "\"foo\\\"bar\" a", "foo\"bar", "a", "/", CURLE_OK}, - { "\"foo\\\'bar\" b", "foo\'bar", "b", "/", CURLE_OK}, - { "\"foo\\\\bar\" c", "foo\\bar", "c", "/", CURLE_OK}, - { "\"foo\\pbar\" c", "foo\\bar", "", "/", CURLE_QUOTE_ERROR}, - { "\"\" c", "", "", "", CURLE_QUOTE_ERROR}, - { "foo\"", "foo\"", "", "/", CURLE_OK}, - { "foo \"", "foo", "\"", "/", CURLE_OK}, - { " \t\t \t ", "", "", "/", CURLE_QUOTE_ERROR}, - { " ", "", "", "/", CURLE_QUOTE_ERROR}, - { "", "", "", "/", CURLE_QUOTE_ERROR}, - { " \r \n ", "\r", "\n ", "/", CURLE_OK}, + { "-too-long-", "", "", "", CURLE_TOO_LARGE }, + { SA540 " c", SA540, "c", "/", CURLE_OK }, + { "\" " SA540 "\" c", " " SA540, "c", "/", CURLE_OK }, + { "a a", "a", "a", "/home/", CURLE_OK }, + { "b a", "b", "a", "/", CURLE_OK }, + { "a", "a", "", "/home/", CURLE_OK }, + { "b", "b", "", "/", CURLE_OK }, + { "\"foo bar\"\tb", "foo bar", "b", "/", CURLE_OK }, + { "/~/hej", "/home/user/hej", "", "/home/user", CURLE_OK }, + { "\"foo bar", "", "", "/", CURLE_QUOTE_ERROR }, + { "\"foo\\\"bar\" a", "foo\"bar", "a", "/", CURLE_OK }, + { "\"foo\\\'bar\" b", "foo\'bar", "b", "/", CURLE_OK }, + { "\"foo\\\\bar\" c", "foo\\bar", "c", "/", CURLE_OK }, + { "\"foo\\pbar\" c", "foo\\bar", "", "/", CURLE_QUOTE_ERROR }, + { "\"\" c", "", "", "", CURLE_QUOTE_ERROR }, + { "foo\"", "foo\"", "", "/", CURLE_OK }, + { "foo \"", "foo", "\"", "/", CURLE_OK }, + { " \t\t \t ", "", "", "/", CURLE_QUOTE_ERROR }, + { " ", "", "", "/", CURLE_QUOTE_ERROR }, + { "", "", "", "/", CURLE_QUOTE_ERROR }, + { " \r \n ", "\r", "\n ", "/", CURLE_OK }, { NULL, NULL, NULL, NULL, CURLE_OK } }; diff --git a/tests/unit/unit2605.c b/tests/unit/unit2605.c index 49d0b0b000..e8fce40334 100644 --- a/tests/unit/unit2605.c +++ b/tests/unit/unit2605.c @@ -40,32 +40,32 @@ static CURLcode test_unit2605(const char *arg) int i; struct range list[] = { - { "0-9", 100, 0, 10, CURLE_OK}, - { "1-10", 100, 1, 10, CURLE_OK}, - { "222222-222222", 300000, 222222, 1, CURLE_OK}, - { "4294967296 - 4294967297", 4294967298, 4294967296, 2, CURLE_OK}, - { "-10", 100, 90, 10, CURLE_OK}, - { "-20", 100, 80, 20, CURLE_OK}, - { "-1", 100, 99, 1, CURLE_OK}, - { "-0", 100, 0, 0, CURLE_RANGE_ERROR}, - { "--2", 100, 0, 0, CURLE_RANGE_ERROR}, - { "-100", 100, 0, 100, CURLE_OK}, - { "-101", 100, 0, 100, CURLE_OK}, - { "-1000", 100, 0, 100, CURLE_OK}, - { "2-1000", 100, 2, 98, CURLE_OK}, - { ".2-3", 100, 0, 0, CURLE_RANGE_ERROR}, - { "+2-3", 100, 0, 0, CURLE_RANGE_ERROR}, - { "2 - 3", 100, 2, 2, CURLE_OK}, - { " 2 - 3", 100, 2, 2, CURLE_RANGE_ERROR}, /* no leading space */ - { "2 - 3 ", 100, 2, 2, CURLE_RANGE_ERROR}, /* no trailing space */ - { "3-2", 100, 0, 0, CURLE_RANGE_ERROR}, - { "2.-3", 100, 0, 0, CURLE_RANGE_ERROR}, - { "-3-2", 100, 0, 0, CURLE_RANGE_ERROR}, - { "101-102", 100, 0, 0, CURLE_RANGE_ERROR}, - { "0-", 100, 0, 100, CURLE_OK}, - { "1-", 100, 1, 99, CURLE_OK}, - { "99-", 100, 99, 1, CURLE_OK}, - { "100-", 100, 0, 0, CURLE_RANGE_ERROR}, + { "0-9", 100, 0, 10, CURLE_OK }, + { "1-10", 100, 1, 10, CURLE_OK }, + { "222222-222222", 300000, 222222, 1, CURLE_OK }, + { "4294967296 - 4294967297", 4294967298, 4294967296, 2, CURLE_OK }, + { "-10", 100, 90, 10, CURLE_OK }, + { "-20", 100, 80, 20, CURLE_OK }, + { "-1", 100, 99, 1, CURLE_OK }, + { "-0", 100, 0, 0, CURLE_RANGE_ERROR }, + { "--2", 100, 0, 0, CURLE_RANGE_ERROR }, + { "-100", 100, 0, 100, CURLE_OK }, + { "-101", 100, 0, 100, CURLE_OK }, + { "-1000", 100, 0, 100, CURLE_OK }, + { "2-1000", 100, 2, 98, CURLE_OK }, + { ".2-3", 100, 0, 0, CURLE_RANGE_ERROR }, + { "+2-3", 100, 0, 0, CURLE_RANGE_ERROR }, + { "2 - 3", 100, 2, 2, CURLE_OK }, + { " 2 - 3", 100, 2, 2, CURLE_RANGE_ERROR }, /* no leading space */ + { "2 - 3 ", 100, 2, 2, CURLE_RANGE_ERROR }, /* no trailing space */ + { "3-2", 100, 0, 0, CURLE_RANGE_ERROR }, + { "2.-3", 100, 0, 0, CURLE_RANGE_ERROR }, + { "-3-2", 100, 0, 0, CURLE_RANGE_ERROR }, + { "101-102", 100, 0, 0, CURLE_RANGE_ERROR }, + { "0-", 100, 0, 100, CURLE_OK }, + { "1-", 100, 1, 99, CURLE_OK }, + { "99-", 100, 99, 1, CURLE_OK }, + { "100-", 100, 0, 0, CURLE_RANGE_ERROR }, { NULL, 0, 0, 0, CURLE_OK } }; @@ -78,10 +78,9 @@ static CURLcode test_unit2605(const char *arg) curl_off_t start; curl_off_t size; CURLcode res; - curl_mprintf("%u: '%s' (file size: %" FMT_OFF_T ")\n", - i, list[i].r, list[i].filesize); - res = Curl_ssh_range(curl, list[i].r, list[i].filesize, - &start, &size); + curl_mprintf("%u: '%s' (file size: %" FMT_OFF_T ")\n", i, list[i].r, + list[i].filesize); + res = Curl_ssh_range(curl, list[i].r, list[i].filesize, &start, &size); if(res != list[i].res) { curl_mprintf("... returned %d\n", res); unitfail++; diff --git a/tests/unit/unit3200.c b/tests/unit/unit3200.c index bfd4d1181b..f7c82cee37 100644 --- a/tests/unit/unit3200.c +++ b/tests/unit/unit3200.c @@ -28,7 +28,7 @@ static CURLcode test_unit3200(const char *arg) { UNITTEST_BEGIN_SIMPLE -#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \ +#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \ !defined(CURL_DISABLE_HSTS) || !defined(CURL_DISABLE_NETRC) #if defined(CURL_GNUC_DIAG) || defined(__clang__) diff --git a/tests/unit/unit3205.c b/tests/unit/unit3205.c index bb35fb2f8e..df0ea7f8dd 100644 --- a/tests/unit/unit3205.c +++ b/tests/unit/unit3205.c @@ -442,26 +442,26 @@ static CURLcode test_unit3205(const char *arg) const char *str; }; static const struct test_str_entry test_str_list[] = { - { 0x1301, "TLS_AES_128_GCM_SHA256"}, - { 0x1302, "TLS_AES_256_GCM_SHA384"}, - { 0x1303, "TLS_CHACHA20_POLY1305_SHA256"}, - { 0xC02B, "ECDHE-ECDSA-AES128-GCM-SHA256"}, - { 0xC02F, "ECDHE-RSA-AES128-GCM-SHA256"}, - { 0xC02C, "ECDHE-ECDSA-AES256-GCM-SHA384"}, - { 0xC030, "ECDHE-RSA-AES256-GCM-SHA384"}, - { 0xCCA9, "ECDHE-ECDSA-CHACHA20-POLY1305"}, - { 0xCCA8, "ECDHE-RSA-CHACHA20-POLY1305"}, + { 0x1301, "TLS_AES_128_GCM_SHA256" }, + { 0x1302, "TLS_AES_256_GCM_SHA384" }, + { 0x1303, "TLS_CHACHA20_POLY1305_SHA256" }, + { 0xC02B, "ECDHE-ECDSA-AES128-GCM-SHA256" }, + { 0xC02F, "ECDHE-RSA-AES128-GCM-SHA256" }, + { 0xC02C, "ECDHE-ECDSA-AES256-GCM-SHA384" }, + { 0xC030, "ECDHE-RSA-AES256-GCM-SHA384" }, + { 0xCCA9, "ECDHE-ECDSA-CHACHA20-POLY1305" }, + { 0xCCA8, "ECDHE-RSA-CHACHA20-POLY1305" }, #ifdef USE_MBEDTLS - { 0x009E, "DHE-RSA-AES128-GCM-SHA256"}, - { 0x009F, "DHE-RSA-AES256-GCM-SHA384"}, + { 0x009E, "DHE-RSA-AES128-GCM-SHA256" }, + { 0x009F, "DHE-RSA-AES256-GCM-SHA384" }, #else - { 0x0000, "DHE-RSA-AES128-GCM-SHA256"}, - { 0x0000, "DHE-RSA-AES256-GCM-SHA384"}, + { 0x0000, "DHE-RSA-AES128-GCM-SHA256" }, + { 0x0000, "DHE-RSA-AES256-GCM-SHA384" }, #endif #ifdef USE_MBEDTLS - { 0xCCAA, "DHE-RSA-CHACHA20-POLY1305"}, + { 0xCCAA, "DHE-RSA-CHACHA20-POLY1305" }, #else - { 0x0000, "DHE-RSA-CHACHA20-POLY1305"}, + { 0x0000, "DHE-RSA-CHACHA20-POLY1305" }, #endif #ifdef USE_MBEDTLS { 0xC023, "ECDHE-ECDSA-AES128-SHA256" }, diff --git a/tests/unit/unit3211.c b/tests/unit/unit3211.c index 7f6c616909..689edb7b2b 100644 --- a/tests/unit/unit3211.c +++ b/tests/unit/unit3211.c @@ -127,11 +127,12 @@ static CURLcode test_unit3211(const char *arg) { UNITTEST_BEGIN_SIMPLE - static const unsigned int s1[] = { /* spread numbers, some at slot edges */ - 0, 1, 4, 17, 63, 64, 65, 66, - 90, 99, + static const unsigned int s1[] = { + /* spread numbers, some at slot edges */ + 0, 1, 4, 17, 63, 64, 65, 66, 90, 99, }; - static const unsigned int s2[] = { /* set with all bits in slot1 set */ + static const unsigned int s2[] = { + /* set with all bits in slot1 set */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, diff --git a/tests/unit/unit3212.c b/tests/unit/unit3212.c index 0bffd1f79c..3af35f0c57 100644 --- a/tests/unit/unit3212.c +++ b/tests/unit/unit3212.c @@ -28,7 +28,7 @@ #include "curl_trc.h" #include "unitprotos.h" -#define TBL_SIZE 100 +#define TBL_SIZE 100 static CURLcode t3212_setup(struct uint32_tbl *tbl) { diff --git a/tests/unit/unit3213.c b/tests/unit/unit3213.c index dbd26f4aa4..c3ec3958e8 100644 --- a/tests/unit/unit3213.c +++ b/tests/unit/unit3213.c @@ -96,11 +96,12 @@ static CURLcode test_unit3213(const char *arg) { UNITTEST_BEGIN_SIMPLE - static const unsigned int s1[] = { /* spread numbers, some at slot edges */ - 0, 1, 4, 17, 63, 64, 65, 66, - 90, 99, + static const unsigned int s1[] = { + /* spread numbers, some at slot edges */ + 0, 1, 4, 17, 63, 64, 65, 66, 90, 99, }; - static const unsigned int s2[] = { /* set with all bits in slot1 set */ + static const unsigned int s2[] = { + /* set with all bits in slot1 set */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, @@ -110,7 +111,8 @@ static CURLcode test_unit3213(const char *arg) 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, }; - static const unsigned int s3[] = { /* very spread numbers */ + static const unsigned int s3[] = { + /* very spread numbers */ 2232, 5167, 8204, 8526, 8641, 10056, 10140, 10611, 10998, 11626, 13735, 15539, 17947, 24295, 27833, 30318, };