clang-tidy: sync argument names in prototype and definition

Discovered with clang-tidy checker
`readability-inconsistent-declaration-parameter-name`.

Also:
- do not enforce the above because of inconsistencies still present
  between public API prototypes and definitions. (Also betwen man page
  protos, and man page examples, and other parts of the code, e.g.
  `easy` vs `curl` vs `d` vs `handle`) Perhaps subject for a future
  effort:
  https://github.com/curl/curl/actions/runs/22166472728/job/64094691653
- enable and fix `readability-named-parameter` where missing.

Refs:
https://clang.llvm.org/extra/clang-tidy/checks/readability/inconsistent-declaration-parameter-name.html
https://clang.llvm.org/extra/clang-tidy/checks/readability/named-parameter.html

Closes #20624

diff --git a/.clang-tidy.yml b/.clang-tidy.yml
index 91a83733eb694a11d980d75a71bead949d0ab5bf..539acdd7c34f3ec7cc0f4ab32dccd272a4173533 100644 (file)
--- a/.clang-tidy.yml
+++ b/.clang-tidy.yml
@@ -14,4 +14,5 @@ Checks: >-
   -clang-diagnostic-nullability-extension,
   bugprone-suspicious-realloc-usage,
   misc-const-correctness,
-  portability-*
+  portability-*,
+  readability-named-parameter

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 64bfec420bd518583f9c696df156affc2ffb5c93..3d3de1270044e2611e4e6fd0ea3aa1ab7fee4bd7 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -329,12 +329,12 @@ CURLcode Curl_altsvc_ctrl(struct Curl_easy *data, const long ctrl)
  * Curl_altsvc_cleanup() frees an altsvc cache instance and all associated
  * resources.
  */
-void Curl_altsvc_cleanup(struct altsvcinfo **altsvcp)
+void Curl_altsvc_cleanup(struct altsvcinfo **asi)
 {
-  if(*altsvcp) {
+  if(*asi) {
     struct Curl_llist_node *e;
     struct Curl_llist_node *n;
-    struct altsvcinfo *altsvc = *altsvcp;
+    struct altsvcinfo *altsvc = *asi;
     for(e = Curl_llist_head(&altsvc->list); e; e = n) {
       struct altsvc *as = Curl_node_elem(e);
       n = Curl_node_next(e);
@@ -342,7 +342,7 @@ void Curl_altsvc_cleanup(struct altsvcinfo **altsvcp)
     }
     curlx_free(altsvc->filename);
     curlx_free(altsvc);
-    *altsvcp = NULL; /* clear the pointer */
+    *asi = NULL; /* clear the pointer */
   }
 }
 
@@ -350,21 +350,21 @@ void Curl_altsvc_cleanup(struct altsvcinfo **altsvcp)
  * Curl_altsvc_save() writes the altsvc cache to a file.
  */
 CURLcode Curl_altsvc_save(struct Curl_easy *data,
-                          struct altsvcinfo *altsvc, const char *file)
+                          struct altsvcinfo *asi, const char *file)
 {
   CURLcode result = CURLE_OK;
   FILE *out;
   char *tempstore = NULL;
 
-  if(!altsvc)
+  if(!asi)
     /* no cache activated */
     return CURLE_OK;
 
   /* if not new name is given, use the one we stored from the load */
-  if(!file && altsvc->filename)
-    file = altsvc->filename;
+  if(!file && asi->filename)
+    file = asi->filename;
 
-  if((altsvc->flags & CURLALTSVC_READONLYFILE) || !file || !file[0])
+  if((asi->flags & CURLALTSVC_READONLYFILE) || !file || !file[0])
     /* marked as read-only, no file or zero length filename */
     return CURLE_OK;
 
@@ -375,7 +375,7 @@ CURLcode Curl_altsvc_save(struct Curl_easy *data,
     fputs("# Your alt-svc cache. https://curl.se/docs/alt-svc.html\n"
           "# This file was generated by libcurl! Edit at your own risk.\n",
           out);
-    for(e = Curl_llist_head(&altsvc->list); e; e = n) {
+    for(e = Curl_llist_head(&asi->list); e; e = n) {
       struct altsvc *as = Curl_node_elem(e);
       n = Curl_node_next(e);
       result = altsvc_out(as, out);

diff --git a/lib/altsvc.h b/lib/altsvc.h
index 85da8cceb91ce31062a51388be33bb31cb595ea6..2931af452bef3a61b90fc7e502bc646048e19675 100644 (file)
--- a/lib/altsvc.h
+++ b/lib/altsvc.h
@@ -55,10 +55,10 @@ CURLcode Curl_altsvc_load(struct altsvcinfo *asi, const char *file);
 CURLcode Curl_altsvc_save(struct Curl_easy *data,
                           struct altsvcinfo *asi, const char *file);
 CURLcode Curl_altsvc_ctrl(struct Curl_easy *data, const long ctrl);
-void Curl_altsvc_cleanup(struct altsvcinfo **altsvc);
+void Curl_altsvc_cleanup(struct altsvcinfo **asi);
 CURLcode Curl_altsvc_parse(struct Curl_easy *data,
-                           struct altsvcinfo *altsvc, const char *value,
-                           enum alpnid srcalpn, const char *srchost,
+                           struct altsvcinfo *asi, const char *value,
+                           enum alpnid srcalpnid, const char *srchost,
                            unsigned short srcport);
 bool Curl_altsvc_lookup(struct altsvcinfo *asi,
                         enum alpnid srcalpnid, const char *srchost,

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 755550f73df3fe40c15b132975cea3d5017ca62f..a9e697ff60b5c7d1ab4cd7495aec395d6f44bd71 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -380,14 +380,14 @@ out:
  * CURLE_OPERATION_TIMEDOUT if a time-out occurred, or other errors.
  */
 CURLcode Curl_async_await(struct Curl_easy *data,
-                          struct Curl_dns_entry **entry)
+                          struct Curl_dns_entry **dns)
 {
   struct async_ares_ctx *ares = &data->state.async.ares;
   CURLcode result = CURLE_OK;
   timediff_t timeout_ms;
 
-  DEBUGASSERT(entry);
-  *entry = NULL; /* clear on entry */
+  DEBUGASSERT(dns);
+  *dns = NULL; /* clear on entry */
 
   timeout_ms = Curl_timeleft_ms(data);
   if(timeout_ms < 0) {
@@ -426,7 +426,7 @@ CURLcode Curl_async_await(struct Curl_easy *data,
     if(Curl_ares_perform(ares->channel, call_timeout_ms) < 0)
       return CURLE_UNRECOVERABLE_POLL;
 
-    result = Curl_async_is_resolved(data, entry);
+    result = Curl_async_is_resolved(data, dns);
     if(result || data->state.async.done)
       break;
 
@@ -449,7 +449,7 @@ CURLcode Curl_async_await(struct Curl_easy *data,
   /* Operation complete, if the lookup was successful we now have the entry
      in the cache. */
   data->state.async.done = TRUE;
-  *entry = data->state.async.dns;
+  *dns = data->state.async.dns;
 
   if(result)
     ares_cancel(ares->channel);

diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
index 0e06db22ca0cab9e291e14a85eb3a005b863ad5e..e616a8cee2cf1a0595eec307436df71b798ac201 100644 (file)
--- a/lib/asyn-thrdd.c
+++ b/lib/asyn-thrdd.c
@@ -101,8 +101,8 @@ void Curl_async_global_cleanup(void)
 #endif
 }
 
-static void async_thrdd_destroy(struct Curl_easy *);
-static void async_thrdd_shutdown(struct Curl_easy *);
+static void async_thrdd_destroy(struct Curl_easy *data);
+static void async_thrdd_shutdown(struct Curl_easy *data);
 
 CURLcode Curl_async_get_impl(struct Curl_easy *data, void **impl)
 {
@@ -552,11 +552,11 @@ void Curl_async_thrdd_destroy(struct Curl_easy *data)
  * This is the version for resolves-in-a-thread.
  */
 CURLcode Curl_async_await(struct Curl_easy *data,
-                          struct Curl_dns_entry **entry)
+                          struct Curl_dns_entry **dns)
 {
   struct async_thrdd_ctx *thrdd = &data->state.async.thrdd;
   if(thrdd->addr)
-    return asyn_thrdd_await(data, thrdd->addr, entry);
+    return asyn_thrdd_await(data, thrdd->addr, dns);
   return CURLE_FAILED_INIT;
 }
 

diff --git a/lib/asyn.h b/lib/asyn.h
index 12d3e1c33883c850d535b97807806c8901760b68..68628f90c007f0a27b26c1f8d2ee4588d91c761b 100644 (file)
--- a/lib/asyn.h
+++ b/lib/asyn.h
@@ -70,7 +70,7 @@ void Curl_async_global_cleanup(void);
  * Get the resolver implementation instance (c-ares channel) or NULL
  * for passing to application callback.
  */
-CURLcode Curl_async_get_impl(struct Curl_easy *easy, void **impl);
+CURLcode Curl_async_get_impl(struct Curl_easy *data, void **impl);
 
 /* Curl_async_pollset()
  *
@@ -106,7 +106,7 @@ CURLcode Curl_async_is_resolved(struct Curl_easy *data,
  * CURLE_OPERATION_TIMEDOUT if a time-out occurred, or other errors.
  */
 CURLcode Curl_async_await(struct Curl_easy *data,
-                          struct Curl_dns_entry **dnsentry);
+                          struct Curl_dns_entry **dns);
 
 /*
  * Curl_async_getaddrinfo() - when using this resolver

diff --git a/lib/cf-h1-proxy.h b/lib/cf-h1-proxy.h
index e48d827825d3ebeeac1bd65fd9eb305b2e845106..6544ec58d026839cdbe1117bea42e77ed0a10c3f 100644 (file)
--- a/lib/cf-h1-proxy.h
+++ b/lib/cf-h1-proxy.h
@@ -27,7 +27,7 @@
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-CURLcode Curl_cf_h1_proxy_insert_after(struct Curl_cfilter *cf,
+CURLcode Curl_cf_h1_proxy_insert_after(struct Curl_cfilter *cf_at,
                                        struct Curl_easy *data);
 
 extern struct Curl_cftype Curl_cft_h1_proxy;

diff --git a/lib/cfilters.c b/lib/cfilters.c
index db8efcf2fe867dea43f16d24d30fd3c2c9f1b649..4905418fa361b2e53a923b0af64c535d3867e193 100644 (file)
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -136,22 +136,22 @@ void Curl_conn_cf_discard_chain(struct Curl_cfilter **pcf,
 }
 
 void Curl_conn_cf_discard_all(struct Curl_easy *data,
-                              struct connectdata *conn, int index)
+                              struct connectdata *conn, int sockindex)
 {
-  Curl_conn_cf_discard_chain(&conn->cfilter[index], data);
+  Curl_conn_cf_discard_chain(&conn->cfilter[sockindex], data);
 }
 
-void Curl_conn_close(struct Curl_easy *data, int index)
+void Curl_conn_close(struct Curl_easy *data, int sockindex)
 {
   struct Curl_cfilter *cf;
 
   DEBUGASSERT(data->conn);
   /* it is valid to call that without filters being present */
-  cf = data->conn->cfilter[index];
+  cf = data->conn->cfilter[sockindex];
   if(cf) {
     cf->cft->do_close(cf, data);
   }
-  Curl_shutdown_clear(data, index);
+  Curl_shutdown_clear(data, sockindex);
 }
 
 CURLcode Curl_conn_shutdown(struct Curl_easy *data, int sockindex, bool *done)
@@ -209,14 +209,14 @@ CURLcode Curl_conn_shutdown(struct Curl_easy *data, int sockindex, bool *done)
   return result;
 }
 
-CURLcode Curl_cf_recv(struct Curl_easy *data, int num, char *buf,
+CURLcode Curl_cf_recv(struct Curl_easy *data, int sockindex, char *buf,
                       size_t len, size_t *pnread)
 {
   struct Curl_cfilter *cf;
 
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
-  cf = data->conn->cfilter[num];
+  cf = data->conn->cfilter[sockindex];
   while(cf && !cf->connected)
     cf = cf->next;
   if(cf)
@@ -227,19 +227,19 @@ CURLcode Curl_cf_recv(struct Curl_easy *data, int num, char *buf,
   return CURLE_FAILED_INIT;
 }
 
-CURLcode Curl_cf_send(struct Curl_easy *data, int num,
-                      const uint8_t *mem, size_t len, bool eos,
+CURLcode Curl_cf_send(struct Curl_easy *data, int sockindex,
+                      const uint8_t *buf, size_t len, bool eos,
                       size_t *pnwritten)
 {
   struct Curl_cfilter *cf;
 
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
-  cf = data->conn->cfilter[num];
+  cf = data->conn->cfilter[sockindex];
   while(cf && !cf->connected)
     cf = cf->next;
   if(cf) {
-    return cf->cft->do_send(cf, data, mem, len, eos, pnwritten);
+    return cf->cft->do_send(cf, data, buf, len, eos, pnwritten);
   }
   failf(data, "send: no filter connected");
   DEBUGASSERT(0);
@@ -328,17 +328,17 @@ out:
 
 void Curl_conn_cf_add(struct Curl_easy *data,
                       struct connectdata *conn,
-                      int index,
+                      int sockindex,
                       struct Curl_cfilter *cf)
 {
   DEBUGASSERT(conn);
   DEBUGASSERT(!cf->conn);
   DEBUGASSERT(!cf->next);
 
-  cf->next = conn->cfilter[index];
+  cf->next = conn->cfilter[sockindex];
   cf->conn = conn;
-  cf->sockindex = index;
-  conn->cfilter[index] = cf;
+  cf->sockindex = sockindex;
+  conn->cfilter[sockindex] = cf;
   CURL_TRC_CF(data, cf, "added");
 }
 
@@ -1060,23 +1060,23 @@ int Curl_conn_sockindex(struct Curl_easy *data, curl_socket_t sockfd)
 }
 
 CURLcode Curl_conn_recv(struct Curl_easy *data, int sockindex,
-                        char *buf, size_t blen, size_t *pnread)
+                        char *buf, size_t len, size_t *pnread)
 {
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
   if(!CONN_SOCK_IDX_VALID(sockindex))
     return CURLE_BAD_FUNCTION_ARGUMENT;
   if(data && data->conn && data->conn->recv[sockindex])
-    return data->conn->recv[sockindex](data, sockindex, buf, blen, pnread);
+    return data->conn->recv[sockindex](data, sockindex, buf, len, pnread);
   *pnread = 0;
   return CURLE_FAILED_INIT;
 }
 
 CURLcode Curl_conn_send(struct Curl_easy *data, int sockindex,
-                        const void *buf, size_t blen, bool eos,
+                        const void *buf, size_t len, bool eos,
                         size_t *pnwritten)
 {
-  size_t write_len = blen;
+  size_t write_len = len;
 
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
@@ -1094,7 +1094,7 @@ CURLcode Curl_conn_send(struct Curl_easy *data, int sockindex,
     }
   }
 #endif
-  if(write_len != blen)
+  if(write_len != len)
     eos = FALSE;
   if(data && data->conn && data->conn->send[sockindex])
     return data->conn->send[sockindex](data, sockindex, buf, write_len, eos,

diff --git a/lib/cfilters.h b/lib/cfilters.h
index 9faf01de755d092998b002b5732ef86104f66ba5..cb52f3265fce2ba6b23d1f6af0fcf10b980923f9 100644 (file)
--- a/lib/cfilters.h
+++ b/lib/cfilters.h
@@ -312,8 +312,7 @@ void Curl_conn_cf_discard_chain(struct Curl_cfilter **pcf,
  * Remove and destroy all filters at chain `sockindex` on connection `conn`.
  */
 void Curl_conn_cf_discard_all(struct Curl_easy *data,
-                              struct connectdata *conn,
-                              int sockindex);
+                              struct connectdata *conn, int sockindex);
 
 CURLcode Curl_conn_cf_connect(struct Curl_cfilter *cf,
                               struct Curl_easy *data,
@@ -608,15 +607,14 @@ int Curl_conn_sockindex(struct Curl_easy *data, curl_socket_t sockfd);
  * Will return CURLE_AGAIN iff blocked on receiving.
  */
 CURLcode Curl_conn_recv(struct Curl_easy *data, int sockindex,
-                        char *buf, size_t buffersize,
-                        size_t *pnread);
+                        char *buf, size_t len, size_t *pnread);
 
 /*
  * Send data on the connection, using FIRSTSOCKET/SECONDARYSOCKET.
  * Will return CURLE_AGAIN iff blocked on sending.
  */
 CURLcode Curl_conn_send(struct Curl_easy *data, int sockindex,
-                        const void *buf, size_t blen, bool eos,
+                        const void *buf, size_t len, bool eos,
                         size_t *pnwritten);
 
 /**

diff --git a/lib/conncache.h b/lib/conncache.h
index 9b392af05ccd2d6f794ca2db680bbd9bfc7475fb..d8626ae6928c49a828b18e660546491356083190 100644 (file)
--- a/lib/conncache.h
+++ b/lib/conncache.h
@@ -68,7 +68,7 @@ void Curl_cpool_init(struct cpool *cpool,
                      size_t size);
 
 /* Destroy all connections and free all members */
-void Curl_cpool_destroy(struct cpool *connc);
+void Curl_cpool_destroy(struct cpool *cpool);
 
 /* Init the transfer to be used within its connection pool.
  * Assigns `data->id`. */

diff --git a/lib/connect.h b/lib/connect.h
index f2b9911073b94df6c1a4770977e45fbd9bd228e8..071b4329c1154c5ce0d97125e23479ca0cec9225 100644 (file)
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -32,7 +32,7 @@ struct ip_quadruple;
 struct Curl_str;
 
 enum alpnid Curl_alpn2alpnid(const unsigned char *name, size_t len);
-enum alpnid Curl_str2alpnid(const struct Curl_str *str);
+enum alpnid Curl_str2alpnid(const struct Curl_str *cstr);
 
 /* generic function that returns how much time there is left to run, according
    to the timeouts set */
@@ -76,7 +76,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
                       char *addr, uint16_t *port);
 
 /*
- * Curl_conncontrol() marks the end of a connection/stream. The 'closeit'
+ * Curl_conncontrol() marks the end of a connection/stream. The 'ctrl'
  * argument specifies if it is the end of a connection or a stream.
  *
  * For stream-based protocols (such as HTTP/2), a stream close will not cause
@@ -92,7 +92,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
 #define CONNCTRL_STREAM 2
 
 void Curl_conncontrol(struct connectdata *conn,
-                      int closeit
+                      int ctrl
 #if defined(DEBUGBUILD) && defined(CURLVERBOSE)
                       , const char *reason
 #endif

diff --git a/lib/cookie.h b/lib/cookie.h
index cbc7b748fc2bdd54a8ca181de38a588092d627b6..fabd04d3989bb9fdb078ef57321f884ca7c699b4 100644 (file)
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -111,15 +111,18 @@ struct connectdata;
 
 bool Curl_secure_context(struct connectdata *conn, const char *host);
 CURLcode Curl_cookie_add(struct Curl_easy *data,
-                         struct CookieInfo *c, bool header,
-                         bool noexpiry, const char *lineptr,
-                         const char *domain, const char *path,
+                         struct CookieInfo *ci,
+                         bool httpheader,
+                         bool noexpire,
+                         const char *lineptr,
+                         const char *domain,
+                         const char *path,
                          bool secure) WARN_UNUSED_RESULT;
 CURLcode Curl_cookie_getlist(struct Curl_easy *data, struct connectdata *conn,
                              bool *okay, const char *host,
                              struct Curl_llist *list) WARN_UNUSED_RESULT;
-void Curl_cookie_clearall(struct CookieInfo *cookies);
-void Curl_cookie_clearsess(struct CookieInfo *cookies);
+void Curl_cookie_clearall(struct CookieInfo *ci);
+void Curl_cookie_clearsess(struct CookieInfo *ci);
 
 #if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES)
 #define Curl_cookie_list(x) NULL
@@ -130,7 +133,7 @@ void Curl_cookie_clearsess(struct CookieInfo *cookies);
 #define Curl_flush_cookies(x, y) Curl_nop_stmt
 #else
 void Curl_flush_cookies(struct Curl_easy *data, bool cleanup);
-void Curl_cookie_cleanup(struct CookieInfo *c);
+void Curl_cookie_cleanup(struct CookieInfo *ci);
 struct CookieInfo *Curl_cookie_init(void);
 struct curl_slist *Curl_cookie_list(struct Curl_easy *data);
 CURLcode Curl_cookie_loadfiles(struct Curl_easy *data) WARN_UNUSED_RESULT;

diff --git a/lib/cshutdn.h b/lib/cshutdn.h
index 79c95cca5917d8d3a8d56707707aa34c955cd696..9030474032b49953229cb633aae68341978c5570 100644 (file)
--- a/lib/cshutdn.h
+++ b/lib/cshutdn.h
@@ -41,12 +41,12 @@ void Curl_cshutdn_run_once(struct Curl_easy *data,
                            bool *done);
 
 /* Terminates the connection, e.g. closes and destroys it.
- * If `run_shutdown` is TRUE, the shutdown will be run once before
+ * If `do_shutdown` is TRUE, the shutdown will be run once before
  * terminating it.
  * Takes ownership of `conn`. */
 void Curl_cshutdn_terminate(struct Curl_easy *data,
                             struct connectdata *conn,
-                            bool run_shutdown);
+                            bool do_shutdown);
 
 /* A `cshutdown` is always owned by a multi handle to maintain
  * the connections to be shut down. It registers timers and

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 1b8dd7a225a900ac5d1f81a0e80b705db0b69c75..63540c168d90167197fe6895355de2106ba585e5 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -404,19 +404,19 @@ static CURLcode ip2addr(struct Curl_addrinfo **addrp, int af,
  * Given an IPv4 or IPv6 dotted string address, this converts it to a proper
  * allocated Curl_addrinfo struct and returns it.
  */
-CURLcode Curl_str2addr(const char *address, int port,
+CURLcode Curl_str2addr(const char *dotted, int port,
                        struct Curl_addrinfo **addrp)
 {
   struct in_addr in;
-  if(curlx_inet_pton(AF_INET, address, &in) > 0)
+  if(curlx_inet_pton(AF_INET, dotted, &in) > 0)
     /* This is a dotted IP address 123.123.123.123-style */
-    return ip2addr(addrp, AF_INET, &in, address, port);
+    return ip2addr(addrp, AF_INET, &in, dotted, port);
 #ifdef USE_IPV6
   {
     struct in6_addr in6;
-    if(curlx_inet_pton(AF_INET6, address, &in6) > 0)
+    if(curlx_inet_pton(AF_INET6, dotted, &in6) > 0)
       /* This is a dotted IPv6 address ::1-style */
-      return ip2addr(addrp, AF_INET6, &in6, address, port);
+      return ip2addr(addrp, AF_INET6, &in6, dotted, port);
   }
 #endif
   return CURLE_BAD_FUNCTION_ARGUMENT; /* bad input format */

diff --git a/lib/curl_hmac.h b/lib/curl_hmac.h
index 4759ff6ec6626e91f728ade60137ba5e573ff9e4..b9f218fac930074434dd50816ddbf4a2f2c29e1d 100644 (file)
--- a/lib/curl_hmac.h
+++ b/lib/curl_hmac.h
@@ -57,10 +57,10 @@ struct HMAC_context {
 struct HMAC_context *Curl_HMAC_init(const struct HMAC_params *hashparams,
                                     const unsigned char *key,
                                     unsigned int keylen);
-int Curl_HMAC_update(struct HMAC_context *context,
+int Curl_HMAC_update(struct HMAC_context *ctxt,
                      const unsigned char *data,
                      unsigned int len);
-int Curl_HMAC_final(struct HMAC_context *context, unsigned char *result);
+int Curl_HMAC_final(struct HMAC_context *ctxt, unsigned char *output);
 
 CURLcode Curl_hmacit(const struct HMAC_params *hashparams,
                      const unsigned char *key, const size_t keylen,

diff --git a/lib/curl_md5.h b/lib/curl_md5.h
index 16272c759105bbdd91edef6100c8f9d0a3a4a599..042c5f59ae5ecbb33a26f980be5da064629b370d 100644 (file)
--- a/lib/curl_md5.h
+++ b/lib/curl_md5.h
@@ -58,7 +58,7 @@ CURLcode Curl_md5it(unsigned char *output, const unsigned char *input,
 
 struct MD5_context *Curl_MD5_init(const struct MD5_params *md5params);
 CURLcode Curl_MD5_update(struct MD5_context *context,
-                         const unsigned char *data,
+                         const unsigned char *input,
                          unsigned int len);
 CURLcode Curl_MD5_final(struct MD5_context *context, unsigned char *result);
 

diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h
index 0aaa4126f4e3f07fa78d9883b0fada4a3ba07efc..bc1512e6e8c20dd91e53c29704564ac7fb802091 100644 (file)
--- a/lib/curl_sha256.h
+++ b/lib/curl_sha256.h
@@ -37,7 +37,7 @@ extern const struct HMAC_params Curl_HMAC_SHA256;
 #define CURL_SHA256_DIGEST_LENGTH 32 /* fixed size */
 #endif
 
-CURLcode Curl_sha256it(unsigned char *outbuffer, const unsigned char *input,
+CURLcode Curl_sha256it(unsigned char *output, const unsigned char *input,
                        const size_t len);
 
 #endif

diff --git a/lib/curlx/strdup.h b/lib/curlx/strdup.h
index 1e6bc1981429b9e4055bccd0448e9256a4dd1b41..3e17fdee6361fcbcc671bf12af5588ba7b410e8d 100644 (file)
--- a/lib/curlx/strdup.h
+++ b/lib/curlx/strdup.h
@@ -28,6 +28,6 @@
 #ifdef _WIN32
 wchar_t *curlx_wcsdup(const wchar_t *src);  /* for curlx_tcsdup() */
 #endif
-void *curlx_memdup(const void *src, size_t buffer_length);
+void *curlx_memdup(const void *src, size_t length);
 void *curlx_memdup0(const char *src, size_t length);
 #endif /* HEADER_CURLX_STRDUP_H */

diff --git a/lib/curlx/strparse.h b/lib/curlx/strparse.h
index ae8fd19d955e2b53d01b8b81458a849f7e467313..eb3d49159571a848cec3a1781626351e110de71f 100644 (file)
--- a/lib/curlx/strparse.h
+++ b/lib/curlx/strparse.h
@@ -98,7 +98,8 @@ int curlx_str_cmp(struct Curl_str *str, const char *check);
 
 int curlx_str_nudge(struct Curl_str *str, size_t num);
 
-int curlx_str_cspn(const char **linep, struct Curl_str *out, const char *cspn);
+int curlx_str_cspn(const char **linep, struct Curl_str *out,
+                   const char *reject);
 void curlx_str_trimblanks(struct Curl_str *out);
 void curlx_str_passblanks(const char **linep);
 

diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h
index 8a62ccf6a70b0416582f9b6e893270e7e5a6db7d..3d0341e418a51614a644704a617f934681d0518e 100644 (file)
--- a/lib/curlx/warnless.h
+++ b/lib/curlx/warnless.h
@@ -69,6 +69,6 @@ bool curlx_sotouz_fits(curl_off_t sonum, size_t *puznum);
 
 /* Convert a long to size_t, return FALSE if negative or too large
  * and set 0 */
-bool curlx_sltouz(long sznum, size_t *puznum);
+bool curlx_sltouz(long slnum, size_t *puznum);
 
 #endif /* HEADER_CURL_WARNLESS_H */

diff --git a/lib/doh.h b/lib/doh.h
index 0dc6a3f2a490024225e76806399b8d715a094d28..0deafc7fde203338c946642ad5015b6418afe6cf 100644 (file)
--- a/lib/doh.h
+++ b/lib/doh.h
@@ -114,7 +114,7 @@ CURLcode Curl_doh(struct Curl_easy *data, const char *hostname,
                   int port, int ip_version);
 
 CURLcode Curl_doh_is_resolved(struct Curl_easy *data,
-                              struct Curl_dns_entry **dns);
+                              struct Curl_dns_entry **dnsp);
 
 #define DOH_MAX_ADDR  24
 #define DOH_MAX_CNAME 4

diff --git a/lib/ftp.c b/lib/ftp.c
index 310e03ec874b5afcc8464c8eaeb83aeba74b2da6..cbfe8256287111398ff60fdbbae773de49abe1b9 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -168,8 +168,8 @@ static CURLcode ftp_nb_type(struct Curl_easy *data,
                             struct ftp_conn *ftpc,
                             struct FTP *ftp,
                             bool ascii, ftpstate newstate);
-static CURLcode getftpresponse(struct Curl_easy *data, size_t *nread,
-                               int *ftpcode);
+static CURLcode getftpresponse(struct Curl_easy *data, size_t *nreadp,
+                               int *ftpcodep);
 
 static void freedirs(struct ftp_conn *ftpc)
 {
@@ -629,7 +629,7 @@ static CURLcode ftp_readresp(struct Curl_easy *data,
  */
 static CURLcode getftpresponse(struct Curl_easy *data,
                                size_t *nreadp, /* return number of bytes
-                                                   read */
+                                                  read */
                                int *ftpcodep) /* return the ftp-code */
 {
   /*

diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h
index afb90dee4cada77f126f9a85461f8ffd814981a2..5d7aa492ba4eda791a2bc74a342ba088f0a28d59 100644 (file)
--- a/lib/ftplistparser.h
+++ b/lib/ftplistparser.h
@@ -37,7 +37,7 @@ CURLcode Curl_ftp_parselist_geterror(struct ftp_parselist_data *pl_data);
 
 struct ftp_parselist_data *Curl_ftp_parselist_data_alloc(void);
 
-void Curl_ftp_parselist_data_free(struct ftp_parselist_data **pl_data);
+void Curl_ftp_parselist_data_free(struct ftp_parselist_data **parserp);
 
 /* list of wildcard process states */
 typedef enum {

diff --git a/lib/hmac.c b/lib/hmac.c
index 9080588341da6efd0262f244873d5b993c9b273f..10d7c1d03b5c1c256e3c45720fca6dbb3299eceb 100644 (file)
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -99,11 +99,11 @@ fail:
 }
 
 int Curl_HMAC_update(struct HMAC_context *ctxt,
-                     const unsigned char *ptr,
+                     const unsigned char *data,
                      unsigned int len)
 {
   /* Update first hash calculation. */
-  ctxt->hash->hupdate(ctxt->hashctxt1, ptr, len);
+  ctxt->hash->hupdate(ctxt->hashctxt1, data, len);
   return 0;
 }
 
@@ -143,7 +143,7 @@ int Curl_HMAC_final(struct HMAC_context *ctxt, unsigned char *output)
  */
 CURLcode Curl_hmacit(const struct HMAC_params *hashparams,
                      const unsigned char *key, const size_t keylen,
-                     const unsigned char *buf, const size_t buflen,
+                     const unsigned char *data, const size_t datalen,
                      unsigned char *output)
 {
   struct HMAC_context *ctxt =
@@ -153,7 +153,7 @@ CURLcode Curl_hmacit(const struct HMAC_params *hashparams,
     return CURLE_OUT_OF_MEMORY;
 
   /* Update the digest with the given challenge */
-  Curl_HMAC_update(ctxt, buf, curlx_uztoui(buflen));
+  Curl_HMAC_update(ctxt, data, curlx_uztoui(datalen));
 
   /* Finalise the digest */
   Curl_HMAC_final(ctxt, output);

diff --git a/lib/hostip.c b/lib/hostip.c
index cfa7995dbac607c486a1a678abeb0dafd7858bfc..597c77173c45c22fa7cd221b02bd52f3a6a1ab29 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -1015,20 +1015,20 @@ CURLcode Curl_resolv_blocking(struct Curl_easy *data,
                               const char *hostname,
                               int port,
                               int ip_version,
-                              struct Curl_dns_entry **dnsentry)
+                              struct Curl_dns_entry **entry)
 {
   CURLcode result;
   DEBUGASSERT(hostname && *hostname);
-  *dnsentry = NULL;
-  result = Curl_resolv(data, hostname, port, ip_version, FALSE, dnsentry);
+  *entry = NULL;
+  result = Curl_resolv(data, hostname, port, ip_version, FALSE, entry);
   switch(result) {
   case CURLE_OK:
-    DEBUGASSERT(*dnsentry);
+    DEBUGASSERT(*entry);
     return CURLE_OK;
   case CURLE_AGAIN:
-    DEBUGASSERT(!*dnsentry);
-    result = Curl_async_await(data, dnsentry);
-    if(result || !*dnsentry) {
+    DEBUGASSERT(!*entry);
+    result = Curl_async_await(data, entry);
+    if(result || !*entry) {
       /* close the connection, since we cannot return failure here without
          cleaning up this connection properly. */
       connclose(data->conn, "async resolve failed");

diff --git a/lib/hostip.h b/lib/hostip.h
index e70eac841bf2f1181598e9e3fbeaf6602338a086..6c7f1291b261c01dde04ab5ae190ab83df38e404 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -86,18 +86,18 @@ CURLcode Curl_resolv(struct Curl_easy *data,
                      int port,
                      int ip_version,
                      bool allowDOH,
-                     struct Curl_dns_entry **dnsentry);
+                     struct Curl_dns_entry **entry);
 
 CURLcode Curl_resolv_blocking(struct Curl_easy *data,
                               const char *hostname,
                               int port,
                               int ip_version,
-                              struct Curl_dns_entry **dnsentry);
+                              struct Curl_dns_entry **entry);
 
 CURLcode Curl_resolv_timeout(struct Curl_easy *data,
                              const char *hostname, int port,
                              int ip_version,
-                             struct Curl_dns_entry **dnsentry,
+                             struct Curl_dns_entry **entry,
                              timediff_t timeoutms);
 
 #ifdef USE_IPV6
@@ -118,7 +118,7 @@ void Curl_resolv_unlink(struct Curl_easy *data,
                         struct Curl_dns_entry **pdns);
 
 /* init a new dns cache */
-void Curl_dnscache_init(struct Curl_dnscache *dns, size_t hashsize);
+void Curl_dnscache_init(struct Curl_dnscache *dns, size_t size);
 
 void Curl_dnscache_destroy(struct Curl_dnscache *dns);
 
@@ -133,14 +133,14 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, int port);
 
 CURLcode Curl_once_resolved(struct Curl_easy *data,
                             struct Curl_dns_entry *dns,
-                            bool *protocol_connect);
+                            bool *protocol_done);
 
 /*
  * Curl_printable_address() returns a printable version of the 1st address
  * given in the 'ip' argument. The result will be stored in the buf that is
  * bufsize bytes big.
  */
-void Curl_printable_address(const struct Curl_addrinfo *ip,
+void Curl_printable_address(const struct Curl_addrinfo *ai,
                             char *buf, size_t bufsize);
 
 /*

diff --git a/lib/hsts.h b/lib/hsts.h
index e2c9922f18ef955b590a6c07f9cca35247936ef2..e0f6363bb355072fdc5a92289c48ce806bf60829 100644 (file)
--- a/lib/hsts.h
+++ b/lib/hsts.h
@@ -49,7 +49,7 @@ struct hsts {
 struct hsts *Curl_hsts_init(void);
 void Curl_hsts_cleanup(struct hsts **hp);
 CURLcode Curl_hsts_parse(struct hsts *h, const char *hostname,
-                         const char *sts);
+                         const char *header);
 struct stsentry *Curl_hsts(struct hsts *h, const char *hostname,
                            size_t hlen, bool subdomain);
 CURLcode Curl_hsts_save(struct Curl_easy *data, struct hsts *h,

diff --git a/lib/http2.c b/lib/http2.c
index b0717f9ff6df51ea4573d6c8a608e0cee7d35304..1381041c5660bf2a97e9e0dfba7e25eb21a2cafc 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -670,7 +670,7 @@ char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num)
 /*
  * push header access function. Only to be used from within the push callback
  */
-char *curl_pushheader_byname(struct curl_pushheaders *h, const char *header)
+char *curl_pushheader_byname(struct curl_pushheaders *h, const char *name)
 {
   struct h2_stream_ctx *stream;
   size_t len;
@@ -681,17 +681,17 @@ char *curl_pushheader_byname(struct curl_pushheaders *h, const char *header)
      the header, but header == ":" must be rejected. If we have ':' in
      the middle of header, it could be matched in middle of the value,
      this is because we do prefix match.*/
-  if(!h || !GOOD_EASY_HANDLE(h->data) || !header || !header[0] ||
-     !strcmp(header, ":") || strchr(header + 1, ':'))
+  if(!h || !GOOD_EASY_HANDLE(h->data) || !name || !name[0] ||
+     !strcmp(name, ":") || strchr(name + 1, ':'))
     return NULL;
 
   stream = h->stream;
   if(!stream)
     return NULL;
 
-  len = strlen(header);
+  len = strlen(name);
   for(i = 0; i < stream->push_headers_used; i++) {
-    if(!strncmp(header, stream->push_headers[i], len)) {
+    if(!strncmp(name, stream->push_headers[i], len)) {
       /* sub-match, make sure that it is followed by a colon */
       if(stream->push_headers[i][len] != ':')
         continue;
@@ -3001,10 +3001,10 @@ char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num)
   return NULL;
 }
 
-char *curl_pushheader_byname(struct curl_pushheaders *h, const char *header)
+char *curl_pushheader_byname(struct curl_pushheaders *h, const char *name)
 {
   (void)h;
-  (void)header;
+  (void)name;
   return NULL;
 }
 

diff --git a/lib/http2.h b/lib/http2.h
index 5e545b234900946021d14c443a6259326af621f6..a14c8485cc884baddaaecf3a9d22bef7c2091d1c 100644 (file)
--- a/lib/http2.h
+++ b/lib/http2.h
@@ -55,7 +55,7 @@ CURLcode Curl_http2_switch_at(struct Curl_cfilter *cf, struct Curl_easy *data);
 
 CURLcode Curl_http2_upgrade(struct Curl_easy *data,
                             struct connectdata *conn, int sockindex,
-                            const char *ptr, size_t nread);
+                            const char *mem, size_t nread);
 
 void *Curl_nghttp2_malloc(size_t size, void *user_data);
 void Curl_nghttp2_free(void *ptr, void *user_data);

diff --git a/lib/idn.h b/lib/idn.h
index 42613af5096c058f000c2a8809e88d0f6c6844a2..90d8e811b1a6128e0bafec2b6006ca0cbcfe46be 100644 (file)
--- a/lib/idn.h
+++ b/lib/idn.h
@@ -30,7 +30,7 @@ CURLcode Curl_idnconvert_hostname(struct hostname *host);
 #define USE_IDN
 void Curl_free_idnconverted_hostname(struct hostname *host);
 CURLcode Curl_idn_decode(const char *input, char **output);
-CURLcode Curl_idn_encode(const char *input, char **output);
+CURLcode Curl_idn_encode(const char *puny, char **output);
 #else
 #define Curl_free_idnconverted_hostname(x)
 #define Curl_idn_decode(x) NULL

diff --git a/lib/llist.h b/lib/llist.h
index 1d73db1719da962379938387032ac1b38f0d1052..31c5b45ed31bb1514647d22cdfc7238e88091092 100644 (file)
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -52,9 +52,9 @@ struct Curl_llist_node {
 
 void Curl_llist_init(struct Curl_llist *, Curl_llist_dtor);
 void Curl_llist_insert_next(struct Curl_llist *, struct Curl_llist_node *,
-                            const void *, struct Curl_llist_node *node);
+                            const void *, struct Curl_llist_node *ne);
 void Curl_llist_append(struct Curl_llist *, const void *,
-                       struct Curl_llist_node *node);
+                       struct Curl_llist_node *ne);
 void Curl_node_remove(struct Curl_llist_node *);
 void Curl_llist_destroy(struct Curl_llist *, void *);
 
@@ -74,7 +74,7 @@ void *Curl_node_elem(struct Curl_llist_node *n);
 
 /* Remove the node from the list and return the custom data
  * from a Curl_llist_node. Will NOT invoke a registered `dtor`. */
-void *Curl_node_take_elem(struct Curl_llist_node *);
+void *Curl_node_take_elem(struct Curl_llist_node *e);
 
 /* Curl_node_next() returns the next element in a list from a given
    Curl_llist_node */

diff --git a/lib/mime.c b/lib/mime.c
index 7f350ae7e0475d2f196cea6d54f01d08586fa8cc..fdac2e0f41ca99893b621afa2e374613e452b3f5 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -1270,18 +1270,18 @@ CURLcode curl_mime_filename(curl_mimepart *part, const char *filename)
 }
 
 /* Set mime part content from memory data. */
-CURLcode curl_mime_data(curl_mimepart *part, const char *ptr, size_t datasize)
+CURLcode curl_mime_data(curl_mimepart *part, const char *data, size_t datasize)
 {
   if(!part)
     return CURLE_BAD_FUNCTION_ARGUMENT;
 
   cleanup_part_content(part);
 
-  if(ptr) {
+  if(data) {
     if(datasize == CURL_ZERO_TERMINATED)
-      datasize = strlen(ptr);
+      datasize = strlen(data);
 
-    part->data = curlx_memdup0(ptr, datasize);
+    part->data = curlx_memdup0(data, datasize);
     if(!part->data)
       return CURLE_OUT_OF_MEMORY;
 

diff --git a/lib/multi.c b/lib/multi.c
index 66456fe9283eb8c9aa24152c79f7dd370212530a..6b1e9d62d199286c3b225e2d2e497d42f31284ab 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -3607,11 +3607,11 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
  * Removes the expire timer. Marks it as done.
  *
  */
-void Curl_expire_done(struct Curl_easy *data, expire_id eid)
+void Curl_expire_done(struct Curl_easy *data, expire_id id)
 {
   /* remove the timer, if there */
-  multi_deltimeout(data, eid);
-  CURL_TRC_TIMER(data, eid, "cleared");
+  multi_deltimeout(data, id);
+  CURL_TRC_TIMER(data, id, "cleared");
 }
 
 /*

diff --git a/lib/multiif.h b/lib/multiif.h
index 0252b2dfd978b5626cc3f8e1e196440ab735c6f6..f6cb3294e58ccaf5a8ea2bf85202872f39e6a799 100644 (file)
--- a/lib/multiif.h
+++ b/lib/multiif.h
@@ -47,7 +47,7 @@ void Curl_multi_connchanged(struct Curl_multi *multi);
 /* Internal version of curl_multi_init() accepts size parameters for the
    socket, connection and dns hashes */
 struct Curl_multi *Curl_multi_handle(uint32_t xfer_table_size,
-                                     size_t hashsize,
+                                     size_t ev_hashsize,
                                      size_t chashsize,
                                      size_t dnssize,
                                      size_t sesssize);

diff --git a/lib/netrc.c b/lib/netrc.c
index baabe917a75ab4a1c33f053fdcc90ae604d99f7f..031660c531810529f146951304a5c482121a35c3 100644 (file)
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -464,14 +464,14 @@ NETRCcode Curl_parsenetrc(struct store_netrc *store, const char *host,
   return retcode;
 }
 
-void Curl_netrc_init(struct store_netrc *s)
+void Curl_netrc_init(struct store_netrc *store)
 {
-  curlx_dyn_init(&s->filebuf, MAX_NETRC_FILE);
-  s->loaded = FALSE;
+  curlx_dyn_init(&store->filebuf, MAX_NETRC_FILE);
+  store->loaded = FALSE;
 }
-void Curl_netrc_cleanup(struct store_netrc *s)
+void Curl_netrc_cleanup(struct store_netrc *store)
 {
-  curlx_dyn_free(&s->filebuf);
-  s->loaded = FALSE;
+  curlx_dyn_free(&store->filebuf);
+  store->loaded = FALSE;
 }
 #endif

diff --git a/lib/netrc.h b/lib/netrc.h
index 99ddc6253e08da0840eeadec71d9879d43b4acec..061e1e438b9c956e8e794347492286b9783a60f0 100644 (file)
--- a/lib/netrc.h
+++ b/lib/netrc.h
@@ -45,12 +45,12 @@ typedef enum {
 } NETRCcode;
 
 const char *Curl_netrc_strerror(NETRCcode ret);
-void Curl_netrc_init(struct store_netrc *s);
-void Curl_netrc_cleanup(struct store_netrc *s);
+void Curl_netrc_init(struct store_netrc *store);
+void Curl_netrc_cleanup(struct store_netrc *store);
 
-NETRCcode Curl_parsenetrc(struct store_netrc *s, const char *host,
+NETRCcode Curl_parsenetrc(struct store_netrc *store, const char *host,
                           char **loginp, char **passwordp,
-                          const char *filename);
+                          const char *netrcfile);
 /* Assume: (*passwordp)[0]=0, host[0] != 0.
  * If (*loginp)[0] = 0, search for login and password within a machine
  * section in the netrc.

diff --git a/lib/parsedate.c b/lib/parsedate.c
index 29b0932d7c04b1699e3c5e092533a7ede03948f6..744efc4ed3983a98e6c70484cfd87e703d45db91 100644 (file)
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -558,11 +558,11 @@ static int parsedate(const char *date, time_t *output)
 }
 #endif
 
-time_t curl_getdate(const char *p, const time_t *now)
+time_t curl_getdate(const char *p, const time_t *unused)
 {
   time_t parsed = -1;
   int rc = parsedate(p, &parsed);
-  (void)now; /* legacy argument from the past that we ignore */
+  (void)unused; /* legacy argument from the past that we ignore */
 
   if(rc == PARSEDATE_OK) {
     if(parsed == (time_t)-1)

diff --git a/lib/parsedate.h b/lib/parsedate.h
index a6ee43a5d487c425b744c3451cc2dbbf26e55466..ea136bd30158437fe88efbeb88541aceb44099e6 100644 (file)
--- a/lib/parsedate.h
+++ b/lib/parsedate.h
@@ -30,6 +30,6 @@ extern const char * const Curl_month[12];
    TIME_T_MAX in case the parsed time value was too big, instead of an
    error. */
 
-int Curl_getdate_capped(const char *p, time_t *store);
+int Curl_getdate_capped(const char *p, time_t *tp);
 
 #endif /* HEADER_CURL_PARSEDATE_H */

diff --git a/lib/request.h b/lib/request.h
index 389ae4d8b1f8d7d6db078637f29304f6e5cf36a7..3a2dd0de985ee7081b8ce80583e91fc332cc4a12 100644 (file)
--- a/lib/request.h
+++ b/lib/request.h
@@ -178,7 +178,7 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data);
  * @param httpversion version used in request (09, 10, 11, etc.)
  * @return CURLE_OK (on blocking with *pnwritten == 0) or error.
  */
-CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *buf,
+CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *req,
                        unsigned char httpversion);
 
 /**

diff --git a/lib/select.h b/lib/select.h
index 268ae7cecfd4f9a1e806f506f240448adaeb6017..68150451c48bc0b352bcd7c20c2250c9869cc0a1 100644 (file)
--- a/lib/select.h
+++ b/lib/select.h
@@ -71,7 +71,8 @@ struct pollfd {
    therefore defined here */
 #define CURL_CSELECT_IN2 (CURL_CSELECT_ERR << 1)
 
-int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2,
+int Curl_socket_check(curl_socket_t readfd0,
+                      curl_socket_t readfd1,
                       curl_socket_t writefd,
                       timediff_t timeout_ms);
 #define SOCKET_READABLE(x, z)                               \

diff --git a/lib/sendf.c b/lib/sendf.c
index fcb67933d3b9ad5ebdbf2bc69422a8f3fe8072bd..c8b0e28eea871ae081755dd20e743e7274f6f742 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -373,7 +373,7 @@ static CURLcode do_init_writer_stack(struct Curl_easy *data)
    The defines are in sendf.h of course.
  */
 CURLcode Curl_client_write(struct Curl_easy *data,
-                           int type, const char *buf, size_t blen)
+                           int type, const char *buf, size_t len)
 {
   CURLcode result;
 
@@ -394,9 +394,9 @@ CURLcode Curl_client_write(struct Curl_easy *data,
     DEBUGASSERT(data->req.writer_stack);
   }
 
-  result = Curl_cwriter_write(data, data->req.writer_stack, type, buf, blen);
+  result = Curl_cwriter_write(data, data->req.writer_stack, type, buf, len);
   CURL_TRC_WRITE(data, "client_write(type=%x, len=%zu) -> %d",
-                 type, blen, result);
+                 type, len, result);
   return result;
 }
 

diff --git a/lib/sendf.h b/lib/sendf.h
index 1521ccb0f86614d0f2e1a948c988df6026514e8e..952ed4c12357b4c7e95fe0d488e43733411962de 100644 (file)
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -58,7 +58,7 @@ struct Curl_easy;
  * Write `len` bytes at `prt` to the client. `type` indicates what
  * kind of data is being written.
  */
-CURLcode Curl_client_write(struct Curl_easy *data, int type, const char *ptr,
+CURLcode Curl_client_write(struct Curl_easy *data, int type, const char *buf,
                            size_t len) WARN_UNUSED_RESULT;
 
 /**
@@ -140,7 +140,7 @@ struct Curl_cwriter {
  */
 CURLcode Curl_cwriter_create(struct Curl_cwriter **pwriter,
                              struct Curl_easy *data,
-                             const struct Curl_cwtype *ce_handler,
+                             const struct Curl_cwtype *cwt,
                              Curl_cwriter_phase phase);
 
 /**
@@ -298,7 +298,7 @@ void Curl_creader_clear_eos(struct Curl_easy *data,
  */
 CURLcode Curl_creader_create(struct Curl_creader **preader,
                              struct Curl_easy *data,
-                             const struct Curl_crtype *cr_handler,
+                             const struct Curl_crtype *crt,
                              Curl_creader_phase phase);
 
 /**

diff --git a/lib/setopt.h b/lib/setopt.h
index 0dd60c785f939b50563a053d5286b19f150c9a7c..c421f5c5e5bce7570f4ecefcf7168b9a8f0345d5 100644 (file)
--- a/lib/setopt.h
+++ b/lib/setopt.h
@@ -34,7 +34,7 @@ CURLcode Curl_setopt_SSLVERSION(struct Curl_easy *data, CURLoption option,
 CURLcode Curl_setstropt(char **charp, const char *s) WARN_UNUSED_RESULT;
 CURLcode Curl_setblobopt(struct curl_blob **blobp,
                          const struct curl_blob *blob) WARN_UNUSED_RESULT;
-CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list arg)
+CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
   WARN_UNUSED_RESULT;
 
 #endif /* HEADER_CURL_SETOPT_H */

diff --git a/lib/sha256.c b/lib/sha256.c
index 8e581fec786a8cbfc87389d7c4a7ac1f2bf98f69..e35aa30649b300265dab99ce30aaa5d09385dd43 100644 (file)
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -452,14 +452,14 @@ static void my_sha256_final(unsigned char *out, void *ctx)
  * Returns CURLE_OK on success.
  */
 CURLcode Curl_sha256it(unsigned char *output, const unsigned char *input,
-                       const size_t length)
+                       const size_t len)
 {
   CURLcode result;
   my_sha256_ctx ctx;
 
   result = my_sha256_init(&ctx);
   if(!result) {
-    my_sha256_update(&ctx, input, curlx_uztoui(length));
+    my_sha256_update(&ctx, input, curlx_uztoui(len));
     my_sha256_final(output, &ctx);
   }
   return result;

diff --git a/lib/splay.h b/lib/splay.h
index 9ed96f63e4eae5a81731506731b724eb25237c12..c6623f2ef0c45d4b324bb8af5cd167f0511f1a00 100644 (file)
--- a/lib/splay.h
+++ b/lib/splay.h
@@ -42,7 +42,7 @@ struct Curl_tree *Curl_splay(const struct curltime *pkey,
 
 struct Curl_tree *Curl_splayinsert(const struct curltime *pkey,
                                    struct Curl_tree *t,
-                                   struct Curl_tree *newnode);
+                                   struct Curl_tree *node);
 
 struct Curl_tree *Curl_splaygetbest(const struct curltime *pkey,
                                     struct Curl_tree *t,

diff --git a/lib/strcase.h b/lib/strcase.h
index 35f726c3eecef87a51ef1a576514266feed7253f..54299812beaed5ac5d98f210c997982572824fa0 100644 (file)
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -36,6 +36,6 @@ void Curl_strntoupper(char *dest, const char *src, size_t n);
 void Curl_strntolower(char *dest, const char *src, size_t n);
 
 bool Curl_safecmp(const char *a, const char *b);
-int Curl_timestrcmp(const char *first, const char *second);
+int Curl_timestrcmp(const char *a, const char *b);
 
 #endif /* HEADER_CURL_STRCASE_H */

diff --git a/lib/strequal.c b/lib/strequal.c
index 98cecdc244d4d3724cee85a0a3c856cf1415de11..e712691bdc09408b16b786358f01edaf03856cfd 100644 (file)
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -73,23 +73,23 @@ static int ncasecompare(const char *first, const char *second, size_t max)
  */
 
 /* --- public function --- */
-int curl_strequal(const char *first, const char *second)
+int curl_strequal(const char *s1, const char *s2)
 {
-  if(first && second)
+  if(s1 && s2)
     /* both pointers point to something then compare them */
-    return casecompare(first, second);
+    return casecompare(s1, s2);
 
   /* if both pointers are NULL then treat them as equal */
-  return NULL == first && NULL == second;
+  return NULL == s1 && NULL == s2;
 }
 
 /* --- public function --- */
-int curl_strnequal(const char *first, const char *second, size_t max)
+int curl_strnequal(const char *s1, const char *s2, size_t n)
 {
-  if(first && second)
+  if(s1 && s2)
     /* both pointers point to something then compare them */
-    return ncasecompare(first, second, max);
+    return ncasecompare(s1, s2, n);
 
   /* if both pointers are NULL then treat them as equal if max is non-zero */
-  return NULL == first && NULL == second && max;
+  return NULL == s1 && NULL == s2 && n;
 }

diff --git a/lib/uint-table.h b/lib/uint-table.h
index 3fc7e34ef436e9c53ce465f736b8cdd550cace9f..398a26a64843389caffdbe0359d2e35e91e7065c 100644 (file)
--- a/lib/uint-table.h
+++ b/lib/uint-table.h
@@ -47,7 +47,7 @@ void Curl_uint32_tbl_init(struct uint32_tbl *tbl,
 
 /* Resize the table to change capacity `nmax`. When `nmax` is reduced,
  * all present entries with key equal or larger to `nmax` are removed. */
-CURLcode Curl_uint32_tbl_resize(struct uint32_tbl *tbl, uint32_t nmax);
+CURLcode Curl_uint32_tbl_resize(struct uint32_tbl *tbl, uint32_t nrows);
 
 /* Destroy the table, freeing all entries. */
 void Curl_uint32_tbl_destroy(struct uint32_tbl *tbl);

diff --git a/lib/url.h b/lib/url.h
index 1e44ebe43bb0d94309e27a15486fc1d040dab958..c4cd762fb85948a9fb75cd73f6943f59e0915a0e 100644 (file)
--- a/lib/url.h
+++ b/lib/url.h
@@ -36,14 +36,16 @@ void Curl_init_userdefined(struct Curl_easy *data);
 void Curl_freeset(struct Curl_easy *data);
 CURLcode Curl_uc_to_curlcode(CURLUcode uc);
 CURLcode Curl_close(struct Curl_easy **datap); /* opposite of Curl_open() */
-CURLcode Curl_connect(struct Curl_easy *, bool *async, bool *protocol_connect);
+CURLcode Curl_connect(struct Curl_easy *data,
+                      bool *asyncp,
+                      bool *protocol_done);
 CURLcode Curl_setup_conn(struct Curl_easy *data,
                          struct Curl_dns_entry *dns,
                          bool *protocol_done);
 void Curl_conn_free(struct Curl_easy *data, struct connectdata *conn);
 CURLcode Curl_parse_login_details(const char *login, const size_t len,
-                                  char **userptr, char **passwdptr,
-                                  char **optionsptr);
+                                  char **userp, char **passwdp,
+                                  char **optionsp);
 
 /* Attach/Clear/Get meta data for an easy handle. Needs to provide
  * a destructor, will be automatically called when the easy handle

diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index fc8a6ebd5102516803695f3bdd91cc94100eed3d..d9b11d3cb38f12815c6f878d9821602491997b74 100644 (file)
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -81,14 +81,14 @@ CURLcode Curl_auth_create_plain_message(const char *authzid,
  *
  * Parameters:
  *
- * valuep  [in]     - The username or user's password.
+ * value   [in]     - The username or user's password.
  * out     [out]    - The result storage.
  *
  * Returns void.
  */
-void Curl_auth_create_login_message(const char *valuep, struct bufref *out)
+void Curl_auth_create_login_message(const char *value, struct bufref *out)
 {
-  Curl_bufref_set(out, valuep, strlen(valuep), NULL);
+  Curl_bufref_set(out, value, strlen(value), NULL);
 }
 
 /*

diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index 312bd8da5ad474c66012fc26fe9d36bcea8ec894..1649dc683219cd047b695b2a258860bb4fb09630 100644 (file)
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -110,7 +110,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
                                               const char *userp,
                                               const char *passwdp,
                                               const unsigned char *request,
-                                              const unsigned char *uri,
+                                              const unsigned char *uripath,
                                               struct digestdata *digest,
                                               char **outptr, size_t *outlen);
 
@@ -150,7 +150,7 @@ CURLcode Curl_auth_gsasl_token(struct Curl_easy *data,
                                struct bufref *out);
 
 /* This is used to clean up the gsasl specific data */
-void Curl_auth_gsasl_cleanup(struct gsasldata *digest);
+void Curl_auth_gsasl_cleanup(struct gsasldata *gsasl);
 #endif
 
 #ifdef USE_NTLM
@@ -199,13 +199,13 @@ CURLcode Curl_auth_create_ntlm_type1_message(struct Curl_easy *data,
                                              const char *userp,
                                              const char *passwdp,
                                              const char *service,
-                                             const char *host,
+                                             const char *hostname,
                                              struct ntlmdata *ntlm,
                                              struct bufref *out);
 
 /* This is used to decode a base64 encoded NTLM type-2 message */
 CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data,
-                                             const struct bufref *type2,
+                                             const struct bufref *type2ref,
                                              struct ntlmdata *ntlm);
 
 /* This is used to generate a base64 encoded NTLM type-3 message */

diff --git a/lib/vssh/vssh.c b/lib/vssh/vssh.c
index 7bb06a8222668bb523e14113f00c3178ae6d8e24..d3abe57b35e758d2a760b97ef4d4011ac18bfea0 100644 (file)
--- a/lib/vssh/vssh.c
+++ b/lib/vssh/vssh.c
@@ -285,19 +285,19 @@ fail:
 }
 
 CURLcode Curl_ssh_range(struct Curl_easy *data,
-                        const char *p, curl_off_t filesize,
+                        const char *range, curl_off_t filesize,
                         curl_off_t *startp, curl_off_t *sizep)
 {
   curl_off_t from, to;
   int to_t;
-  int from_t = curlx_str_number(&p, &from, CURL_OFF_T_MAX);
+  int from_t = curlx_str_number(&range, &from, CURL_OFF_T_MAX);
   if(from_t == STRE_OVERFLOW)
     return CURLE_RANGE_ERROR;
-  curlx_str_passblanks(&p);
-  (void)curlx_str_single(&p, '-');
+  curlx_str_passblanks(&range);
+  (void)curlx_str_single(&range, '-');
 
-  to_t = curlx_str_numblanks(&p, &to);
-  if((to_t == STRE_OVERFLOW) || (to_t && from_t) || *p)
+  to_t = curlx_str_numblanks(&range, &to);
+  if((to_t == STRE_OVERFLOW) || (to_t && from_t) || *range)
     return CURLE_RANGE_ERROR;
 
   if(from_t) {

diff --git a/lib/vtls/hostcheck.h b/lib/vtls/hostcheck.h
index d62c721352af1874753e9671e2dc424a9bc99f8f..0b4384cb7d431f4c7b5daa3c7355afdaeedf5376 100644 (file)
--- a/lib/vtls/hostcheck.h
+++ b/lib/vtls/hostcheck.h
@@ -28,7 +28,7 @@
 #if defined(USE_OPENSSL) || defined(USE_SCHANNEL)
 
 /* returns TRUE if there is a match */
-bool Curl_cert_hostcheck(const char *match_pattern, size_t matchlen,
+bool Curl_cert_hostcheck(const char *match, size_t matchlen,
                          const char *hostname, size_t hostlen);
 
 #endif

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 0e039386c1d4c6641998829dc0cecec3423b5058..b72b8fc34f2fde779ce6420e513e79bc014fd610 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -917,10 +917,9 @@ static bool is_pkcs11_uri(const char *string)
 
 #endif
 
-static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine);
+static CURLcode ossl_set_engine(struct Curl_easy *data, const char *name);
 #ifdef OPENSSL_HAS_PROVIDERS
-static CURLcode ossl_set_provider(struct Curl_easy *data,
-                                  const char *provider);
+static CURLcode ossl_set_provider(struct Curl_easy *data, const char *iname);
 #endif
 
 static int use_certificate_blob(SSL_CTX *ctx, const struct curl_blob *blob,

diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index 02522550d980988d1adda70d83134f0ab8bf88a9..b99ac8a3a5793f3d2de77147db4008f2ed1b5d39 100644 (file)
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -106,7 +106,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
                             struct Curl_cfilter *cf,
                             struct Curl_easy *data,
                             struct ssl_peer *peer,
-                            const struct alpn_spec *alpns,
+                            const struct alpn_spec *alpns_requested,
                             Curl_ossl_ctx_setup_cb *cb_setup,
                             void *cb_user_data,
                             Curl_ossl_new_session_cb *cb_new_session,
@@ -138,7 +138,7 @@ CURLcode Curl_ossl_ctx_configure(struct Curl_cfilter *cf,
 CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
                                struct Curl_easy *data,
                                const char *ssl_peer_key,
-                               SSL_SESSION *ssl_sessionid,
+                               SSL_SESSION *session,
                                int ietf_tls_id,
                                const char *alpn,
                                unsigned char *quic_tp,

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 8df23a6660d1e47882f691e49e2ee062f0e25f27..fcaa173daa38125124632b6c97be1e5f95ea7c60 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -679,12 +679,11 @@ CURLcode Curl_ssl_push_certinfo_len(struct Curl_easy *data,
 
 /* get length bytes of randomness */
 CURLcode Curl_ssl_random(struct Curl_easy *data,
-                         unsigned char *entropy,
-                         size_t length)
+                         unsigned char *buffer, size_t length)
 {
   DEBUGASSERT(length == sizeof(int));
   if(Curl_ssl->random)
-    return Curl_ssl->random(data, entropy, length);
+    return Curl_ssl->random(data, buffer, length);
   else
     return CURLE_NOT_BUILT_IN;
 }

diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index 8b04c111013738290af3107dba40d8659a149bea..12ae3a4c730c0edcd87bd476e780ace7fce43ddf 100644 (file)
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -178,8 +178,8 @@ CURLcode Curl_ssl_push_certinfo(struct Curl_easy *data, int certnum,
 /* Functions to be used by SSL library adaptation functions */
 
 /* get N random bytes into the buffer */
-CURLcode Curl_ssl_random(struct Curl_easy *data, unsigned char *buffer,
-                         size_t length);
+CURLcode Curl_ssl_random(struct Curl_easy *data,
+                         unsigned char *buffer, size_t length);
 /* Check pinned public key. */
 CURLcode Curl_pin_peer_pubkey(struct Curl_easy *data,
                               const char *pinnedpubkey,

diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c
index 60300c764689095a9ff2a49705560a7dbc8715e1..f937a1db9f2934552e53570ee21c0171ae37dfbd 100644 (file)
--- a/lib/vtls/vtls_scache.c
+++ b/lib/vtls/vtls_scache.c
@@ -914,7 +914,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
                                  struct Curl_easy *data,
                                  const char *ssl_peer_key,
                                  void *sobj,
-                                 Curl_ssl_scache_obj_dtor *sobj_free)
+                                 Curl_ssl_scache_obj_dtor *sobj_dtor_cb)
 {
   struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
   struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
@@ -922,7 +922,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
   CURLcode result;
 
   DEBUGASSERT(sobj);
-  DEBUGASSERT(sobj_free);
+  DEBUGASSERT(sobj_dtor_cb);
 
   if(!scache) {
     result = CURLE_BAD_FUNCTION_ARGUMENT;
@@ -935,12 +935,12 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
     goto out;
   }
 
-  cf_ssl_scache_peer_set_obj(peer, sobj, sobj_free);
+  cf_ssl_scache_peer_set_obj(peer, sobj, sobj_dtor_cb);
   sobj = NULL;  /* peer took ownership */
 
 out:
-  if(sobj && sobj_free)
-    sobj_free(sobj);
+  if(sobj && sobj_dtor_cb)
+    sobj_dtor_cb(sobj);
   return result;
 }
 

diff --git a/lib/ws.c b/lib/ws.c
index 5c372363159ec76df1eb60943441fe1212eccaa0..60465611bb74ce21cb20f715e418d4de253f5f11 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -622,7 +622,7 @@ static CURLcode ws_enc_send(struct Curl_easy *data,
                             size_t buflen,
                             curl_off_t fragsize,
                             unsigned int flags,
-                            size_t *sent);
+                            size_t *pnsent);
 static CURLcode ws_enc_add_pending(struct Curl_easy *data,
                                    struct websocket *ws);
 

diff --git a/lib/ws.h b/lib/ws.h
index d4d6d46f3a51d788c3b51343508fa7ede68bebef..757eae0f0f69f898821ad80a622be2fdd4aa4b90 100644 (file)
--- a/lib/ws.h
+++ b/lib/ws.h
@@ -34,7 +34,8 @@ extern const struct Curl_scheme Curl_scheme_wss;
 #define CURL_META_PROTO_WS_CONN   "meta:proto:ws:conn"
 
 CURLcode Curl_ws_request(struct Curl_easy *data, struct dynbuf *req);
-CURLcode Curl_ws_accept(struct Curl_easy *data, const char *mem, size_t len);
+CURLcode Curl_ws_accept(struct Curl_easy *data,
+                        const char *mem, size_t nread);
 
 #else
 #define Curl_ws_request(x, y) CURLE_OK

diff --git a/src/tool_easysrc.h b/src/tool_easysrc.h
index f9ddacfc3779d941303f0c6e8b4fe277ae4858ae..f37ce4ba86f556a6b6fc3074d8a1ad4366f9a222 100644 (file)
--- a/src/tool_easysrc.h
+++ b/src/tool_easysrc.h
@@ -39,7 +39,7 @@ extern int easysrc_mime_count;  /* Number of curl_mime variables */
 extern int easysrc_slist_count; /* Number of curl_slist variables */
 
 extern CURLcode easysrc_init(void);
-extern CURLcode easysrc_add(struct slist_wc **plist, const char *bupf);
+extern CURLcode easysrc_add(struct slist_wc **plist, const char *line);
 extern CURLcode easysrc_addf(struct slist_wc **plist,
                              const char *fmt, ...) CURL_PRINTF(2, 3);
 extern CURLcode easysrc_perform(void);

diff --git a/src/tool_getpass.c b/src/tool_getpass.c
index 99ded8f4c5b57b40fa83aa65eb0c786dc53700fe..68a16cab3e611bab75a18399525db1e622bb2c85 100644 (file)
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -162,7 +162,7 @@ static bool ttyecho(bool enable, int fd)
 }
 
 char *getpass_r(const char *prompt, /* prompt to display */
-                char *password,     /* buffer to store password in */
+                char *buffer,       /* buffer to store password in */
                 size_t buflen)      /* size of buffer to store password in */
 {
   ssize_t nread;
@@ -174,11 +174,11 @@ char *getpass_r(const char *prompt, /* prompt to display */
   disabled = ttyecho(FALSE, fd); /* disable terminal echo */
 
   fputs(prompt, tool_stderr);
-  nread = read(fd, password, buflen);
+  nread = read(fd, buffer, buflen);
   if(nread > 0)
-    password[--nread] = '\0'; /* null-terminate where enter is stored */
+    buffer[--nread] = '\0'; /* null-terminate where enter is stored */
   else
-    password[0] = '\0'; /* got nothing */
+    buffer[0] = '\0'; /* got nothing */
 
   if(disabled) {
     /* if echo actually was disabled, add a newline */
@@ -189,7 +189,7 @@ char *getpass_r(const char *prompt, /* prompt to display */
   if(STDIN_FILENO != fd)
     curlx_close(fd);
 
-  return password; /* return pointer to buffer */
+  return buffer; /* return pointer to buffer */
 }
 
 #endif /* DONE */

diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h
index 192d242d181d2495bc836f17b572fdd5a24dccd0..af40f10591b50e3120b6e22e1fd1daf20ccd6091 100644 (file)
--- a/src/tool_paramhlp.h
+++ b/src/tool_paramhlp.h
@@ -44,7 +44,7 @@ ParameterError str2unum(long *val, const char *str);
 ParameterError oct2nummax(long *val, const char *str, long max);
 ParameterError str2unummax(long *val, const char *str, long max);
 ParameterError secs2ms(long *val, const char *str);
-ParameterError proto2num(const char * const *val, char **obuf,
+ParameterError proto2num(const char * const *val, char **ostr,
                          const char *str);
 ParameterError check_protocol(const char *str);
 ParameterError str2offset(curl_off_t *val, const char *str);

diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index 425566ba14f53f4625aa4d88993364d1becf21ad..4260882723251ba3f2dbd874240fff90a294eb73 100644 (file)
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -82,7 +82,7 @@ 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);
 
-extern char *hexdump(const unsigned char *buffer, size_t len);
+extern char *hexdump(const unsigned char *buf, size_t len);
 
 #ifndef CURL_DISABLE_WEBSOCKETS
 CURLcode ws_send_ping(CURL *curl, const char *send_payload);