From: Viktor Szakats <commit@vsz.me>
Date: Tue, 2 Sep 2025 11:20:20 +0000 (+0200)
Subject: tidy-up: drop stray "unused" comments
X-Git-Tag: curl-8_16_0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49145249be7b4b677606308fc34f180330a3640a;p=thirdparty%2Fcurl.git

tidy-up: drop stray "unused" comments

Closes #18453
---

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index 410a0f70ce..40fa50fe83 100644
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -87,7 +87,7 @@ int main(void)
 #elif defined(HAVE_GETHOSTBYNAME_R_5) || \
       defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT)
   rc = gethostbyname_r(address, &h, buffer, 8192, &h_errnop);
-  (void)hp; /* not used for test */
+  (void)hp;
   (void)h_errnop;
 #elif defined(HAVE_GETHOSTBYNAME_R_6) || \
       defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)
diff --git a/docs/examples/cacertinmem.c b/docs/examples/cacertinmem.c
index 9b39667aff..ec12df58bf 100644
--- a/docs/examples/cacertinmem.c
+++ b/docs/examples/cacertinmem.c
@@ -72,8 +72,8 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *pointer)
   int i;
   STACK_OF(X509_INFO) *inf;
 
-  (void)curl; /* avoid warnings */
-  (void)pointer; /* avoid warnings */
+  (void)curl;
+  (void)pointer;
 
   if(!cts || !cbio) {
     return rv;
diff --git a/docs/examples/chkspeed.c b/docs/examples/chkspeed.c
index fc40814696..264c514ba4 100644
--- a/docs/examples/chkspeed.c
+++ b/docs/examples/chkspeed.c
@@ -56,8 +56,8 @@ static size_t WriteCallback(void *ptr, size_t size, size_t nmemb, void *data)
 {
   /* we are not interested in the downloaded bytes itself,
      so we only return the size we would have saved ... */
-  (void)ptr;  /* unused */
-  (void)data; /* unused */
+  (void)ptr;
+  (void)data;
   return (size_t)(size * nmemb);
 }
 
diff --git a/docs/examples/debug.c b/docs/examples/debug.c
index 2bd8b971ac..5303c833f5 100644
--- a/docs/examples/debug.c
+++ b/docs/examples/debug.c
@@ -90,7 +90,7 @@ int my_trace(CURL *handle, curl_infotype type,
 {
   struct data *config = (struct data *)userp;
   const char *text;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
 
   switch(type) {
   case CURLINFO_TEXT:
diff --git a/docs/examples/http2-download.c b/docs/examples/http2-download.c
index ac9b9a082e..954cdcbc6d 100644
--- a/docs/examples/http2-download.c
+++ b/docs/examples/http2-download.c
@@ -110,7 +110,7 @@ int my_trace(CURL *handle, curl_infotype type,
   const char *text;
   struct transfer *t = (struct transfer *)userp;
   unsigned int num = t->num;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
 
   switch(type) {
   case CURLINFO_TEXT:
diff --git a/docs/examples/http2-pushinmemory.c b/docs/examples/http2-pushinmemory.c
index 53c368e012..873883ca50 100644
--- a/docs/examples/http2-pushinmemory.c
+++ b/docs/examples/http2-pushinmemory.c
@@ -97,8 +97,8 @@ static int server_push_callback(CURL *parent,
 {
   char *headp;
   int *transfers = (int *)userp;
-  (void)parent; /* we have no use for this */
-  (void)num_headers; /* unused */
+  (void)parent;
+  (void)num_headers;
 
   if(pushindex == MAX_FILES)
     /* cannot fit anymore */
diff --git a/docs/examples/http2-serverpush.c b/docs/examples/http2-serverpush.c
index e259e14979..df4e49ea58 100644
--- a/docs/examples/http2-serverpush.c
+++ b/docs/examples/http2-serverpush.c
@@ -92,7 +92,7 @@ int my_trace(CURL *handle, curl_infotype type,
              void *userp)
 {
   const char *text;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
   (void)userp;
   switch(type) {
   case CURLINFO_TEXT:
@@ -171,7 +171,7 @@ static int server_push_callback(CURL *parent,
   FILE *out;
   static unsigned int count = 0;
 
-  (void)parent; /* we have no use for this */
+  (void)parent;
 
   curl_msnprintf(filename, 128, "push%u", count++);
 
diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c
index c033b0b685..482889ea18 100644
--- a/docs/examples/http2-upload.c
+++ b/docs/examples/http2-upload.c
@@ -150,7 +150,7 @@ int my_trace(CURL *handle, curl_infotype type,
   struct timeval tv;
   time_t secs;
   struct tm *now;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
 
   gettimeofday(&tv, NULL);
   if(!known_offset) {
diff --git a/docs/examples/multi-debugcallback.c b/docs/examples/multi-debugcallback.c
index 79123ca224..738732279d 100644
--- a/docs/examples/multi-debugcallback.c
+++ b/docs/examples/multi-debugcallback.c
@@ -91,7 +91,7 @@ int my_trace(CURL *handle, curl_infotype type,
   const char *text;
 
   (void)userp;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
 
   switch(type) {
   case CURLINFO_TEXT:
diff --git a/docs/examples/threaded-ssl.c b/docs/examples/threaded-ssl.c
index 9668129055..161182eec1 100644
--- a/docs/examples/threaded-ssl.c
+++ b/docs/examples/threaded-ssl.c
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 {
   pthread_t tid[NUMT];
   int i;
-  (void)argc; /* we do not use any arguments in this example */
+  (void)argc;
   (void)argv;
 
   /* Must initialize libcurl before any threads are started */
diff --git a/docs/examples/usercertinmem.c b/docs/examples/usercertinmem.c
index 536b65b490..670ae4dc71 100644
--- a/docs/examples/usercertinmem.c
+++ b/docs/examples/usercertinmem.c
@@ -93,8 +93,8 @@ static CURLcode sslctx_function(CURL *curl, void *sslctx, void *pointer)
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"
     "-----END RSA PRIVATE KEY-----\n";
 
-  (void)curl; /* avoid warnings */
-  (void)pointer; /* avoid warnings */
+  (void)curl;
+  (void)pointer;
 
   /* get a BIO */
   bio = BIO_new_mem_buf((char *)mypem, -1);
diff --git a/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.md b/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.md
index 9e7aa8ad73..4ecfb5327b 100644
--- a/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.md
+++ b/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.md
@@ -149,7 +149,7 @@ int my_trace(CURL *handle, curl_infotype type,
              void *clientp)
 {
   const char *text;
-  (void)handle; /* prevent compiler warning */
+  (void)handle;
   (void)clientp;
 
   switch(type) {
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 426caf82d5..7cf1ed2a5c 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -1444,7 +1444,7 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
   size_t orig_len = len;
   CURLcode result = CURLE_OK;
 
-  (void)eos; /* unused */
+  (void)eos;
   *pnwritten = 0;
   fdsave = cf->conn->sock[cf->sockindex];
   cf->conn->sock[cf->sockindex] = ctx->sock;
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index b178dff845..baee79fbee 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -307,9 +307,9 @@ static CURLcode rtmp_do(struct Curl_easy *data, bool *done)
 static CURLcode rtmp_done(struct Curl_easy *data, CURLcode status,
                           bool premature)
 {
-  (void)data; /* unused */
-  (void)status; /* unused */
-  (void)premature; /* unused */
+  (void)data;
+  (void)status;
+  (void)premature;
 
   return CURLE_OK;
 }
@@ -334,7 +334,7 @@ static CURLcode rtmp_recv(struct Curl_easy *data, int sockindex, char *buf,
   CURLcode result = CURLE_OK;
   ssize_t nread;
 
-  (void)sockindex; /* unused */
+  (void)sockindex;
   *pnread = 0;
   if(!r)
     return CURLE_FAILED_INIT;
@@ -362,8 +362,8 @@ static CURLcode rtmp_send(struct Curl_easy *data, int sockindex,
   RTMP *r = Curl_conn_meta_get(conn, CURL_META_RTMP_CONN);
   ssize_t nwritten;
 
-  (void)sockindex; /* unused */
-  (void)eos; /* unused */
+  (void)sockindex;
+  (void)eos;
   *pnwritten = 0;
   if(!r)
     return CURLE_FAILED_INIT;
diff --git a/lib/file.c b/lib/file.c
index 0b44d2257d..749759653d 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -292,8 +292,8 @@ static CURLcode file_done(struct Curl_easy *data,
                           CURLcode status, bool premature)
 {
   struct FILEPROTO *file = Curl_meta_get(data, CURL_META_FILE_EASY);
-  (void)status; /* not used */
-  (void)premature; /* not used */
+  (void)status;
+  (void)premature;
 
   if(file)
     file_cleanup(file);
@@ -305,7 +305,7 @@ static CURLcode file_disconnect(struct Curl_easy *data,
                                 struct connectdata *conn,
                                 bool dead_connection)
 {
-  (void)dead_connection; /* not used */
+  (void)dead_connection;
   (void)conn;
   return file_done(data, CURLE_OK, FALSE);
 }
diff --git a/lib/hostip.c b/lib/hostip.c
index dfff9d61da..2d122fb999 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -1136,14 +1136,14 @@ CURLcode Curl_resolv_timeout(struct Curl_easy *data,
   Curl_resolve_test_delay();
 #endif
 
-#else /* USE_ALARM_TIMEOUT */
+#else /* !USE_ALARM_TIMEOUT */
 #ifndef CURLRES_ASYNCH
   if(timeoutms)
     infof(data, "timeout on name lookup is not supported");
 #else
-  (void)timeoutms; /* timeoutms not used with an async resolver */
+  (void)timeoutms;
 #endif
-#endif /* else USE_ALARM_TIMEOUT */
+#endif /* USE_ALARM_TIMEOUT */
 
   /* Perform the actual name resolution. This might be interrupted by an
    * alarm if it takes too long.
diff --git a/lib/http.c b/lib/http.c
index d62f3aff4a..67f88736e0 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -2993,7 +2993,7 @@ checkrtspprefix(struct Curl_easy *data,
 {
   statusline result = STATUS_BAD;
   statusline onmatch = len >= 5 ? STATUS_DONE : STATUS_UNKNOWN;
-  (void)data; /* unused */
+  (void)data;
   if(checkprefixmax("RTSP/", s, len))
     result = onmatch;
 
diff --git a/lib/imap.c b/lib/imap.c
index 7e6b132ba0..41aec8ffab 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1005,7 +1005,7 @@ static CURLcode imap_state_servergreet_resp(struct Curl_easy *data,
                                             int imapcode,
                                             imapstate instate)
 {
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(imapcode == IMAP_RESP_PREAUTH) {
     /* PREAUTH */
@@ -1030,7 +1030,7 @@ static CURLcode imap_state_capability_resp(struct Curl_easy *data,
   struct connectdata *conn = data->conn;
   const char *line = curlx_dyn_ptr(&imapc->pp.recvbuf);
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   /* Do we have an untagged response? */
   if(imapcode == '*') {
@@ -1111,7 +1111,7 @@ static CURLcode imap_state_starttls_resp(struct Curl_easy *data,
 {
   CURLcode result = CURLE_OK;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   /* Pipelining in response is forbidden. */
   if(imapc->pp.overflow)
@@ -1140,7 +1140,7 @@ static CURLcode imap_state_auth_resp(struct Curl_easy *data,
   CURLcode result = CURLE_OK;
   saslprogress progress;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   result = Curl_sasl_continue(&imapc->sasl, data, imapcode, &progress);
   if(!result)
@@ -1171,7 +1171,7 @@ static CURLcode imap_state_login_resp(struct Curl_easy *data,
                                       imapstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(imapcode != IMAP_RESP_OK) {
     failf(data, "Access denied. %c", imapcode);
@@ -1194,7 +1194,7 @@ static CURLcode imap_state_listsearch_resp(struct Curl_easy *data,
   char *line = curlx_dyn_ptr(&imapc->pp.recvbuf);
   size_t len = imapc->pp.nfinal;
 
-  (void)instate; /* No use for this yet */
+  (void)instate;
 
   if(imapcode == '*')
     result = Curl_client_write(data, CLIENTWRITE_BODY, line, len);
@@ -1217,7 +1217,7 @@ static CURLcode imap_state_select_resp(struct Curl_easy *data,
   CURLcode result = CURLE_OK;
   const char *line = curlx_dyn_ptr(&imapc->pp.recvbuf);
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(imapcode == '*') {
     /* See if this is an UIDVALIDITY response */
@@ -1279,7 +1279,7 @@ static CURLcode imap_state_fetch_resp(struct Curl_easy *data,
   bool parsed = FALSE;
   curl_off_t size = 0;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(imapcode != '*') {
     Curl_pgrsSetDownloadSize(data, -1);
@@ -1370,7 +1370,7 @@ static CURLcode imap_state_fetch_final_resp(struct Curl_easy *data,
 {
   CURLcode result = CURLE_OK;
 
-  (void)instate; /* No use for this yet */
+  (void)instate;
 
   if(imapcode != IMAP_RESP_OK)
     result = CURLE_WEIRD_SERVER_REPLY;
@@ -1388,7 +1388,7 @@ static CURLcode imap_state_append_resp(struct Curl_easy *data,
                                        imapstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* No use for this yet */
+  (void)instate;
 
   if(imapcode != '+') {
     result = CURLE_UPLOAD_FAILED;
@@ -1415,7 +1415,7 @@ static CURLcode imap_state_append_final_resp(struct Curl_easy *data,
 {
   CURLcode result = CURLE_OK;
 
-  (void)instate; /* No use for this yet */
+  (void)instate;
 
   if(imapcode != IMAP_RESP_OK)
     result = CURLE_UPLOAD_FAILED;
diff --git a/lib/krb5.c b/lib/krb5.c
index 40243bddb5..78c2a4ff53 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -130,7 +130,7 @@ krb5_init(void *app_data)
 static int
 krb5_check_prot(void *app_data, int level)
 {
-  (void)app_data; /* unused */
+  (void)app_data;
   if(level == PROT_CONFIDENTIAL)
     return -1;
   return 0;
@@ -470,7 +470,7 @@ static int ftp_send_command(struct Curl_easy *data, const char *message, ...)
       ftp_code = -1;
   }
 
-  (void)nread; /* Unused */
+  (void)nread;
   return ftp_code;
 }
 
@@ -703,7 +703,7 @@ static CURLcode sec_send(struct Curl_easy *data, int sockindex,
                          const void *buffer, size_t len, bool eos,
                          size_t *pnwritten)
 {
-  (void)eos; /* unused */
+  (void)eos;
   return sec_write(data, sockindex, buffer, len, pnwritten);
 }
 
diff --git a/lib/mime.c b/lib/mime.c
index f480bc7042..adce922950 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -661,7 +661,7 @@ static size_t mime_mem_read(char *buffer, size_t size, size_t nitems,
 {
   curl_mimepart *part = (curl_mimepart *) instream;
   size_t sz = curlx_sotouz(part->datasize - part->state.offset);
-  (void)size;   /* Always 1.*/
+  (void)size;  /* Always 1 */
 
   if(!nitems)
     return STOP_FILLING;
@@ -1000,7 +1000,7 @@ static size_t mime_subparts_read(char *buffer, size_t size, size_t nitems,
 {
   curl_mime *mime = (curl_mime *) instream;
   size_t cursize = 0;
-  (void)size;   /* Always 1. */
+  (void)size;  /* Always 1 */
 
   while(nitems) {
     size_t sz = 0;
@@ -1593,7 +1593,7 @@ size_t Curl_mime_read(char *buffer, size_t size, size_t nitems, void *instream)
   size_t ret;
   bool hasread;
 
-  (void)size;   /* Always 1. */
+  (void)size;  /* Always 1 */
 
   /* If `nitems` is <= 4, some encoders will return STOP_FILLING without
    * adding any data and this loops infinitely. */
diff --git a/lib/multi.c b/lib/multi.c
index 99746a4ce1..918928d03c 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1166,7 +1166,7 @@ CURLMcode curl_multi_fdset(CURLM *m,
   struct Curl_multi *multi = m;
   struct easy_pollset ps;
   unsigned int i, mid;
-  (void)exc_fd_set; /* not used */
+  (void)exc_fd_set;
 
   if(!GOOD_MULTI_HANDLE(multi))
     return CURLM_BAD_HANDLE;
@@ -1865,7 +1865,7 @@ static void multi_posttransfer(struct Curl_easy *data)
   if(!data->set.no_signal)
     signal(SIGPIPE, data->state.prev_signal);
 #else
-  (void)data; /* unused parameter */
+  (void)data;
 #endif
 }
 
diff --git a/lib/pop3.c b/lib/pop3.c
index 508f8faed3..f5ecfd178b 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -811,7 +811,7 @@ static CURLcode pop3_state_servergreet_resp(struct Curl_easy *data,
   const char *line;
   size_t len;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
   if(!pop3c)
     return CURLE_FAILED_INIT;
 
@@ -866,7 +866,7 @@ static CURLcode pop3_state_capa_resp(struct Curl_easy *data, int pop3code,
   const char *line;
   size_t len;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
   if(!pop3c)
     return CURLE_FAILED_INIT;
 
@@ -954,7 +954,7 @@ static CURLcode pop3_state_starttls_resp(struct Curl_easy *data,
 {
   struct pop3_conn *pop3c = Curl_conn_meta_get(conn, CURL_META_POP3_CONN);
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(!pop3c)
     return CURLE_FAILED_INIT;
@@ -987,7 +987,7 @@ static CURLcode pop3_state_auth_resp(struct Curl_easy *data,
   struct pop3_conn *pop3c = Curl_conn_meta_get(conn, CURL_META_POP3_CONN);
   saslprogress progress;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
   if(!pop3c)
     return CURLE_FAILED_INIT;
 
@@ -1025,7 +1025,7 @@ static CURLcode pop3_state_apop_resp(struct Curl_easy *data, int pop3code,
                                      pop3state instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(pop3code != '+') {
     failf(data, "Authentication failed: %d", pop3code);
@@ -1046,7 +1046,7 @@ static CURLcode pop3_state_user_resp(struct Curl_easy *data, int pop3code,
   CURLcode result = CURLE_OK;
   struct connectdata *conn = data->conn;
   struct pop3_conn *pop3c = Curl_conn_meta_get(conn, CURL_META_POP3_CONN);
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(!pop3c)
     return CURLE_FAILED_INIT;
@@ -1070,7 +1070,7 @@ static CURLcode pop3_state_pass_resp(struct Curl_easy *data, int pop3code,
                                      pop3state instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(pop3code != '+') {
     failf(data, "Access denied. %c", pop3code);
@@ -1094,7 +1094,7 @@ static CURLcode pop3_state_command_resp(struct Curl_easy *data,
   struct pop3_conn *pop3c = Curl_conn_meta_get(conn, CURL_META_POP3_CONN);
   struct pingpong *pp;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
   if(!pop3 || !pop3c)
     return CURLE_FAILED_INIT;
 
diff --git a/lib/smtp.c b/lib/smtp.c
index c52cf0dc56..5dba1f9ea8 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -924,7 +924,7 @@ static CURLcode smtp_state_servergreet_resp(struct Curl_easy *data,
                                             smtpstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode/100 != 2) {
     failf(data, "Got unexpected smtp-server response: %d", smtpcode);
@@ -943,7 +943,7 @@ static CURLcode smtp_state_starttls_resp(struct Curl_easy *data,
                                          smtpstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   /* Pipelining in response is forbidden. */
   if(smtpc->pp.overflow)
@@ -973,7 +973,7 @@ static CURLcode smtp_state_ehlo_resp(struct Curl_easy *data,
   const char *line = curlx_dyn_ptr(&smtpc->pp.recvbuf);
   size_t len = smtpc->pp.nfinal;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode/100 != 2 && smtpcode != 1) {
     if(data->set.use_ssl <= CURLUSESSL_TRY
@@ -1074,7 +1074,7 @@ static CURLcode smtp_state_helo_resp(struct Curl_easy *data,
                                      smtpstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode/100 != 2) {
     failf(data, "Remote access denied: %d", smtpcode);
@@ -1096,7 +1096,7 @@ static CURLcode smtp_state_auth_resp(struct Curl_easy *data,
   CURLcode result = CURLE_OK;
   saslprogress progress;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   result = Curl_sasl_continue(&smtpc->sasl, data, smtpcode, &progress);
   if(!result)
@@ -1126,7 +1126,7 @@ static CURLcode smtp_state_command_resp(struct Curl_easy *data,
   char *line = curlx_dyn_ptr(&smtpc->pp.recvbuf);
   size_t len = smtpc->pp.nfinal;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if((smtp->rcpt && smtpcode/100 != 2 && smtpcode != 553 && smtpcode != 1) ||
      (!smtp->rcpt && smtpcode/100 != 2 && smtpcode != 1)) {
@@ -1166,7 +1166,7 @@ static CURLcode smtp_state_mail_resp(struct Curl_easy *data,
                                      smtpstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode/100 != 2) {
     failf(data, "MAIL failed: %d", smtpcode);
@@ -1190,7 +1190,7 @@ static CURLcode smtp_state_rcpt_resp(struct Curl_easy *data,
   bool is_smtp_err = FALSE;
   bool is_smtp_blocking_err = FALSE;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   is_smtp_err = (smtpcode/100 != 2);
 
@@ -1246,7 +1246,7 @@ static CURLcode smtp_state_data_resp(struct Curl_easy *data,
                                      smtpstate instate)
 {
   CURLcode result = CURLE_OK;
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode != 354) {
     failf(data, "DATA failed: %d", smtpcode);
@@ -1275,7 +1275,7 @@ static CURLcode smtp_state_postdata_resp(struct Curl_easy *data,
 {
   CURLcode result = CURLE_OK;
 
-  (void)instate; /* no use for this yet */
+  (void)instate;
 
   if(smtpcode != 250)
     result = CURLE_WEIRD_SERVER_REPLY;
diff --git a/lib/telnet.c b/lib/telnet.c
index 731789e463..cc827c1b3e 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1287,8 +1287,8 @@ static CURLcode send_telnet_data(struct Curl_easy *data,
 static CURLcode telnet_done(struct Curl_easy *data,
                             CURLcode status, bool premature)
 {
-  (void)status; /* unused */
-  (void)premature; /* not used */
+  (void)status;
+  (void)premature;
   Curl_meta_remove(data, CURL_META_TELNET_EASY);
   return CURLE_OK;
 }
diff --git a/lib/tftp.c b/lib/tftp.c
index 6a9f964a07..4c2fadc2ca 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -1061,8 +1061,8 @@ static CURLcode tftp_done(struct Curl_easy *data, CURLcode status,
   struct connectdata *conn = data->conn;
   struct tftp_conn *state = Curl_conn_meta_get(conn, CURL_META_TFTP_CONN);
 
-  (void)status; /* unused */
-  (void)premature; /* not used */
+  (void)status;
+  (void)premature;
 
   if(Curl_pgrsDone(data))
     return CURLE_ABORTED_BY_CALLBACK;
diff --git a/lib/version.c b/lib/version.c
index aeb133ec73..a2d4867200 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -624,7 +624,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
   static char zstd_buffer[80];
 #endif
 
-  (void)stamp; /* avoid compiler warnings, we do not use this */
+  (void)stamp;
 
 #ifdef USE_SSL
   Curl_ssl_version(ssl_buffer, sizeof(ssl_buffer));
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 2898a70f0a..695532ff85 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -2840,7 +2840,7 @@ static CURLcode scp_done(struct Curl_easy *data, CURLcode status,
                          bool premature)
 {
   struct ssh_conn *sshc = Curl_conn_meta_get(data->conn, CURL_META_SSH_CONN);
-  (void)premature;             /* not used */
+  (void)premature;
 
   if(!sshc)
     return CURLE_FAILED_INIT;
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 13f374564f..5dfc377ec1 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -276,19 +276,19 @@ static CURLcode libssh2_session_error_to_CURLE(int err)
 
 static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc)
 {
-  (void)abstract; /* arg not used */
+  (void)abstract;
   return Curl_cmalloc(count);
 }
 
 static LIBSSH2_REALLOC_FUNC(my_libssh2_realloc)
 {
-  (void)abstract; /* arg not used */
+  (void)abstract;
   return Curl_crealloc(ptr, count);
 }
 
 static LIBSSH2_FREE_FUNC(my_libssh2_free)
 {
-  (void)abstract; /* arg not used */
+  (void)abstract;
   if(ptr) /* ssh2 agent sometimes call free with null ptr */
     Curl_cfree(ptr);
 }
@@ -3732,7 +3732,7 @@ static CURLcode scp_done(struct Curl_easy *data, CURLcode status,
                          bool premature)
 {
   struct ssh_conn *sshc = Curl_conn_meta_get(data->conn, CURL_META_SSH_CONN);
-  (void)premature; /* not used */
+  (void)premature;
 
   if(sshc && !status)
     myssh_state(data, sshc, SSH_SCP_DONE);
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 5971d9a358..a49203ab07 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -5517,9 +5517,9 @@ static CURLcode ossl_get_channel_binding(struct Curl_easy *data, int sockindex,
   return CURLE_OK;
 #else
   /* No X509_get_signature_nid support */
-  (void)data; /* unused */
-  (void)sockindex; /* unused */
-  (void)binding; /* unused */
+  (void)data;
+  (void)sockindex;
+  (void)binding;
   return CURLE_OK;
 #endif
 }
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index ea06d31ab0..6bd4805cea 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -1459,7 +1459,7 @@ static bool
 cert_counter_callback(const CERT_CONTEXT *ccert_context, bool reverse_order,
                       void *certs_count)
 {
-  (void)reverse_order; /* unused */
+  (void)reverse_order;
   if(valid_cert_encoding(ccert_context))
     (*(int *)certs_count)++;
   return TRUE;
diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index 0b36236ab7..6a587cc1cc 100644
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -91,7 +91,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
   char idsbuf[60];
   curl_off_t xfer_id, conn_id;
 
-  (void)handle; /* not used */
+  (void)handle;
   (void)userdata;
 
   if(global->tracetime) {
diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 5b8ba62a56..0a3e9ef0ee 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -146,10 +146,10 @@ int tool_readbusy_cb(void *clientp,
   struct OperationConfig *config = per->config;
   static curl_off_t ulprev;
 
-  (void)dltotal;  /* unused */
-  (void)dlnow;  /* unused */
-  (void)ultotal;  /* unused */
-  (void)ulnow;  /* unused */
+  (void)dltotal;
+  (void)dlnow;
+  (void)ultotal;
+  (void)ulnow;
 
   if(config->readbusy) {
     if(ulprev == ulnow) {
diff --git a/tests/libtest/cli_h2_serverpush.c b/tests/libtest/cli_h2_serverpush.c
index a58f38dd0a..7b465bc61a 100644
--- a/tests/libtest/cli_h2_serverpush.c
+++ b/tests/libtest/cli_h2_serverpush.c
@@ -68,7 +68,7 @@ static int server_push_callback(CURL *parent,
   static unsigned int count = 0;
   int rv;
 
-  (void)parent; /* we have no use for this */
+  (void)parent;
   curl_msnprintf(filename, sizeof(filename) - 1, "push%u", count++);
 
   /* here's a new stream, save it in a new file for each new push */
diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c
index 6e6287dbfc..dd80163d43 100644
--- a/tests/libtest/lib1512.c
+++ b/tests/libtest/lib1512.c
@@ -42,7 +42,7 @@ static CURLcode test_lib1512(const char *URL)
   struct curl_slist *slist = NULL;
   size_t i;
   char target_url[256];
-  (void)URL; /* URL is setup in the code */
+  (void)URL;
 
   if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     curl_mfprintf(stderr, "curl_global_init() failed\n");
diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c
index 15256deaf0..ff5c83cc82 100644
--- a/tests/libtest/lib1533.c
+++ b/tests/libtest/lib1533.c
@@ -77,7 +77,6 @@ static size_t t1533_write_cb(char *ptr, size_t size, size_t nmemb, void *userp)
   struct cb_data *data = (struct cb_data *)userp;
   size_t totalsize = nmemb * size;
 
-  /* unused parameter */
   (void)ptr;
 
   /* all response headers have been received */
diff --git a/tests/libtest/lib1537.c b/tests/libtest/lib1537.c
index 52272cb2ec..cb35fb1908 100644
--- a/tests/libtest/lib1537.c
+++ b/tests/libtest/lib1537.c
@@ -35,7 +35,7 @@ static CURLcode test_lib1537(const char *URL)
   int outlen = 0;
   char *raw;
 
-  (void)URL; /* we don't use this */
+  (void)URL;
 
   if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     curl_mfprintf(stderr, "curl_global_init() failed\n");
diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c
index 6fedbf6884..11583aec47 100644
--- a/tests/libtest/lib1550.c
+++ b/tests/libtest/lib1550.c
@@ -38,7 +38,7 @@ static CURLcode test_lib1550(const char *URL)
 
   global_init(CURL_GLOBAL_ALL);
   handle = curl_multi_init();
-  (void)URL; /* unused */
+  (void)URL;
 
   curl_multi_setopt(handle, CURLMOPT_PIPELINING_SERVER_BL, bl_servers);
   curl_multi_setopt(handle, CURLMOPT_PIPELINING_SITE_BL, bl_sites);
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index 99112389fe..1973d8a916 100644
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -2036,7 +2036,7 @@ static CURLcode test_lib1560(const char *URL)
 {
   bool has_utf8 = !!getenv("CURL_TEST_HAVE_CODESET_UTF8");
 
-  (void)URL; /* not used */
+  (void)URL;
 
   if(urldup())
     return (CURLcode)11;
diff --git a/tests/libtest/lib1971.c b/tests/libtest/lib1971.c
index 03b254c1c5..bc25226bde 100644
--- a/tests/libtest/lib1971.c
+++ b/tests/libtest/lib1971.c
@@ -27,10 +27,10 @@
 
 static size_t t1971_read_cb(char *ptr, size_t size, size_t nitems, void *userp)
 {
-  (void)ptr; /* unused */
-  (void)size; /* unused */
-  (void)nitems; /* unused */
-  (void)userp; /* unused */
+  (void)ptr;
+  (void)size;
+  (void)nitems;
+  (void)userp;
   return 0;
 }
 
diff --git a/tests/libtest/lib1975.c b/tests/libtest/lib1975.c
index 95db9ae58d..d6c05a1251 100644
--- a/tests/libtest/lib1975.c
+++ b/tests/libtest/lib1975.c
@@ -27,10 +27,10 @@
 
 static size_t t1975_read_cb(char *ptr, size_t size, size_t nitems, void *userp)
 {
-  (void)ptr; /* unused */
-  (void)size; /* unused */
-  (void)nitems; /* unused */
-  (void)userp; /* unused */
+  (void)ptr;
+  (void)size;
+  (void)nitems;
+  (void)userp;
   return 0;
 }
 
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index d32e4397b8..d761c8a636 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -30,7 +30,7 @@ static CURLcode test_lib501(const char *URL)
   CURLcode res;
   CURL *curl;
 
-  (void)URL; /* we don't use this */
+  (void)URL;
 
   if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     curl_mfprintf(stderr, "curl_global_init() failed\n");
diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c
index cf1a14d31c..85950dd866 100644
--- a/tests/libtest/lib517.c
+++ b/tests/libtest/lib517.c
@@ -164,7 +164,7 @@ static CURLcode test_lib517(const char *URL)
   int i;
   int error = 0;
 
-  (void)URL; /* not used */
+  (void)URL;
 
   for(i = 0; dates[i].input; i++) {
     time_t out = curl_getdate(dates[i].input, NULL);
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index e6fe6ceff0..7d8cc3cbcb 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -136,8 +136,8 @@ static int t530_curlSocketCallback(CURL *easy, curl_socket_t s, int action,
 {
   struct t530_ReadWriteSockets *sockets = userp;
 
-  (void)easy; /* unused */
-  (void)socketp; /* unused */
+  (void)easy;
+  (void)socketp;
 
   t530_ctx.socket_calls++;
   t530_msg("-> CURLMOPT_SOCKETFUNCTION");
@@ -169,7 +169,7 @@ static int t530_curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
 {
   struct curltime *timeout = userp;
 
-  (void)multi; /* unused */
+  (void)multi;
   t530_ctx.timer_calls++;
   t530_msg("-> CURLMOPT_TIMERFUNCTION");
   if(t530_ctx.timer_calls == t530_ctx.max_timer_calls) {
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index e3597d6d3e..6114d57aab 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -56,7 +56,7 @@ static size_t t547_read_cb(char *ptr, size_t size, size_t nmemb, void *clientp)
 static curlioerr t547_ioctl_callback(CURL *handle, int cmd, void *clientp)
 {
   int *counter = (int *)clientp;
-  (void)handle; /* unused */
+  (void)handle;
   if(cmd == CURLIOCMD_RESTARTREAD) {
     curl_mfprintf(stderr, "REWIND!\n");
     *counter = 0; /* clear counter to make the read callback restart */
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index 30438bafa9..fe3b692117 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -60,7 +60,7 @@ static size_t t555_read_cb(char *ptr, size_t size, size_t nmemb, void *clientp)
 static curlioerr t555_ioctl_callback(CURL *handle, int cmd, void *clientp)
 {
   int *counter = (int *)clientp;
-  (void)handle; /* unused */
+  (void)handle;
   if(cmd == CURLIOCMD_RESTARTREAD) {
     curl_mfprintf(stderr, "REWIND!\n");
     *counter = 0; /* clear counter to make the read callback restart */
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 61b051a43c..dd0e2e7c4d 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -1535,7 +1535,7 @@ static int test_return_codes(void)
 static CURLcode test_lib557(const char *URL)
 {
   int errors = 0;
-  (void)URL; /* not used */
+  (void)URL;
 
 #ifdef HAVE_SETLOCALE
   /*
diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c
index 795a0b74b3..c82b6ee969 100644
--- a/tests/libtest/lib558.c
+++ b/tests/libtest/lib558.c
@@ -33,7 +33,7 @@ static CURLcode test_lib558(const char *URL)
   char *ptr = NULL;
   int asize;
 
-  (void)URL; /* we don't use this */
+  (void)URL;
 
   if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     curl_mfprintf(stderr, "curl_global_init() failed\n");
diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c
index 5b46c8e622..a15c9a4f81 100644
--- a/tests/libtest/lib578.c
+++ b/tests/libtest/lib578.c
@@ -35,9 +35,9 @@ static int t578_progress_callback(void *clientp, double dltotal, double dlnow,
 {
   FILE *moo = fopen(libtest_arg2, "wb");
 
-  (void)clientp; /* UNUSED */
-  (void)dltotal; /* UNUSED */
-  (void)dlnow; /* UNUSED */
+  (void)clientp;
+  (void)dltotal;
+  (void)dlnow;
 
   if(moo) {
     if((size_t)ultotal == data_size && (size_t)ulnow == data_size)
diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c
index 4f6b67e540..76ecefe4ec 100644
--- a/tests/libtest/lib579.c
+++ b/tests/libtest/lib579.c
@@ -48,9 +48,9 @@ static void progress_final_report(void)
 static int t579_progress_callback(void *clientp, double dltotal, double dlnow,
                                   double ultotal, double ulnow)
 {
-  (void)clientp; /* UNUSED */
-  (void)dltotal; /* UNUSED */
-  (void)dlnow; /* UNUSED */
+  (void)clientp;
+  (void)dltotal;
+  (void)dlnow;
 
   if(started && ulnow <= 0.0 && last_ul) {
     progress_final_report();
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c
index 8ca87d459d..70a9ab65dc 100644
--- a/tests/libtest/lib582.c
+++ b/tests/libtest/lib582.c
@@ -97,8 +97,8 @@ static int t582_curlSocketCallback(CURL *easy, curl_socket_t s, int action,
 {
   struct t582_ReadWriteSockets *sockets = userp;
 
-  (void)easy; /* unused */
-  (void)socketp; /* unused */
+  (void)easy;
+  (void)socketp;
 
   if(action == CURL_POLL_IN || action == CURL_POLL_INOUT)
     t582_addFd(&sockets->read, s, "read");
@@ -121,7 +121,7 @@ static int t582_curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
 {
   struct curltime *timeout = userp;
 
-  (void)multi; /* unused */
+  (void)multi;
   if(timeout_ms != -1) {
     *timeout = curlx_now();
     timeout->tv_usec += (int)timeout_ms * 1000;
diff --git a/tests/libtest/lib668.c b/tests/libtest/lib668.c
index 219fb8b150..87cf19bbe4 100644
--- a/tests/libtest/lib668.c
+++ b/tests/libtest/lib668.c
@@ -35,7 +35,7 @@ static size_t t668_read_cb(char *ptr, size_t size, size_t nmemb, void *userp)
   struct t668_WriteThis *pooh = (struct t668_WriteThis *)userp;
   size_t len = strlen(pooh->readptr);
 
-  (void)size; /* Always 1.*/
+  (void)size; /* Always 1 */
 
   if(len > nmemb)
     len = nmemb;
diff --git a/tests/libtest/lib758.c b/tests/libtest/lib758.c
index f98309f247..e9fe4ea2c9 100644
--- a/tests/libtest/lib758.c
+++ b/tests/libtest/lib758.c
@@ -184,7 +184,7 @@ static int t758_curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
 {
   struct curltime *timeout = userp;
 
-  (void)multi; /* unused */
+  (void)multi;
   t758_ctx.timer_calls++;
   t758_msg("-> CURLMOPT_TIMERFUNCTION");
   if(t758_ctx.timer_calls == t758_ctx.max_timer_calls) {
@@ -204,7 +204,7 @@ static int t758_curlTimerCallback(CURLM *multi, long timeout_ms, void *userp)
 static int t758_cert_verify_callback(X509_STORE_CTX *ctx, void *arg)
 {
   SSL * ssl;
-  (void)arg; /* unused */
+  (void)arg;
   ssl = (SSL *)X509_STORE_CTX_get_ex_data(ctx,
         SSL_get_ex_data_X509_STORE_CTX_idx());
   t758_ctx.number_of_cert_verify_callbacks++;
@@ -227,7 +227,7 @@ static CURLcode
 t758_set_ssl_ctx_callback(CURL *curl, void *ssl_ctx, void *clientp)
 {
   SSL_CTX *ctx = (SSL_CTX *) ssl_ctx;
-  (void)curl; /* unused */
+  (void)curl;
   SSL_CTX_set_cert_verify_callback(ctx, t758_cert_verify_callback, clientp);
   return CURLE_OK;
 }
diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl
index 23782d74ca..e0a7d157d8 100755
--- a/tests/libtest/mk-lib1521.pl
+++ b/tests/libtest/mk-lib1521.pl
@@ -352,7 +352,7 @@ static CURLcode test_lib1521(const char *URL)
   struct curl_tlssessioninfo *tlssession;
   struct curl_blob blob = { CURL_UNCONST("silly"), 5, 0};
   CURLcode res = CURLE_OK;
-  (void)URL; /* not used */
+  (void)URL;
   global_init(CURL_GLOBAL_ALL);
   easy_init(dep);
   easy_init(curl);
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index b221f38cd0..8aa377fb0c 100644
--- a/tests/libtest/testtrace.c
+++ b/tests/libtest/testtrace.c
@@ -166,7 +166,7 @@ int cli_debug_cb(CURL *handle, curl_infotype type,
   char idsbuf[60];
   curl_off_t xfer_id, conn_id;
 
-  (void)handle; /* not used */
+  (void)handle;
   (void)userp;
 
   if(!curl_easy_getinfo(handle, CURLINFO_XFER_ID, &xfer_id) && xfer_id >= 0) {
diff --git a/tests/unit/unit1603.c b/tests/unit/unit1603.c
index f6e39dc688..d59b458d57 100644
--- a/tests/unit/unit1603.c
+++ b/tests/unit/unit1603.c
@@ -32,16 +32,16 @@ static const size_t slots = 3;
 static void t1603_mydtor(void *p)
 {
   /* Data are statically allocated */
- (void)p; /* unused */
+ (void)p;
 }
 
 static size_t elem_dtor_calls;
 
 static void my_elem_dtor(void *key, size_t key_len, void *p)
 {
-  (void)p; /* unused */
-  (void)key; /* unused */
-  (void)key_len; /* unused */
+  (void)p;
+  (void)key;
+  (void)key_len;
   ++elem_dtor_calls;
 }