diff options
42 files changed, 163 insertions, 158 deletions
diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index 7079846fd..268f9a928 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -166,7 +166,7 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, GlobalInfo *g) memset(&its, 0, sizeof(struct itimerspec)); } - timerfd_settime(g->tfd, /*flags=*/0, &its, NULL); + timerfd_settime(g->tfd, /* flags= */0, &its, NULL); return 0; } @@ -197,7 +197,7 @@ static void check_multi_info(GlobalInfo *g) } } -/* Called by libevent when we get action on a multi socket filedescriptor*/ +/* Called by libevent when we get action on a multi socket filedescriptor */ static void event_cb(GlobalInfo *g, int fd, int revents) { CURLMcode rc; diff --git a/docs/examples/usercertinmem.c b/docs/examples/usercertinmem.c index 89a0c3c40..f8fada460 100644 --- a/docs/examples/usercertinmem.c +++ b/docs/examples/usercertinmem.c @@ -94,7 +94,7 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm) "omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD\n"\ "-----END CERTIFICATE-----\n"; -/*replace the XXX with the actual RSA key*/ +/* replace the XXX with the actual RSA key */ const char *mykey = "-----BEGIN RSA PRIVATE KEY-----\n"\ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\ @@ -133,25 +133,25 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm) printf("PEM_read_bio_X509 failed...\n"); } - /*tell SSL to use the X509 certificate*/ + /* tell SSL to use the X509 certificate */ ret = SSL_CTX_use_certificate((SSL_CTX*)sslctx, cert); if(ret != 1) { printf("Use certificate failed\n"); } - /*create a bio for the RSA key*/ + /* create a bio for the RSA key */ kbio = BIO_new_mem_buf((char *)mykey, -1); if(!kbio) { printf("BIO_new_mem_buf failed\n"); } - /*read the key bio into an RSA object*/ + /* read the key bio into an RSA object */ rsa = PEM_read_bio_RSAPrivateKey(kbio, NULL, 0, NULL); if(!rsa) { printf("Failed to create key bio\n"); } - /*tell SSL to use the RSA key from memory*/ + /* tell SSL to use the RSA key from memory */ ret = SSL_CTX_use_RSAPrivateKey((SSL_CTX*)sslctx, rsa); if(ret != 1) { printf("Use Key failed\n"); @@ -192,7 +192,7 @@ int main(void) curl_easy_setopt(ch, CURLOPT_SSLCERTTYPE, "PEM"); /* both VERIFYPEER and VERIFYHOST are set to 0 in this case because there is - no CA certificate*/ + no CA certificate */ curl_easy_setopt(ch, CURLOPT_SSL_VERIFYPEER, 0L); curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, 0L); diff --git a/include/curl/curl.h b/include/curl/curl.h index ab5d476fb..d25e19cc6 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -368,7 +368,7 @@ typedef int (*curl_seek_callback)(void *instream, #define CURL_READFUNC_PAUSE 0x10000001 /* Return code for when the trailing headers' callback has terminated - without any errors*/ + without any errors */ #define CURL_TRAILERFUNC_OK 0 /* Return code for when was an error in the trailing header's list and we want to abort the request */ @@ -450,7 +450,7 @@ typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size); #define CURL_DID_MEMORY_FUNC_TYPEDEFS #endif -/* the kind of data that is passed to information_callback*/ +/* the kind of data that is passed to information_callback */ typedef enum { CURLINFO_TEXT = 0, CURLINFO_HEADER_IN, /* 1 */ @@ -698,7 +698,7 @@ typedef enum { #define CURLOPT_WRITEINFO CURLOPT_OBSOLETE40 #define CURLOPT_CLOSEPOLICY CURLOPT_OBSOLETE72 -#endif /*!CURL_NO_OLDIES*/ +#endif /* !CURL_NO_OLDIES */ /* * Proxy error codes. Returned in CURLINFO_PROXY_ERROR if CURLE_PROXY was @@ -843,7 +843,7 @@ enum curl_khstat { CURLKHSTAT_DEFER, /* do not accept it, but we can't answer right now. Causes a CURLE_PEER_FAILED_VERIFICATION error but the connection will be left intact etc */ - CURLKHSTAT_FINE_REPLACE, /* accept and replace the wrong key*/ + CURLKHSTAT_FINE_REPLACE, /* accept and replace the wrong key */ CURLKHSTAT_LAST /* not for use, only a marker for last-in-list */ }; @@ -864,13 +864,13 @@ typedef int /* CURLOPT_SSH_KEYDATA */ typedef int - (*curl_sshhostkeycallback) (void *clientp,/* custom pointer passed*/ + (*curl_sshhostkeycallback) (void *clientp,/* custom pointer passed */ /* with CURLOPT_SSH_HOSTKEYDATA */ int keytype, /* CURLKHTYPE */ - const char *key, /*hostkey to check*/ - size_t keylen); /*length of the key*/ - /*return CURLE_OK to accept*/ - /*or something else to refuse*/ + const char *key, /* hostkey to check */ + size_t keylen); /* length of the key */ + /* return CURLE_OK to accept */ + /* or something else to refuse */ /* parameter for the CURLOPT_USE_SSL option */ @@ -932,7 +932,7 @@ typedef enum { #define CURLFTPSSL_ALL CURLUSESSL_ALL #define CURLFTPSSL_LAST CURLUSESSL_LAST #define curl_ftpssl curl_usessl -#endif /*!CURL_NO_OLDIES*/ +#endif /* !CURL_NO_OLDIES */ /* parameter for the CURLOPT_FTP_SSL_CCC option */ typedef enum { diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h index 2dabcb416..00961dbc3 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/curl/typecheck-gcc.h @@ -436,7 +436,7 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t, (CURLINFO_OFF_T < (info)) -/* typecheck helpers -- check whether given expression has requested type*/ +/* typecheck helpers -- check whether given expression has requested type */ /* For pointers, you can use the curlcheck_ptr/curlcheck_arr macros, * otherwise define a new macro. Search for __builtin_types_compatible_p diff --git a/lib/c-hyper.c b/lib/c-hyper.c index 4006f0c0b..7ae2a990c 100644 --- a/lib/c-hyper.c +++ b/lib/c-hyper.c @@ -679,7 +679,7 @@ static int uploadpostfields(void *userdata, hyper_context *ctx, return HYPER_POLL_ERROR; } /* increasing the writebytecount here is a little premature but we - don't know exactly when the body is sent*/ + don't know exactly when the body is sent */ data->req.writebytecount += (size_t)data->req.p.http->postsize; Curl_pgrsSetUploadCounter(data, data->req.writebytecount); data->req.upload_done = TRUE; @@ -732,7 +732,7 @@ static int uploadstreamed(void *userdata, hyper_context *ctx, return HYPER_POLL_ERROR; } /* increasing the writebytecount here is a little premature but we - don't know exactly when the body is sent*/ + don't know exactly when the body is sent */ data->req.writebytecount += fillcount; Curl_pgrsSetUploadCounter(data, fillcount); } diff --git a/lib/curl_path.c b/lib/curl_path.c index b55e83047..27ff96d1f 100644 --- a/lib/curl_path.c +++ b/lib/curl_path.c @@ -148,15 +148,12 @@ CURLcode Curl_get_pathname(const char **cpp, char **path, char *homedir) break; } if(cp[i] == '\0') { /* End of string */ - /*error("Unterminated quote");*/ goto fail; } if(cp[i] == '\\') { /* Escaped characters */ i++; if(cp[i] != '\'' && cp[i] != '\"' && cp[i] != '\\') { - /*error("Bad escaped character '\\%c'", - cp[i]);*/ goto fail; } } @@ -164,7 +161,6 @@ CURLcode Curl_get_pathname(const char **cpp, char **path, char *homedir) } if(j == 0) { - /*error("Empty quotes");*/ goto fail; } *cpp = cp + i + strspn(cp + i, WHITESPACE); diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index b0c371041..1932cb4ec 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -85,7 +85,7 @@ const struct Curl_handler Curl_handler_rtmp = { PORT_RTMP, /* defport */ CURLPROTO_RTMP, /* protocol */ CURLPROTO_RTMP, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; const struct Curl_handler Curl_handler_rtmpt = { @@ -108,7 +108,7 @@ const struct Curl_handler Curl_handler_rtmpt = { PORT_RTMPT, /* defport */ CURLPROTO_RTMPT, /* protocol */ CURLPROTO_RTMPT, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; const struct Curl_handler Curl_handler_rtmpe = { @@ -131,7 +131,7 @@ const struct Curl_handler Curl_handler_rtmpe = { PORT_RTMP, /* defport */ CURLPROTO_RTMPE, /* protocol */ CURLPROTO_RTMPE, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; const struct Curl_handler Curl_handler_rtmpte = { @@ -154,7 +154,7 @@ const struct Curl_handler Curl_handler_rtmpte = { PORT_RTMPT, /* defport */ CURLPROTO_RTMPTE, /* protocol */ CURLPROTO_RTMPTE, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; const struct Curl_handler Curl_handler_rtmps = { @@ -177,7 +177,7 @@ const struct Curl_handler Curl_handler_rtmps = { PORT_RTMPS, /* defport */ CURLPROTO_RTMPS, /* protocol */ CURLPROTO_RTMP, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; const struct Curl_handler Curl_handler_rtmpts = { @@ -200,7 +200,7 @@ const struct Curl_handler Curl_handler_rtmpts = { PORT_RTMPS, /* defport */ CURLPROTO_RTMPTS, /* protocol */ CURLPROTO_RTMPT, /* family */ - PROTOPT_NONE /* flags*/ + PROTOPT_NONE /* flags */ }; static CURLcode rtmp_setup_connection(struct Curl_easy *data, diff --git a/lib/curl_setup.h b/lib/curl_setup.h index ac27b130c..59efe4d4f 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -693,7 +693,7 @@ # define UNUSED_PARAM __attribute__((__unused__)) # define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #else -# define UNUSED_PARAM /*NOTHING*/ +# define UNUSED_PARAM /* NOTHING */ # define WARN_UNUSED_RESULT #endif diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h index 754c761fb..39523af0c 100644 --- a/lib/curl_sha256.h +++ b/lib/curl_sha256.h @@ -33,7 +33,7 @@ extern const struct HMAC_params Curl_HMAC_SHA256[1]; #ifdef USE_WOLFSSL /* SHA256_DIGEST_LENGTH is an enum value in wolfSSL. Need to import it from - * sha.h*/ + * sha.h */ #include <wolfssl/options.h> #include <wolfssl/openssl/sha.h> #else diff --git a/lib/dict.c b/lib/dict.c index 6f7678f5c..993373eca 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -319,4 +319,4 @@ static CURLcode dict_do(struct Curl_easy *data, bool *done) return CURLE_OK; } -#endif /*CURL_DISABLE_DICT*/ +#endif /* CURL_DISABLE_DICT */ diff --git a/lib/file.c b/lib/file.c index d82d57b46..4ed707883 100644 --- a/lib/file.c +++ b/lib/file.c @@ -340,7 +340,7 @@ static CURLcode file_upload(struct Curl_easy *data) nread = readcount; - /*skip bytes before resume point*/ + /* skip bytes before resume point */ if(data->state.resume_from) { if((curl_off_t)nread <= data->state.resume_from) { data->state.resume_from -= nread; @@ -1164,7 +1164,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data, port++; } - /* maybe all ports were in use already*/ + /* maybe all ports were in use already */ if(port > port_max) { failf(data, "bind() failed, we ran out of ports"); Curl_closesocket(data, conn, portsock); diff --git a/lib/gopher.c b/lib/gopher.c index 01f4bdef0..ac2018ef1 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -236,4 +236,4 @@ static CURLcode gopher_do(struct Curl_easy *data, bool *done) Curl_setup_transfer(data, FIRSTSOCKET, -1, FALSE, -1); return CURLE_OK; } -#endif /*CURL_DISABLE_GOPHER*/ +#endif /* CURL_DISABLE_GOPHER */ diff --git a/lib/http.c b/lib/http.c index 676f80d58..f70405895 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2141,7 +2141,7 @@ CURLcode Curl_http_host(struct Curl_easy *data, struct connectdata *conn) { const char *ptr; if(!data->state.this_is_a_follow) { - /* Free to avoid leaking memory on multiple requests*/ + /* Free to avoid leaking memory on multiple requests */ free(data->state.first_host); data->state.first_host = strdup(conn->host.name); @@ -3117,7 +3117,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) /* continue with HTTP/1.1 when explicitly requested */ break; default: - /* Check if user wants to use HTTP/2 with clear TCP*/ + /* Check if user wants to use HTTP/2 with clear TCP */ #ifdef USE_NGHTTP2 if(data->state.httpwant == CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE) { #ifndef CURL_DISABLE_PROXY diff --git a/lib/http_chunks.c b/lib/http_chunks.c index 0b836851a..c344e6d39 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -113,7 +113,7 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, *wrote = 0; /* nothing's written yet */ /* the original data is written to the client, but we go on with the - chunk read process, to properly calculate the content length*/ + chunk read process, to properly calculate the content length */ if(data->set.http_te_skip && !k->ignorebody) { result = Curl_client_write(data, CLIENTWRITE_BODY, datap, datalen); if(result) { diff --git a/lib/mqtt.c b/lib/mqtt.c index 4f3d14386..8ba826f4f 100644 --- a/lib/mqtt.c +++ b/lib/mqtt.c @@ -242,7 +242,7 @@ static int init_connpack(char *packet, char *remain, int remain_pos) /* keep-alive 0 = disabled */ packet[remain_pos + 9] = 0x00; packet[remain_pos + 10] = 0x3c; - /*end of variable header*/ + /* end of variable header */ return remain_pos + 10; } @@ -251,7 +251,7 @@ static CURLcode mqtt_connect(struct Curl_easy *data) CURLcode result = CURLE_OK; int pos = 0; int rc = 0; - /*remain length*/ + /* remain length */ int remain_pos = 0; char remain[4] = {0}; size_t packetlen = 0; diff --git a/lib/rtsp.c b/lib/rtsp.c index 6d3bf97e6..700479f29 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -311,7 +311,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done) break; case RTSPREQ_RECEIVE: p_request = ""; - /* Treat interleaved RTP as body*/ + /* Treat interleaved RTP as body */ data->set.opt_no_body = FALSE; break; case RTSPREQ_LAST: @@ -650,7 +650,7 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, rtp_length = RTP_PKT_LENGTH(rtp); if(rtp_dataleft < rtp_length + 4) { - /* Need more - incomplete payload*/ + /* Need more - incomplete payload */ *readmore = TRUE; break; } diff --git a/lib/rtsp.h b/lib/rtsp.h index 377c82860..fa6606ac9 100644 --- a/lib/rtsp.h +++ b/lib/rtsp.h @@ -62,7 +62,7 @@ struct RTSP { * HTTP functions can safely treat this as an HTTP struct, but RTSP aware * functions can also index into the later elements. */ - struct HTTP http_wrapper; /*wrap HTTP to do the heavy lifting */ + struct HTTP http_wrapper; /* wrap HTTP to do the heavy lifting */ long CSeq_sent; /* CSeq of this request */ long CSeq_recv; /* CSeq received */ diff --git a/lib/telnet.c b/lib/telnet.c index 923c7f82b..77258736a 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -571,7 +571,7 @@ void rec_do(struct Curl_easy *data, int option) sendsuboption(data, option); } else if(tn->subnegotiation[option] == CURL_YES) { - /* send information to achieve this option*/ + /* send information to achieve this option */ tn->us[option] = CURL_YES; send_negotiation(data, CURL_WILL, option); sendsuboption(data, option); diff --git a/lib/urldata.h b/lib/urldata.h index f5bd5a3e9..fc7985176 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -264,7 +264,7 @@ struct ssl_connect_data { struct ssl_primary_config { long version; /* what version the client wants to use */ - long version_max; /* max supported version the client wants to use*/ + long version_max; /* max supported version the client wants to use */ char *CApath; /* certificate dir (doesn't work on windows) */ char *CAfile; /* certificate to verify peer against */ char *issuercert; /* optional issuer certificate filename */ @@ -301,7 +301,7 @@ struct ssl_config_data { char *key_passwd; /* plain text private key password */ BIT(certinfo); /* gather lots of certificate info */ BIT(falsestart); - BIT(enable_beast); /* allow this flaw for interoperability's sake*/ + BIT(enable_beast); /* allow this flaw for interoperability's sake */ BIT(no_revoke); /* disable SSL certificate revocation checks */ BIT(no_partialchain); /* don't accept partial certificate chains */ BIT(revoke_best_effort); /* ignore SSL revocation offline/missing revocation diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 79ea68adc..462a96fd6 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -142,7 +142,7 @@ bool Curl_auth_digest_get_pair(const char *str, char *value, char *content, } #if !defined(USE_WINDOWS_SSPI) -/* Convert md5 chunk to RFC2617 (section 3.1.3) -suitable ascii string*/ +/* Convert md5 chunk to RFC2617 (section 3.1.3) -suitable ascii string */ static void auth_digest_md5_to_ascii(unsigned char *source, /* 16 bytes */ unsigned char *dest) /* 33 bytes */ { @@ -151,7 +151,7 @@ static void auth_digest_md5_to_ascii(unsigned char *source, /* 16 bytes */ msnprintf((char *) &dest[i * 2], 3, "%02x", source[i]); } -/* Convert sha256 chunk to RFC7616 -suitable ascii string*/ +/* Convert sha256 chunk to RFC7616 -suitable ascii string */ static void auth_digest_sha256_to_ascii(unsigned char *source, /* 32 bytes */ unsigned char *dest) /* 65 bytes */ { diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 895b4a193..015bc66a3 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -471,4 +471,4 @@ void Curl_auth_cleanup_gssapi(struct kerberos5data *krb5) krb5->token_max = 0; } -#endif /* USE_WINDOWS_SSPI && USE_KERBEROS5*/ +#endif /* USE_WINDOWS_SSPI && USE_KERBEROS5 */ diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index f5632bf11..264b953e8 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -609,9 +609,9 @@ static CURLcode ssh_knownhost(struct Curl_easy *data) /* remove old host+key that doesn't match */ if(host) libssh2_knownhost_del(sshc->kh, host); - /*FALLTHROUGH*/ + /* FALLTHROUGH */ case CURLKHSTAT_FINE: - /*FALLTHROUGH*/ + /* FALLTHROUGH */ case CURLKHSTAT_FINE_ADD_TO_FILE: /* proceed */ if(keycheck != LIBSSH2_KNOWNHOST_CHECK_MATCH) { @@ -784,7 +784,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data) size_t keylen = 0; int sshkeytype = 0; int rc = 0; - /* we handle the process to the callback*/ + /* we handle the process to the callback */ const char *remotekey = libssh2_session_hostkey(sshc->ssh_session, &keylen, &sshkeytype); if(remotekey) { diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index fcfb9c6df..d5c22446e 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -262,7 +262,7 @@ set_ssl_version_min_max(DWORD *enabled_protocols, struct Curl_easy *data, return CURLE_OK; } -/*longest is 26, buffer is slightly bigger*/ +/* longest is 26, buffer is slightly bigger */ #define LONGEST_ALG_ID 32 #define CIPHEROPTION(X) \ if(strcmp(#X, tmp) == 0) \ @@ -289,7 +289,7 @@ get_alg_id_by_name(char *name) CIPHEROPTION(CALG_MAC); CIPHEROPTION(CALG_RSA_SIGN); CIPHEROPTION(CALG_DSS_SIGN); -/*ifdefs for the options that are defined conditionally in wincrypt.h*/ +/* ifdefs for the options that are defined conditionally in wincrypt.h */ #ifdef CALG_NO_SIGN CIPHEROPTION(CALG_NO_SIGN); #endif diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index d44f14ba6..26f04ceec 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -835,7 +835,6 @@ static OSStatus SocketRead(SSLConnectionRef connection, size_t bytesToGo = *dataLength; size_t initLen = bytesToGo; UInt8 *currData = (UInt8 *)data; - /*int sock = *(int *)connection;*/ struct ssl_connect_data *connssl = (struct ssl_connect_data *)connection; struct ssl_backend_data *backend = connssl->backend; int sock; @@ -898,7 +897,6 @@ static OSStatus SocketWrite(SSLConnectionRef connection, size_t *dataLength) /* IN/OUT */ { size_t bytesSent = 0; - /*int sock = *(int *)connection;*/ struct ssl_connect_data *connssl = (struct ssl_connect_data *)connection; struct ssl_backend_data *backend = connssl->backend; int sock; diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl index 54cd30cd9..26634774e 100755 --- a/scripts/checksrc.pl +++ b/scripts/checksrc.pl @@ -91,6 +91,9 @@ my %warnings = ( 'EMPTYLINEBRACE' => 'Empty line before the open brace', 'EQUALSNULL' => 'if/while comparison with == NULL', 'NOTEQUALSZERO', => 'if/while comparison with != 0', + 'INCLUDEDUP', => 'same file is included again', + 'COMMENTNOSPACESTART' => 'no space following /*', + 'COMMENTNOSPACEEND' => 'no space before */', ); sub readskiplist { @@ -424,6 +427,18 @@ sub scanfile { $line, length($1), $file, $l, "Trailing whitespace"); } + # no space after comment start + if($l =~ /^(.*)\/\*\w/) { + checkwarn("COMMENTNOSPACESTART", + $line, length($1) + 2, $file, $l, + "Missing space after comment start"); + } + # no space at comment end + if($l =~ /^(.*)\w\*\//) { + checkwarn("COMMENTNOSPACEEND", + $line, length($1) + 1, $file, $l, + "Missing space end comment end"); + } # ------------------------------------------------------------ # Above this marker, the checks were done on lines *including* # comments diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 17db87289..232c26f65 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -254,11 +254,8 @@ struct OperationConfig { bool xattr; /* store metadata in extended attributes */ long gssapi_delegation; bool ssl_allow_beast; /* allow this SSL vulnerability */ - bool proxy_ssl_allow_beast; /* allow this SSL vulnerability for proxy*/ - + bool proxy_ssl_allow_beast; /* allow this SSL vulnerability for proxy */ bool ssl_no_revoke; /* disable SSL certificate revocation checks */ - /*bool proxy_ssl_no_revoke; */ - bool ssl_revoke_best_effort; /* ignore SSL revocation offline/missing revocation list errors */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 605b274a9..5d021441a 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1290,7 +1290,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* This specifies the noproxy list */ GetStr(&config->noproxy, nextarg); break; - case '7': /* --socks5-gssapi-nec*/ + case '7': /* --socks5-gssapi-nec */ config->socks5_gssapi_nec = toggle; break; case '8': /* --proxy1.0 */ @@ -1436,7 +1436,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->httpversion = CURL_HTTP_VERSION_2_0; break; case '3': /* --http2-prior-knowledge */ - /* HTTP version 2.0 over clean TCP*/ + /* HTTP version 2.0 over clean TCP */ config->httpversion = CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE; break; case '4': /* --http3 */ diff --git a/tests/libtest/lib1156.c b/tests/libtest/lib1156.c index 23e3d941f..aa2bf1e81 100644 --- a/tests/libtest/lib1156.c +++ b/tests/libtest/lib1156.c @@ -129,7 +129,7 @@ static int onetest(CURL *curl, const char *url, const struct testparams *p, } /* for debugging: */ -/*#define SINGLETEST 9*/ +/* #define SINGLETEST 9 */ int test(char *URL) { diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index 44c52ff58..0fedf2576 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -50,7 +50,7 @@ int test(char *URL) { CURL *curl = NULL; CURLcode res = CURLE_FAILED_INIT; - /* http and proxy header list*/ + /* http and proxy header list */ struct curl_slist *hhl = NULL; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index d9f11f54e..69325fe8d 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -48,7 +48,7 @@ int test(char *URL) { CURL *curl = NULL; CURLcode res = CURLE_FAILED_INIT; - /* http and proxy header list*/ + /* http and proxy header list */ struct curl_slist *hhl = NULL, *phl = NULL, *tmp = NULL; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib1527.c b/tests/libtest/lib1527.c index 6f4d7fec4..f3918a22a 100644 --- a/tests/libtest/lib1527.c +++ b/tests/libtest/lib1527.c @@ -49,7 +49,7 @@ int test(char *URL) { CURL *curl = NULL; CURLcode res = CURLE_FAILED_INIT; - /* http header list*/ + /* http header list */ struct curl_slist *hhl = NULL, *tmp = NULL; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib1528.c b/tests/libtest/lib1528.c index 3401f6580..c85257466 100644 --- a/tests/libtest/lib1528.c +++ b/tests/libtest/lib1528.c @@ -30,7 +30,7 @@ int test(char *URL) { CURL *curl = NULL; CURLcode res = CURLE_FAILED_INIT; - /* http header list*/ + /* http header list */ struct curl_slist *hhl = NULL; struct curl_slist *phl = NULL; diff --git a/tests/libtest/lib1591.c b/tests/libtest/lib1591.c index 1a6f7c29f..e02bba251 100644 --- a/tests/libtest/lib1591.c +++ b/tests/libtest/lib1591.c @@ -77,7 +77,7 @@ int test(char *URL) { CURL *curl = NULL; CURLcode res = CURLE_FAILED_INIT; - /* http and proxy header list*/ + /* http and proxy header list */ struct curl_slist *hhl = NULL; if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib2302.c b/tests/libtest/lib2302.c index cb4ac3531..a61e7b20e 100644 --- a/tests/libtest/lib2302.c +++ b/tests/libtest/lib2302.c @@ -114,7 +114,6 @@ static size_t writecb(char *buffer, size_t size, size_t nitems, void *p) CURLcode result = CURLE_OK; fprintf(stderr, "send back a TEXT\n"); (void)easy; - /*result = curl_ws_send(easy, pong, 2, &sent, 0);*/ if(result) nitems = 0; } diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index b44a275b9..97be2f2d8 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -349,7 +349,7 @@ int test(char *URL) printf("-----------------\n"); curl_slist_free_all(cookies); - /* try to free share, expect to fail because share is in use*/ + /* try to free share, expect to fail because share is in use */ printf("try SHARE_CLEANUP...\n"); scode = curl_share_cleanup(share); if(scode == CURLSHE_OK) { diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 578ab713b..c51f25d47 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -1345,7 +1345,7 @@ static int test_weird_arguments(void) "0123456789" /* 10 7 */ "0123456789" /* 10 8 */ "0123456789" /* 10 9 */ - "0123456789" /* 10 10*/ + "0123456789" /* 10 10 */ "0123456789" /* 10 11 */ "01234567" /* 8 */ ); diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 8f14869e2..753f4ef9e 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -217,7 +217,7 @@ int test(char *URL) printf("PERFORM\n"); curl_easy_perform(curl); - /* try to free share, expect to fail because share is in use*/ + /* try to free share, expect to fail because share is in use */ printf("try SHARE_CLEANUP...\n"); scode = curl_share_cleanup(share); if(scode == CURLSHE_OK) { diff --git a/tests/libtest/stub_gssapi.h b/tests/libtest/stub_gssapi.h index 36460e90c..ad30553fb 100644 --- a/tests/libtest/stub_gssapi.h +++ b/tests/libtest/stub_gssapi.h @@ -100,85 +100,85 @@ typedef struct gss_channel_bindings_struct { gss_buffer_desc application_data; } *gss_channel_bindings_t; -OM_uint32 gss_release_buffer(OM_uint32 * /*minor_status*/, - gss_buffer_t /*buffer*/); - -OM_uint32 gss_init_sec_context(OM_uint32 * /*minor_status*/, - gss_const_cred_id_t /*initiator_cred_handle*/, - gss_ctx_id_t * /*context_handle*/, - gss_const_name_t /*target_name*/, - const gss_OID /*mech_type*/, - OM_uint32 /*req_flags*/, - OM_uint32 /*time_req*/, - const gss_channel_bindings_t /*input_chan_bindings*/, - const gss_buffer_t /*input_token*/, - gss_OID * /*actual_mech_type*/, - gss_buffer_t /*output_token*/, - OM_uint32 * /*ret_flags*/, - OM_uint32 * /*time_rec*/); - -OM_uint32 gss_delete_sec_context(OM_uint32 * /*minor_status*/, - gss_ctx_id_t * /*context_handle*/, - gss_buffer_t /*output_token*/); - -OM_uint32 gss_inquire_context(OM_uint32 * /*minor_status*/, - gss_const_ctx_id_t /*context_handle*/, - gss_name_t * /*src_name*/, - gss_name_t * /*targ_name*/, - OM_uint32 * /*lifetime_rec*/, - gss_OID * /*mech_type*/, - OM_uint32 * /*ctx_flags*/, - int * /*locally_initiated*/, - int * /*open_context*/); - -OM_uint32 gss_wrap(OM_uint32 * /*minor_status*/, - gss_const_ctx_id_t /*context_handle*/, - int /*conf_req_flag*/, - gss_qop_t /*qop_req*/, - const gss_buffer_t /*input_message_buffer*/, - int * /*conf_state*/, - gss_buffer_t /*output_message_buffer*/); - -OM_uint32 gss_unwrap(OM_uint32 * /*minor_status*/, - gss_const_ctx_id_t /*context_handle*/, - const gss_buffer_t /*input_message_buffer*/, - gss_buffer_t /*output_message_buffer*/, - int * /*conf_state*/, - gss_qop_t * /*qop_state*/); - -OM_uint32 gss_seal(OM_uint32 * /*minor_status*/, - gss_ctx_id_t /*context_handle*/, - int /*conf_req_flag*/, - int /*qop_req*/, - gss_buffer_t /*input_message_buffer*/, - int * /*conf_state*/, - gss_buffer_t /*output_message_buffer*/); - -OM_uint32 gss_unseal(OM_uint32 * /*minor_status*/, - gss_ctx_id_t /*context_handle*/, - gss_buffer_t /*input_message_buffer*/, - gss_buffer_t /*output_message_buffer*/, - int * /*conf_state*/, - int * /*qop_state*/); - -OM_uint32 gss_import_name(OM_uint32 * /*minor_status*/, - const gss_buffer_t /*input_name_buffer*/, - const gss_OID /*input_name_type*/, - gss_name_t * /*output_name*/); - -OM_uint32 gss_release_name(OM_uint32 * /*minor_status*/, - gss_name_t * /*input_name*/); - -OM_uint32 gss_display_name(OM_uint32 * /*minor_status*/, - gss_const_name_t /*input_name*/, - gss_buffer_t /*output_name_buffer*/, - gss_OID * /*output_name_type*/); - -OM_uint32 gss_display_status(OM_uint32 * /*minor_status*/, - OM_uint32 /*status_value*/, - int /*status_type*/, - const gss_OID /*mech_type*/, - OM_uint32 * /*message_context*/, - gss_buffer_t /*status_string*/); +OM_uint32 gss_release_buffer(OM_uint32 * /* minor_status */, + gss_buffer_t /* buffer */); + +OM_uint32 gss_init_sec_context(OM_uint32 * /* minor_status */, + gss_const_cred_id_t /* initiator_cred_handle */, + gss_ctx_id_t * /* context_handle */, + gss_const_name_t /* target_name */, + const gss_OID /* mech_type */, + OM_uint32 /* req_flags */, + OM_uint32 /* time_req */, + const gss_channel_bindings_t /* input_chan_bindings */, + const gss_buffer_t /* input_token */, + gss_OID * /* actual_mech_type */, + gss_buffer_t /* output_token */, + OM_uint32 * /* ret_flags */, + OM_uint32 * /* time_rec */); + +OM_uint32 gss_delete_sec_context(OM_uint32 * /* minor_status */, + gss_ctx_id_t * /* context_handle */, + gss_buffer_t /* output_token */); + +OM_uint32 gss_inquire_context(OM_uint32 * /* minor_status */, + gss_const_ctx_id_t /* context_handle */, + gss_name_t * /* src_name */, + gss_name_t * /* targ_name */, + OM_uint32 * /* lifetime_rec */, + gss_OID * /* mech_type */, + OM_uint32 * /* ctx_flags */, + int * /* locally_initiated */, + int * /* open_context */); + +OM_uint32 gss_wrap(OM_uint32 * /* minor_status */, + gss_const_ctx_id_t /* context_handle */, + int /* conf_req_flag */, + gss_qop_t /* qop_req */, + const gss_buffer_t /* input_message_buffer */, + int * /* conf_state */, + gss_buffer_t /* output_message_buffer */); + +OM_uint32 gss_unwrap(OM_uint32 * /* minor_status */, + gss_const_ctx_id_t /* context_handle */, + const gss_buffer_t /* input_message_buffer */, + gss_buffer_t /* output_message_buffer */, + int * /* conf_state */, + gss_qop_t * /* qop_state */); + +OM_uint32 gss_seal(OM_uint32 * /* minor_status */, + gss_ctx_id_t /* context_handle n */, + int /* conf_req_flag */, + int /* qop_req */, + gss_buffer_t /* input_message_buffer */, + int * /* conf_state */, + gss_buffer_t /* output_message_buffer */); + +OM_uint32 gss_unseal(OM_uint32 * /* minor_status */, + gss_ctx_id_t /* context_handle */, + gss_buffer_t /* input_message_buffer */, + gss_buffer_t /* output_message_buffer */, + int * /* conf_state */, + int * /* qop_state */); + +OM_uint32 gss_import_name(OM_uint32 * /* minor_status */, + const gss_buffer_t /* input_name_buffer */, + const gss_OID /* input_name_type */, + gss_name_t * /* output_name */); + +OM_uint32 gss_release_name(OM_uint32 * /* minor_status */, + gss_name_t * /* input_name */); + +OM_uint32 gss_display_name(OM_uint32 * /* minor_status */, + gss_const_name_t /* input_name */, + gss_buffer_t /* output_name_buffer */, + gss_OID * /* output_name_type */); + +OM_uint32 gss_display_status(OM_uint32 * /* minor_status */, + OM_uint32 /* status_value */, + int /* status_type */, + const gss_OID /* mech_type */, + OM_uint32 * /* message_context */, + gss_buffer_t /* status_string */); #endif /* HEADER_CURL_GSSAPI_STUBS_H */ diff --git a/tests/server/tftp.h b/tests/server/tftp.h index d8328dcf4..1ccd21967 100644 --- a/tests/server/tftp.h +++ b/tests/server/tftp.h @@ -34,7 +34,7 @@ ((__GNUC__ == 2) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 7))) # define PACKED_STRUCT __attribute__((__packed__)) #else -# define PACKED_STRUCT /*NOTHING*/ +# define PACKED_STRUCT /* NOTHING */ #endif /* Using a packed struct as binary in a program is begging for problems, but diff --git a/tests/server/util.c b/tests/server/util.c index a0abf5190..8238691b3 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -67,7 +67,7 @@ ((__W32API_MAJOR_VERSION == 3) && (__W32API_MINOR_VERSION < 6)) const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; #endif /* w32api < 3.6 */ -#endif /* ENABLE_IPV6 && __MINGW32__*/ +#endif /* ENABLE_IPV6 && __MINGW32__ */ static struct timeval tvnow(void); diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index 493a2f11a..db0d5c569 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -93,10 +93,10 @@ UNITTEST_START fail_unless(Curl_llist_count(&llist) == 1, "List size should be 1 after adding a new element"); - /*test that the list head data holds my unusedData */ + /* test that the list head data holds my unusedData */ fail_unless(llist.head->ptr == &unusedData_case1, "head ptr should be first entry"); - /*same goes for the list tail */ + /* same goes for the list tail */ fail_unless(llist.tail == llist.head, "tail and head should be the same"); |