tidy-up: use `CURL_CSTRLEN()` macro on more static strings

Follow-up to e1450d8fdaf05f27ec75eb15df303fe931755a59 #22406

Closes #22424

diff --git a/lib/file.c b/lib/file.c
index 979204bf44e0cedd98d421987ace4ae10fb4c787..2ebfd0c67bcca8d6790fd6531b702a3cfad7f771 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -433,7 +433,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done)
         return result;
 
       result = Curl_client_write(data, CLIENTWRITE_HEADER,
-                                 accept_ranges, sizeof(accept_ranges) - 1);
+                                 accept_ranges, CURL_CSTRLEN(accept_ranges));
       if(result != CURLE_OK)
         return result;
     }

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 230b554191e41bf8037ce11caac384320d645007..7eb25c2e6847514eff9b8e7ada61f1fd348b8156 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -878,9 +878,9 @@ static bool out_string(void *userp,
 
   if(!str) {
     /* Write null string if there is space. */
-    if(prec == -1 || prec >= (int)sizeof(nilstr) - 1) {
+    if(prec == -1 || prec >= (int)CURL_CSTRLEN(nilstr)) {
       str = nilstr;
-      len = sizeof(nilstr) - 1;
+      len = CURL_CSTRLEN(nilstr);
       /* Disable quotes around (nil) */
       flags &= ~(unsigned int)FLAGS_ALT;
     }
@@ -939,7 +939,7 @@ static bool out_pointer(void *userp,
     int width = p->width;
     int flags = p->flags;
 
-    width -= (int)(sizeof(nilstr) - 1);
+    width -= (int)CURL_CSTRLEN(nilstr);
     if(flags & FLAGS_LEFT)
       while(width-- > 0)
         OUTCHAR(' ');

diff --git a/lib/rand.c b/lib/rand.c
index 71f629e72349830e93356d42dc0e5723d9ca1dbc..d0527aa3c0320735529fb8ab2d3dd7b78e929ec5 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -208,7 +208,7 @@ CURLcode Curl_rand_alnum(struct Curl_easy *data, unsigned char *rnd,
                          size_t num)
 {
   CURLcode result = CURLE_OK;
-  const unsigned int alnumspace = sizeof(alnum) - 1;
+  const unsigned int alnumspace = CURL_CSTRLEN(alnum);
   unsigned int r;
   DEBUGASSERT(num > 1);
 

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index b2ab84425075a891db8be5d44167e74fe55416ba..f0d2f802307be84390c6cfc3beedf6a0e764e918 100644 (file)
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -268,7 +268,7 @@ static uint16_t mbed_cipher_suite_walk_str(const char **str, const char **end)
   static const char ecjpake_suite[] = "TLS_ECJPAKE_WITH_AES_128_CCM_8";
 
   if(!id) {
-    if((len == sizeof(ecjpake_suite) - 1) &&
+    if((len == CURL_CSTRLEN(ecjpake_suite)) &&
        curl_strnequal(ecjpake_suite, *str, len))
       id = MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8;
   }

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 7e6c8ef43bd67e0b748d59e1e5bfcb0b8b9b4221..c7c7ed75e522a63bf00323dacd565077efc18653 100644 (file)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -690,10 +690,10 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
   case RCMD_STREAM: {
     static const char streamthis[] = "a string to stream 01234567890\n";
     for(;;) {
-      written = swrite(sock, streamthis, sizeof(streamthis) - 1);
+      written = swrite(sock, streamthis, CURL_CSTRLEN(streamthis));
       if(got_exit_signal)
         return -1;
-      if(written != (ssize_t)(sizeof(streamthis) - 1)) {
+      if(written != (ssize_t)CURL_CSTRLEN(streamthis)) {
         logmsg("Stopped streaming");
         break;
       }

diff --git a/tests/server/util.c b/tests/server/util.c
index 6041bc0c6d2618eb30bd222d1494607250501e30..805f615f4cb858d927495a30a9868eb2d1c6539b 100644 (file)
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -380,7 +380,7 @@ static void exit_signal_handler(int signum)
   int old_errno = errno;
   if(!serverlogfile) {
     static const char msg[] = "exit_signal_handler: serverlogfile not set\n";
-    (void)write(STDERR_FILENO, msg, sizeof(msg) - 1);
+    (void)write(STDERR_FILENO, msg, CURL_CSTRLEN(msg));
   }
   else {
     int fd = -1;
@@ -394,12 +394,12 @@ static void exit_signal_handler(int signum)
     if(fd != -1) {
 #endif
       static const char msg[] = "exit_signal_handler: called\n";
-      (void)write(fd, msg, sizeof(msg) - 1);
+      (void)write(fd, msg, CURL_CSTRLEN(msg));
       curlx_close(fd);
     }
     else {
       static const char msg[] = "exit_signal_handler: failed opening ";
-      (void)write(STDERR_FILENO, msg, sizeof(msg) - 1);
+      (void)write(STDERR_FILENO, msg, CURL_CSTRLEN(msg));
       (void)write(STDERR_FILENO, serverlogfile, strlen(serverlogfile));
       (void)write(STDERR_FILENO, "\n", 1);
     }