Revert whitespace fixes to third_party (#501)

third_party/zip/fileio.c

@@ -645,7 +645,7 @@ int newnamew(namew, isdir, casesensitive)
     int save_dosify = dosify, save_pathput = pathput;
     dosify = 0;
     pathput = 1;
-    /* zname is temporarily mis-used as "undosmode" iname pointer */
+    /* zname is temporarly mis-used as "undosmode" iname pointer */
     if ((znamew = ex2inw(namew, isdir, NULL)) != NULL) {
       undosmw = in2exw(znamew);
       free(znamew);
@@ -2757,7 +2757,7 @@ size_t bfwrite(buffer, size, count, mode)
    the provided buffer length.  If the returned value is less than the
    buffer length, then the contents of the buffer will be null-terminated;
    otherwise, it will not be terminated and may be invalid, possibly
-   stopping in the middle of a multi-byte sequence.
+   stopping in the middle of a multibyte sequence.
 
    In all cases you may pass NULL as the buffer and/or 0 as the length, if
    you just want to learn how much space the string is going to require.
@@ -2830,7 +2830,7 @@ long ucs4_char_from_utf8(utf8)
   if (bytes == 1)
     ret = **utf8;                       /* ascii-7 */
   else
-    ret = **utf8 & (0x7F >> bytes);     /* lead byte of a multi-byte sequence */
+    ret = **utf8 & (0x7F >> bytes);     /* lead byte of a multibyte sequence */
   (*utf8)++;
   for (t = 1; t < bytes; t++)           /* consume trailing bytes */
     ret = (ret << 6) | (*((*utf8)++) & 0x3F);
@@ -3537,17 +3537,17 @@ zwchar *utf8_to_wide_string(utf8_string)
 #define oERR(err,message) ZIPERR(err, (char *) message)
 
 
-/* Although the below provides some support for multi-byte characters
+/* Although the below provides some support for multibyte characters
    the proper thing to do may be to use wide characters and support
    Unicode.  May get to it soon.  EG
  */
 
-/* For now stay with multi-byte characters.  May support wide characters
+/* For now stay with muti-byte characters.  May support wide characters
    in Zip 3.1.
  */
 
-/* multi-byte character set support
-   multi-byte characters use typically two or more sequential bytes
+/* multibyte character set support
+   Multibyte characters use typically two or more sequential bytes
    to represent additional characters than can fit in a single byte
    character set.  The code used here is based on the ANSI mblen function. */
 #ifdef MULTIBYTE_GETOPTNS
@@ -3555,7 +3555,7 @@ zwchar *utf8_to_wide_string(utf8_string)
     ZCONST char *ptr;
   {
     /* return the number of bytes that the char pointed to is.  Return 1 if
-       null character or error like not start of valid multi-byte character. */
+       null character or error like not start of valid multibyte character. */
     int cl;
 
     cl = mblen(ptr, MB_CUR_MAX);
@@ -3578,8 +3578,8 @@ zwchar *utf8_to_wide_string(utf8_string)
 #    define MULTIBYTE_GETOPTNS
 #  endif
 # endif
-/* multi-byte character set support
-   multi-byte characters use typically two or more sequential bytes
+/* multibyte character set support
+   Multibyte characters use typically two or more sequential bytes
    to represent additional characters than can fit in a single byte
    character set.  The code used here is based on the ANSI mblen function. */
 #  ifdef MULTIBYTE_GETOPTNS
@@ -3588,7 +3588,7 @@ zwchar *utf8_to_wide_string(utf8_string)
     ZCONST char *ptr;
   {
     /* return the number of bytes that the char pointed to is.  Return 1 if
-       null character or error like not start of valid multi-byte character. */
+       null character or error like not start of valid multibyte character. */
     int cl;
 
     cl = mblen(ptr, MB_CUR_MAX);
@@ -3636,7 +3636,7 @@ static ZCONST char Far op_req_val_err[] = "option %s requires a value";
 static ZCONST char Far op_no_allow_val_err[] = "option %s does not allow a value";
 static ZCONST char Far sh_op_not_sup_err[] = "short option '%c' not supported";
 static ZCONST char Far oco_req_val_err[] = "option %s requires one character value";
-static ZCONST char Far oco_no_mbc_err[] = "option %s does not support multi-byte values";
+static ZCONST char Far oco_no_mbc_err[] = "option %s does not support multibyte values";
 static ZCONST char Far num_req_val_err[] = "option %s requires number value";
 static ZCONST char Far long_op_ambig_err[] = "long option '%s' ambiguous";
 static ZCONST char Far long_op_not_sup_err[] = "long option '%s' not supported";
@@ -3940,7 +3940,7 @@ local unsigned long get_shortopt(args, argnum, optchar, negated, value,
       if (arg[(*optchar) + clen]) {
         /* has value */
         if (MB_CLEN(arg + (*optchar) + clen) > 1) {
-          /* multi-byte value not allowed for now */
+          /* multibyte value not allowed for now */
           optionerr(optionerrbuf, oco_no_mbc_err, match, 0);
           if (depth > 0) {
             /* unwind */
@@ -4364,7 +4364,7 @@ local unsigned long get_longopt(args, argnum, optchar, negated, value,
  *             -e=
  *       Either optional or required values can be specified.  Optional values
  *       now use both forms as ignoring the later got confusing.  Any
- *       non-value short options can precede a valued short option as in
+ *       non-value short options can preceed a valued short option as in
  *             -abevalue
  *       Some value types (one_char and number) allow options after the value
  *       so if oc is an option that takes a character and n takes a number
@@ -4406,7 +4406,7 @@ local unsigned long get_longopt(args, argnum, optchar, negated, value,
  *             -o value1 value2 value3 ...
  *       for a list of values.  The list ends at the next option, the
  *       end of the command line, or at a single "@" argument.
- *       Each value is treated as if it was preceded by the option, so
+ *       Each value is treated as if it was preceeded by the option, so
  *             --option1 val1 val2
  *       with option1 value_type set to o_VALUE_LIST is the same as
  *             --option1=val1 --option1=val2

third_party/zip/globals.c

@@ -73,7 +73,7 @@ uzoff_t des_usize = 0;  /* Data descriptor usize */
 
 /* dots 10/20/04 */
 zoff_t dot_size = 0;          /* bytes processed in deflate per dot, 0 = no dots */
-zoff_t dot_count = 0;         /* buffers seen, recycles at dot_size */
+zoff_t dot_count = 0;         /* buffers seen, recyles at dot_size */
 /* status 10/30/04 */
 int display_counts = 0;       /* display running file count */
 int display_bytes = 0;        /* display running bytes remaining */

third_party/zip/tailor.h

@@ -20,7 +20,7 @@
 #    undef FORCE_UNIX_OVER_WIN32
 #  endif
 #  ifdef FORCE_WIN32_OVER_UNIX
-     /* native Win32 support was explicitly requested... */
+     /* native Win32 support was explicitely requested... */
 #    undef UNIX
 #  else
      /* use the POSIX (Unix) emulation features by default... */
@@ -122,7 +122,7 @@
 
 /*
  * Some compiler environments may require additional attributes attached
- * to declarations of runtime library functions (e.g. to prepare for
+ * to declarations of runtime libary functions (e.g. to prepare for
  * linking against a "shared dll" version of the RTL).  Here, we provide
  * the "empty" default for these attributes.
  */

third_party/zip/trees.c

@@ -1409,7 +1409,7 @@ local void bi_windup()
  *
  * The problem results in the zip file having bad data and so a bad CRC.
  * This does not happen often and to recreate the problem a large file
- * with non-compressible data is needed so that deflate chooses to store the
+ * with non-compressable data is needed so that deflate chooses to store the
  * data.  A test file of 400 MB seems large enough to recreate the problem
  * using a command such as
  *     zip -1 -e crcerror.zip testfile.dat

third_party/zip/unix.c

@@ -403,7 +403,7 @@ int set_new_unix_extra_field(z, s)
    gid_size  (1 byte - size in bytes)
    gid       (variable)
  */
-
+   
   ef_data_size = 1 + 1 + uid_size + 1 + gid_size;
 
   if ((extra = (char *)malloc(z->ext + 4 + ef_data_size)) == NULL)

third_party/zip/util.c

@@ -894,7 +894,7 @@ void expand_args(argcp, argvp)
 {
 #ifdef DOS
 
-/* Do NEVER include (re)definition of `environ' variable with any version
+/* Do NEVER include (re)definiton of `environ' variable with any version
    of MSC or BORLAND/Turbo C. These compilers supply an incompatible
    definition in <stdlib.h>.  */
 #if defined(__GO32__) || defined(__EMX__)

third_party/zip/zip.c

@@ -2259,7 +2259,7 @@ char **argv;            /* command line tokens */
   des_usize = 0;          /* Data descriptor usize */
 
   dot_size = 0;           /* buffers processed in deflate per dot, 0 = no dots */
-  dot_count = 0;          /* buffers seen, recycles at dot_size */
+  dot_count = 0;          /* buffers seen, recyles at dot_size */
 
   display_counts = 0;     /* display running file count */
   display_bytes = 0;      /* display running bytes remaining */
@@ -2455,7 +2455,7 @@ char **argv;            /* command line tokens */
 #endif /* IZ_CHECK_TZ && USE_EF_UT_TIME */
 
 /* For systems that do not have tzset() but supply this function using another
-   name (_tzset() or something similar), an appropriate "#define tzset ..."
+   name (_tzset() or something similar), an appropiate "#define tzset ..."
    should be added to the system specifc configuration section.  */
 #if (!defined(TOPS20) && !defined(VMS))
 #if (!defined(RISCOS) && !defined(MACOS) && !defined(QDOS))

third_party/zip/zip.h

@@ -278,7 +278,7 @@ extern int translate_eol;       /* Translate end-of-line LF -> CR LF */
    extern int vms_case_2;       /* ODS2 file name case in VMS. -1: down. */
    extern int vms_case_5;       /* ODS5 file name case in VMS. +1: preserve. */
 
-/* Accommodation for /NAMES = AS_IS with old header files. */
+/* Accomodation for /NAMES = AS_IS with old header files. */
 # define cma$tis_errno_get_addr CMA$TIS_ERRNO_GET_ADDR
 # define lib$establish LIB$ESTABLISH
 # define lib$get_foreign LIB$GET_FOREIGN

third_party/zip/ziperr.h

@@ -88,7 +88,7 @@ struct
 /* 13 */ { "NAME",    "Missing or empty zip file",    ZE_S_ERROR },
 /* 14 */ { "WRITE",   "Output file write failure",    ZE_S_SEVERE | ZE_S_PERR },
 /* 15 */ { "CREAT",   "Could not create output file", ZE_S_SEVERE | ZE_S_PERR },
-/* 16 */ { "PARAMS",   "Invalid command arguments",   ZE_S_ERROR },
+/* 16 */ { "PARMS",   "Invalid command arguments",    ZE_S_ERROR },
 /* 17 */ { "",        "",                             ZE_S_UNUSED },
 /* 18 */ { "OPEN",    "File not found or no read permission",
                                                       ZE_S_ERROR | ZE_S_PERR },

third_party/zip/zipfile.c

@@ -1777,12 +1777,12 @@ struct zlist far *z;
     }
 
     if ((fix == 2) && (z->flg != z->lflg))
-    /* The comparison between central and local version of the
+    /* The comparision between central and local version of the
        "general purpose bit flag" cannot be used from scanzipf_regnew(),
        because in the "regular" zipfile processing, the local header reads
        have been postponed until the actual entry processing takes place.
        They have not yet been read when "zipoddities()" is called.
-       This change was necessary to support multivolume archives.
+       This change was neccessary to support multivolume archives.
      */
     {
         sprintf(errbuf, "local flags = 0x%04x, central = 0x%04x: ",
@@ -3959,7 +3959,7 @@ local int scanzipf_fixnew()
 /* New regular scan       */
 
 /*
- * scanzipf_regnew is similar to the original scanzipf_reg in that it
+ * scanzipf_regnew is similar to the orignal scanzipf_reg in that it
  * reads the end of the archive and goes from there.  Unlike that
  * scan this one stops after reading the central directory and does
  * not read the local headers.  After the directory scan for new
@@ -5280,7 +5280,7 @@ int putlocal(z, rewrite)
 
      This assumes that for large entries the compressed size won't need a
      Zip64 extra field if the uncompressed size did not.  This assumption should
-     only fail for a large file of nearly totally uncompressible data.
+     only fail for a large file of nearly totally uncompressable data.
 
      If streaming stdin in and use_descriptors is set then always create a Zip64
      extra field flagging the data descriptor as being in Zip64 format.  This is

third_party/zip/zipnote.c

@@ -365,7 +365,7 @@ extent size;
 local int catalloc(a, s)
 char * far *a;          /* pointer to a pointer to a malloc'ed string */
 char *s;                /* string to concatenate on a */
-/* Concatenate the string s to the malloc'ed string pointed to by a.
+/* Concatentate the string s to the malloc'ed string pointed to by a.
    Preprocess s by removing backslash escape characters. */
 {
   char *p;              /* temporary pointer */

third_party/zip/zipup.c

@@ -166,7 +166,7 @@ int percent(n, m)
 
 /* 2004-12-01 SMS.
  * Changed to do big-n test only for small zoff_t.
- * Changed big-n arithmetic to accommodate apparently negative values
+ * Changed big-n arithmetic to accomodate apparently negative values
  * when a small zoff_t value exceeds 2G.
  * Increased the reduction divisor from 256 to 512 to avoid the sign bit
  * in a reduced intermediate, allowing signed arithmetic for the final