tests: reduce variable scopes

Closes https://github.com/curl/curl/pull/6576

tests/libtest/lib543.c

@@ -33,8 +33,6 @@ int test(char *URL)
       0x1d, 0x57, 0xe1};
 
   CURL *easy;
-  int asize;
-  char *s;
   CURLcode res = CURLE_OK;
   (void)URL;
 
@@ -45,9 +43,8 @@ int test(char *URL)
     res = TEST_ERR_MAJOR_BAD;
   }
   else {
-    asize = (int)sizeof(a);
-
-    s = curl_easy_escape(easy, (const char *)a, asize);
+    int asize = (int)sizeof(a);
+    char *s = curl_easy_escape(easy, (const char *)a, asize);
 
     if(s) {
       printf("%s\n", s);

tests/server/sws.c

@@ -238,10 +238,10 @@ static bool socket_domain_is_ip(void)
 /* parse the file on disk that might have a test number for us */
 static int parse_cmdfile(struct httprequest *req)
 {
-  int testnum = DOCNUMBER_NOTHING;
-  char buf[256];
   FILE *f = fopen(cmdfile, FOPEN_READTEXT);
   if(f) {
+    int testnum = DOCNUMBER_NOTHING;
+    char buf[256];
     while(fgets(buf, sizeof(buf), f)) {
       if(1 == sscanf(buf, "Testnum %d", &testnum)) {
         logmsg("[%s] cmdfile says testnum %d", cmdfile, testnum);