src: Consistently spell whitespace without whitespace

Whitespace is spelled without a space between white and space, so
make sure to consistently spell it that way across the codebase.

Closes #6023
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Emil Engler <me@emilengler.com>

diff --git a/acinclude.m4 b/acinclude.m4
index 089449bac4ec4e94a8b1c57bc35e32a6451366f3..e7a36e4bd676afc88b7a1ade4dfb51904bd070a4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -661,7 +661,7 @@ dnl -------------------------------------------------
 dnl Check for libraries needed for WINLDAP support,
 dnl and prepended to LIBS any needed libraries.
 dnl This macro can take an optional parameter with a
-dnl white space separated list of libraries to check
+dnl whitespace separated list of libraries to check
 dnl before the WINLDAP default ones.
 
 AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [
@@ -755,7 +755,7 @@ dnl -------------------------------------------------
 dnl Check for libraries needed for LDAP support,
 dnl and prepended to LIBS any needed libraries.
 dnl This macro can take an optional parameter with a
-dnl white space separated list of libraries to check
+dnl whitespace separated list of libraries to check
 dnl before the default ones.
 
 AC_DEFUN([CURL_CHECK_LIBS_LDAP], [

diff --git a/docs/CHECKSRC.md b/docs/CHECKSRC.md
index ac43ea5899da52df6a40b64104b1ad7c31308285..d36763bc542dd67990f2a44f84616517d50ee544 100644 (file)
--- a/docs/CHECKSRC.md
+++ b/docs/CHECKSRC.md
@@ -100,7 +100,7 @@ warnings are:
 
 - `TABS`: TAB characters are not allowed!
 
-- `TRAILINGSPACE`: Trailing white space on the line
+- `TRAILINGSPACE`: Trailing whitespace on the line
 
 - `TYPEDEFSTRUCT`: we frown upon (most) typedefed structs
 

diff --git a/docs/MANUAL.md b/docs/MANUAL.md
index e4c7d797150ab0f064866668f2d6a0c66ddf8ac1..5721436007c97903fab92248ede820243cc39e67 100644 (file)
--- a/docs/MANUAL.md
+++ b/docs/MANUAL.md
@@ -556,7 +556,7 @@ Example, set default time out and proxy in a config file:
     # ... and we use a proxy for all accesses:
     proxy = proxy.our.domain.com:8080
 
-White spaces ARE significant at the end of lines, but all white spaces leading
+Whitespaces ARE significant at the end of lines, but all whitespace leading
 up to the first characters of each line are ignored.
 
 Prevent curl from reading the default file by using -q as the first command

diff --git a/lib/checksrc.pl b/lib/checksrc.pl
index e7eb454f1d59c25a8d5cdec673e38157d6ec2fe0..c47aaf0f55c590d232b8198667b460c1fc338a11 100755 (executable)
--- a/lib/checksrc.pl
+++ b/lib/checksrc.pl
@@ -52,7 +52,7 @@ my %warnings_extended = (
 my %warnings = (
     'LONGLINE'         => "Line longer than $max_column",
     'TABS'             => 'TAB characters not allowed',
-    'TRAILINGSPACE'    => 'Trailing white space on the line',
+    'TRAILINGSPACE'    => 'Trailing whitespace on the line',
     'CPPCOMMENTS'      => '// comment detected',
     'SPACEBEFOREPAREN' => 'space before an open parenthesis',
     'SPACEAFTERPAREN'  => 'space after open parenthesis',
@@ -399,7 +399,7 @@ sub scanfile {
             checkwarn("TABS",
                       $line, length($1), $file, $l, "Contains TAB character", 1);
         }
-        # detect trailing white space
+        # detect trailing whitespace
         if($l =~ /^(.*)[ \t]+\z/) {
             checkwarn("TRAILINGSPACE",
                       $line, length($1), $file, $l, "Trailing whitespace");

diff --git a/lib/curl_path.c b/lib/curl_path.c
index fbd98cb39b401f58a9c3cce2fbce7a305b421eaa..7b3fb27ab1805ea42b7ccbd6f14100a7c1deb6ec 100644 (file)
--- a/lib/curl_path.c
+++ b/lib/curl_path.c
@@ -168,7 +168,7 @@ CURLcode Curl_get_pathname(const char **cpp, char **path, char *homedir)
     *cpp = cp + i + strspn(cp + i, WHITESPACE);
   }
   else {
-    /* Read to end of filename - either to white space or terminator */
+    /* Read to end of filename - either to whitespace or terminator */
     end = strpbrk(cp, WHITESPACE);
     if(end == NULL)
       end = strchr(cp, '\0');
@@ -184,7 +184,7 @@ CURLcode Curl_get_pathname(const char **cpp, char **path, char *homedir)
       (*path)[pathLength] = '\0';
       cp += 3;
     }
-    /* Copy path name up until first "white space" */
+    /* Copy path name up until first "whitespace" */
     memcpy(&(*path)[pathLength], cp, (int)(end - cp));
     pathLength += (int)(end - cp);
     (*path)[pathLength] = '\0';

diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 6f208c4b46c4d45e9cab2ef4a0793503922d4709..c7b84a9ffdde4ae5fb609d29573a86ee9d750974 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -418,8 +418,8 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
             finfo->b_data[parser->item_length - 1] = 0;
             if(strncmp("total ", finfo->b_data, 6) == 0) {
               char *endptr = finfo->b_data + 6;
-              /* here we can deal with directory size, pass the leading white
-                 spaces and then the digits */
+              /* here we can deal with directory size, pass the leading
+                 whitespace and then the digits */
               while(ISSPACE(*endptr))
                 endptr++;
               while(ISDIGIT(*endptr))

diff --git a/lib/http.c b/lib/http.c
index 748750ebb74663287ace88bf1f60029690a21336..e0be17d9baf7d19787687a10b2b1913ea354ceaa 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -1355,7 +1355,7 @@ Curl_compareheader(const char *headerline, /* line to check */
   /* pass the header */
   start = &headerline[hlen];
 
-  /* pass all white spaces */
+  /* pass all whitespace */
   while(*start && ISSPACE(*start))
     start++;
 

diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index 0d16a3b90d5626605472d94db32c3dbb2aed1e43..81e614f9a5c154985c35f8942f8520ee8be52516 100755 (executable)
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -64,7 +64,7 @@ sed -e 's/^ //' -e 's/ $//g' -e 's/@users.noreply.github.com$/ on github/'
 
 # grep out the list of names from RELEASE-NOTES
 # split on ", "
-# remove leading white spaces
+# remove leading whitespace
 grep -a "^  [^ (]" RELEASE-NOTES| \
 sed 's/, */\n/g'| \
 sed 's/^ *//'

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index f09180ed4cf4962f76480feee55c68a026c63974..abd493ae5fe69b43c970ecc27b559d477f94da96 100644 (file)
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -227,7 +227,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
             break;
           default:
             warnf(operation->global, "%s:%d: warning: '%s' uses unquoted "
-                  "white space in the line that may cause side-effects!\n",
+                  "whitespace in the line that may cause side-effects!\n",
                   filename, lineno, option);
           }
         }