tests: constify, make consts static

- lib509: constify an input string.
- add `static` to const data, where missing.
- tool1394: fix indentation.

Closes #17736

diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index 6f3512f2932e19e6ddd3070701a939f0b5472c93..fb8633058d2b0cf9d8b25baf2638d8616a1e8bc4 100644 (file)
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -1900,7 +1900,7 @@ static char bigpart[120000];
  */
 static int huge(void)
 {
-  const char *smallpart = "c";
+  static const char *smallpart = "c";
   int i;
   CURLU *urlp = curl_url();
   CURLUcode rc;
@@ -1954,7 +1954,7 @@ static int huge(void)
 
 static int urldup(void)
 {
-  const char *url[] = {
+  static const char *url[] = {
     "http://"
     "user:pwd@"
     "[2a04:4e42:e00::347%25eth0]"

diff --git a/tests/libtest/lib1948.c b/tests/libtest/lib1948.c
index 1aa1915e579a971746e6f0041da1c080737b081a..056799976258978f728bf460f5b543711424ebb8 100644 (file)
--- a/tests/libtest/lib1948.c
+++ b/tests/libtest/lib1948.c
@@ -44,7 +44,7 @@ static CURLcode test_lib1948(char *URL)
 {
   CURL *curl;
   CURLcode res = CURLE_OK;
-  const char *testput = "This is test PUT data\n";
+  static const char *testput = "This is test PUT data\n";
   put_buffer pbuf;
 
   curl_global_init(CURL_GLOBAL_DEFAULT);

diff --git a/tests/libtest/lib3102.c b/tests/libtest/lib3102.c
index 06287d21119f8d9deff835ff02c55eb69e5cb7ba..6f5b813c5ea827bdcd4f53f00ef198bbfb525c75 100644 (file)
--- a/tests/libtest/lib3102.c
+++ b/tests/libtest/lib3102.c
@@ -46,8 +46,8 @@ static bool is_chain_in_order(struct curl_certinfo *cert_info)
 
     /* Find the certificate issuer and subject by enumerating each field */
     for(; slist && (!issuer || !subject); slist = slist->next) {
-      const char issuer_prefix[] = "Issuer:";
-      const char subject_prefix[] = "Subject:";
+      static const char issuer_prefix[] = "Issuer:";
+      static const char subject_prefix[] = "Subject:";
 
       if(!strncmp(slist->data, issuer_prefix, sizeof(issuer_prefix)-1)) {
         issuer = slist->data + sizeof(issuer_prefix)-1;

diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index 3ed339fc5f67b1a918d05e35201f9876457a9704..4f4c5c9f395705654988550f306b904ab3a9a81f 100644 (file)
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -42,8 +42,9 @@ static CURLcode test_lib505(char *URL)
   struct curl_slist *hl;
 
   struct curl_slist *headerlist = NULL;
-  const char *buf_1 = "RNFR 505";
-  const char *buf_2 = "RNTO 505-forreal";
+
+  static const char *buf_1 = "RNFR 505";
+  static const char *buf_2 = "RNTO 505-forreal";
 
   if(!libtest_arg2) {
     curl_mfprintf(stderr, "Usage: <url> <file-to-upload>\n");

diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index 776e26184fcec97c70194f0fca78efcc2d9a3d15..d0cba1281df9cd4b69178747c3962d8962fb3bdc 100644 (file)
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -69,8 +69,8 @@ static void custom_free(void *ptr)
 
 static CURLcode test_lib509(char *URL)
 {
-  unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-                       0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7};
+  static const unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+                                    0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7};
   CURLcode res;
   CURL *curl;
   int asize;
@@ -98,7 +98,7 @@ static CURLcode test_lib509(char *URL)
   test_setopt(curl, CURLOPT_USERAGENT, "test509"); /* uses strdup() */
 
   asize = (int)sizeof(a);
-  str = curl_easy_escape(curl, (char *)a, asize); /* uses realloc() */
+  str = curl_easy_escape(curl, (const char *)a, asize); /* uses realloc() */
 
   if(seen)
     curl_mprintf("Callbacks were invoked!\n");

diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 9c21d581fe9d462829032a309bbfe6c3c5a49868..a7104c8a6c4fbd7672210e027f83c46b8b6a115b 100644 (file)
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -53,7 +53,7 @@ again:
 
   if(!res) {
     /* we are connected, now get an HTTP document the raw way */
-    const char *request =
+    static const char *request =
       "GET /556 HTTP/1.1\r\n"
       "Host: ninja\r\n\r\n";
     const char *sbuf = request;

diff --git a/tests/libtest/stub_gssapi.c b/tests/libtest/stub_gssapi.c
index 956ec3782b05c312dc5f682c47976b1adbf5a6a5..98aefe85a86e5fc992aeeef704f7b33c44464f8c 100644 (file)
--- a/tests/libtest/stub_gssapi.c
+++ b/tests/libtest/stub_gssapi.c
@@ -320,7 +320,7 @@ OM_uint32 gss_display_status(OM_uint32 *min,
                              OM_uint32 *message_context,
                              gss_buffer_t status_string)
 {
-  const char maj_str[] = "Stub GSS error";
+  static const char maj_str[] = "Stub GSS error";
   (void)mech_type;
   if(min)
     *min = 0;

diff --git a/tests/tunit/tool1394.c b/tests/tunit/tool1394.c
index 8c874ef4e2fa176226aad87b6b5d80e30e52c162..eead5ea6a558f3f73697af2e164a459f1ae25bd7 100644 (file)
--- a/tests/tunit/tool1394.c
+++ b/tests/tunit/tool1394.c
@@ -31,7 +31,7 @@ static CURLcode test_tool1394(char *arg)
 {
   UNITTEST_BEGIN_SIMPLE
 
-  const char *values[] = {
+  static const char *values[] = {
     /* -E parameter */        /* exp. cert name */  /* exp. passphrase */
     "foo:bar:baz",            "foo",                "bar:baz",
     "foo\\:bar:baz",          "foo:bar",            "baz",
@@ -74,20 +74,20 @@ static CURLcode test_tool1394(char *arg)
       if(certname) {
         if(strcmp(p[1], certname)) {
           printf("expected certname '%s' but got '%s' "
-              "for -E param '%s'\n", p[1], certname, p[0]);
+                 "for -E param '%s'\n", p[1], certname, p[0]);
           fail("assertion failure");
         }
       }
       else {
         printf("expected certname '%s' but got NULL "
-            "for -E param '%s'\n", p[1], p[0]);
+               "for -E param '%s'\n", p[1], p[0]);
         fail("assertion failure");
       }
     }
     else {
       if(certname) {
         printf("expected certname NULL but got '%s' "
-            "for -E param '%s'\n", certname, p[0]);
+               "for -E param '%s'\n", certname, p[0]);
         fail("assertion failure");
       }
     }
@@ -95,20 +95,20 @@ static CURLcode test_tool1394(char *arg)
       if(passphrase) {
         if(strcmp(p[2], passphrase)) {
           printf("expected passphrase '%s' but got '%s'"
-              "for -E param '%s'\n", p[2], passphrase, p[0]);
+                 "for -E param '%s'\n", p[2], passphrase, p[0]);
           fail("assertion failure");
         }
       }
       else {
         printf("expected passphrase '%s' but got NULL "
-            "for -E param '%s'\n", p[2], p[0]);
+               "for -E param '%s'\n", p[2], p[0]);
         fail("assertion failure");
       }
     }
     else {
       if(passphrase) {
         printf("expected passphrase NULL but got '%s' "
-            "for -E param '%s'\n", passphrase, p[0]);
+               "for -E param '%s'\n", passphrase, p[0]);
         fail("assertion failure");
       }
     }

diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c
index 96a7e65366305fb2d2f280daf6cb9ea705b3f798..d3b54d3b73e07f5f8a7af92589224b0d7d81d69a 100644 (file)
--- a/tests/unit/unit1398.c
+++ b/tests/unit/unit1398.c
@@ -34,7 +34,7 @@ static CURLcode test_unit1398(char *arg)
 
   int rc;
   char buf[3] = {'b', 'u', 'g'};
-  const char *str = "bug";
+  static const char *str = "bug";
   int width = 3;
   char output[130];
 

diff --git a/tests/unit/unit1601.c b/tests/unit/unit1601.c
index 343ef4adb433cae57d35e3206acb0dd1ea2b2e61..23a1ab21795f59ac67afd3f5e5705cfa75cf2549 100644 (file)
--- a/tests/unit/unit1601.c
+++ b/tests/unit/unit1601.c
@@ -32,8 +32,8 @@ static CURLcode test_unit1601(char *arg)
 #if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) \
     || !defined(CURL_DISABLE_DIGEST_AUTH)
 
-  const char string1[] = "1";
-  const char string2[] = "hello-you-fool";
+  static const char string1[] = "1";
+  static const char string2[] = "hello-you-fool";
   unsigned char output[MD5_DIGEST_LEN];
   unsigned char *testp = output;
 

diff --git a/tests/unit/unit1610.c b/tests/unit/unit1610.c
index 180d140b87cdb0b527f129ddb1dde9eef7d9e9db..954613d3adfc348146577d1049119d27a4ce4a44 100644 (file)
--- a/tests/unit/unit1610.c
+++ b/tests/unit/unit1610.c
@@ -39,8 +39,8 @@ static CURLcode test_unit1610(char *arg)
 #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) \
     || defined(USE_LIBSSH2)
 
-  const char string1[] = "1";
-  const char string2[] = "hello-you-fool";
+  static const char string1[] = "1";
+  static const char string2[] = "hello-you-fool";
   unsigned char output[CURL_SHA256_DIGEST_LENGTH];
   unsigned char *testp = output;
 

diff --git a/tests/unit/unit1611.c b/tests/unit/unit1611.c
index 8368c3785672be511c87b36f2900e54d4e523051..496c86aad57bb93334f07394de79498363901d24 100644 (file)
--- a/tests/unit/unit1611.c
+++ b/tests/unit/unit1611.c
@@ -30,8 +30,8 @@ static CURLcode test_unit1611(char *arg)
   UNITTEST_BEGIN_SIMPLE
 
 #ifdef USE_CURL_NTLM_CORE
-  const char string1[] = "1";
-  const char string2[] = "hello-you-fool";
+  static const char string1[] = "1";
+  static const char string2[] = "hello-you-fool";
   unsigned char output[MD4_DIGEST_LENGTH];
   unsigned char *testp = output;
 

diff --git a/tests/unit/unit1612.c b/tests/unit/unit1612.c
index f6e5a4e5188b82611a8723224a1d663e911ec86b..dc8f5dc14acfef025454f362ed37ef2f16ef6fbd 100644 (file)
--- a/tests/unit/unit1612.c
+++ b/tests/unit/unit1612.c
@@ -33,9 +33,9 @@ static CURLcode test_unit1612(char *arg)
 #if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) \
     || !defined(CURL_DISABLE_DIGEST_AUTH)
 
-  const char password[] = "Pa55worD";
-  const char string1[] = "1";
-  const char string2[] = "hello-you-fool";
+  static const char password[] = "Pa55worD";
+  static const char string1[] = "1";
+  static const char string2[] = "hello-you-fool";
   unsigned char output[HMAC_MD5_LENGTH];
   unsigned char *testp = output;
 

diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c
index 3671b5615060bd28500c3c8dee599be80c7bb1d2..369bea1c29d5464ff444b7d337dad2bedb5d1da6 100644 (file)
--- a/tests/unit/unit1655.c
+++ b/tests/unit/unit1655.c
@@ -135,9 +135,9 @@ static CURLcode test_unit1655(char *arg)
     const size_t buflen = sizeof(buffer);
     const size_t magic1 = 9765;
     size_t olen1 = magic1;
-    const char *sunshine1 = "a.com";
-    const char *dotshine1 = "a.com.";
-    const char *sunshine2 = "aa.com";
+    static const char *sunshine1 = "a.com";
+    static const char *dotshine1 = "a.com.";
+    static const char *sunshine2 = "aa.com";
     size_t olen2;
     DOHcode ret2;
     size_t olen;