s/non-zero/nonzero/g

22 files changed, 83 insertions, 83 deletions

diff --git a/src/cat.c b/src/cat.c
index 0038c1921..d09be30de 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -481,13 +481,13 @@ main (int argc, char **argv)
   int quote = 0;
   int output_tabs = 1;
 
-/* If non-zero, call cat, otherwise call simple_cat to do the actual work. */
+/* If nonzero, call cat, otherwise call simple_cat to do the actual work. */
   int options = 0;
 
-  /* If non-zero, display usage information and exit.  */
+  /* If nonzero, display usage information and exit.  */
   static int show_help;
 
-  /* If non-zero, print the version on standard output then exit.  */
+  /* If nonzero, print the version on standard output then exit.  */
   static int show_version;
 
   static struct option const long_options[] =
diff --git a/src/cksum.c b/src/cksum.c
index d59a0b66c..c5c8c020e 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -117,10 +117,10 @@ main ()
 /* The name this program was run with.  */
 char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/comm.c b/src/comm.c
index 3238e3b71..8ecfa7a9b 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -43,10 +43,10 @@ static int only_file_2;
 /* If nonzero, print lines that are found in both files. */
 static int both;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/csplit.c b/src/csplit.c
index fea732246..fee898a6e 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -214,10 +214,10 @@ static struct control *controls;
 /* Number of elements in `controls'. */
 static unsigned int control_used;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/cut.c b/src/cut.c
index 89d2add95..a4ee26ac9 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -158,7 +158,7 @@ char *program_name;
 
 static enum operating_mode operating_mode;
 
-/* If non-zero do not output lines containing no delimeter characters.
+/* If nonzero do not output lines containing no delimeter characters.
    Otherwise, all such lines are printed.  This option is valid only
    with field mode.  */
 static int suppress_non_delimited;
@@ -169,10 +169,10 @@ static int delim;
 /* Nonzero if we have ever read standard input. */
 static int have_read_stdin;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
@@ -321,7 +321,7 @@ print_kth (unsigned int k)
    to its starting index.  FIELDSTR should be composed of one or more
    numbers or ranges of numbers, separated by blanks or commas.
    Incomplete ranges may be given: `-m' means `1-m'; `n-' means `n'
-   through end of line.  Return non-zero if FIELDSTR contains at least
+   through end of line.  Return nonzero if FIELDSTR contains at least
    one field specification, zero otherwise.  */
 
 /* FIXME-someday:  What if the user wants to cut out the 1,000,000-th field
diff --git a/src/expand.c b/src/expand.c
index 06f1e9541..f4939c771 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -90,10 +90,10 @@ static int have_read_stdin;
 /* Status to return to the system. */
 static int exit_status;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/fmt.c b/src/fmt.c
index f4d616185..87890d22f 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -163,10 +163,10 @@ static void put_space __P ((int space));
 /* The name this program was run with.  */
 const char *program_name;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help = 0;
 
-/* If non-zero, print the version on standard output and exit.  */
+/* If nonzero, print the version on standard output and exit.  */
 static int show_version = 0;
 
 /* Option values.  */
@@ -256,7 +256,7 @@ static int next_char;
    after the current paragraph.  */
 static int next_prefix_indent;
 
-/* If non-zero, the length of the last line output in the current
+/* If nonzero, the length of the last line output in the current
    paragraph, used to charge for raggedness at the split point for long
    paragraphs chosen by fmt_paragraph().  */
 static int last_line_length;
diff --git a/src/fold.c b/src/fold.c
index 114924e6b..7a9605d4d 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -44,10 +44,10 @@ static int count_bytes;
 /* If nonzero, at least one of the files we read was standard input. */
 static int have_read_stdin;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/head.c b/src/head.c
index da4fb7251..35cab86ad 100644
--- a/src/head.c
+++ b/src/head.c
@@ -60,10 +60,10 @@ char *program_name;
 /* Have we ever read standard input?  */
 static int have_read_stdin;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/join.c b/src/join.c
index b674c9699..5f5e3a1b5 100644
--- a/src/join.c
+++ b/src/join.c
@@ -618,7 +618,7 @@ add_field (int file, int field)
 /* Convert a single field specifier string, S, to a *FILE_INDEX, *FIELD_INDEX
    pair.  In S, the field index string is 1-based; *FIELD_INDEX is zero-based.
    If S is valid, return zero.  Otherwise, give a diagnostic, don't update
-   *FILE_INDEX or *FIELD_INDEX, and return non-zero.  */
+   *FILE_INDEX or *FIELD_INDEX, and return nonzero.  */
 
 static int
 decode_field_spec (const char *s, int *file_index, int *field_index)
@@ -672,7 +672,7 @@ decode_field_spec (const char *s, int *file_index, int *field_index)
 }
 
 /* Add the comma or blank separated field spec(s) in STR to `outlist'.
-   Return non-zero to indicate failure.  */
+   Return nonzero to indicate failure.  */
 
 static int
 add_field_list (const char *c_str)
diff --git a/src/nl.c b/src/nl.c
index 6a816623c..c596ce7d1 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -139,10 +139,10 @@ static int line_no;
 /* Nonzero if we have ever read standard input. */
 static int have_read_stdin;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/od.c b/src/od.c
index 59386d230..deea3671b 100644
--- a/src/od.c
+++ b/src/od.c
@@ -222,15 +222,15 @@ static const char *(*format_address) __P ((long unsigned int));
 /* The number of input bytes to skip before formatting and writing.  */
 static off_t n_bytes_to_skip = 0;
 
-/* When non-zero, MAX_BYTES_TO_FORMAT is the maximum number of bytes
+/* When nonzero, MAX_BYTES_TO_FORMAT is the maximum number of bytes
    to be read and formatted.  Otherwise all input is formatted.  */
 static int limit_bytes_to_format = 0;
 
 /* The maximum number of bytes that will be formatted.  This
-   value is used only when LIMIT_BYTES_TO_FORMAT is non-zero.  */
+   value is used only when LIMIT_BYTES_TO_FORMAT is nonzero.  */
 static off_t max_bytes_to_format;
 
-/* When non-zero and two or more consecutive blocks are equal, format
+/* When nonzero and two or more consecutive blocks are equal, format
    only the first block and output an asterisk alone on the following
    line to indicate that identical blocks have been elided.  */
 static int abbreviate_duplicate_blocks = 1;
@@ -262,7 +262,7 @@ static char const *const *file_list;
 /* The input stream associated with the current file.  */
 static FILE *in_stream;
 
-/* If non-zero, at least one of the files we read was standard input.  */
+/* If nonzero, at least one of the files we read was standard input.  */
 static int have_read_stdin;
 
 #define LONGEST_INTEGRAL_TYPE long int
@@ -273,10 +273,10 @@ static enum size_spec integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1];
 #define MAX_FP_TYPE_SIZE sizeof(LONG_DOUBLE)
 static enum size_spec fp_type_size[MAX_FP_TYPE_SIZE + 1];
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -607,7 +607,7 @@ print_ascii (long unsigned int n_bytes, const char *block,
    unsigned long integer value.  If S points to a non-digit set *P to S,
    *VAL to 0, and return 0.  Otherwise, accumulate the integer value of
    the string of digits.  If the string of digits represents a value
-   larger than ULONG_MAX, don't modify *VAL or *P and return non-zero.
+   larger than ULONG_MAX, don't modify *VAL or *P and return nonzero.
    Otherwise, advance *P to the first non-digit after S, set *VAL to
    the result of the conversion and return zero.  */
 
@@ -633,7 +633,7 @@ simple_strtoul (const char *s, const char **p, long unsigned int *val)
    description of that format in *TSPEC, make *NEXT point at the character
    following the just-decoded format (if *NEXT is non-NULL), and return
    zero.  If S is not valid, don't modify *NEXT or *TSPEC and return
-   non-zero.  For example, if S were "d4afL" *NEXT would be set to "afL"
+   nonzero.  For example, if S were "d4afL" *NEXT would be set to "afL"
    and *TSPEC would be
      {
        fmt = SIGNED_DECIMAL;
@@ -873,7 +873,7 @@ decode_one_format (const char *s, const char **next, struct tspec *tspec)
 
 /* Decode the POSIX-style od format string S.  Append the decoded
    representation to the global array SPEC, reallocating SPEC if
-   necessary.  Return zero if S is valid, non-zero otherwise.  */
+   necessary.  Return zero if S is valid, nonzero otherwise.  */
 
 static int
 decode_format_string (const char *s)
@@ -909,7 +909,7 @@ decode_format_string (const char *s)
    file pointer IN_STREAM to position N_SKIP in the concatenation of
    those files.  If any file operation fails or if there are fewer than
    N_SKIP bytes in the combined input, give an error message and return
-   non-zero.  When possible, use seek- rather than read operations to
+   nonzero.  When possible, use seek- rather than read operations to
    advance IN_STREAM.  A file name of "-" is interpreted as standard
    input.  */
 
@@ -1101,7 +1101,7 @@ write_block (long unsigned int current_offset, long unsigned int n_bytes,
 }
 
 /* Test whether there have been errors on in_stream, and close it if
-   it is not standard input.  Return non-zero if there has been an error
+   it is not standard input.  Return nonzero if there has been an error
    on in_stream or stdout; return zero otherwise.  This function will
    report more than one error only if both a read and a write error
    have occurred.  */
@@ -1143,7 +1143,7 @@ check_and_close (void)
    the list.  Then try to read a byte from the newly opened file.
    Repeat if necessary until *FILE_LIST is NULL.  When EOF is reached
    for the last file in FILE_LIST, set *C to EOF and return.  Subsequent
-   calls do likewise.  The return value is non-zero if any errors
+   calls do likewise.  The return value is nonzero if any errors
    occured, zero otherwise.  */
 
 static int
@@ -1205,7 +1205,7 @@ read_char (int *c)
    Repeat if necessary until *FILE_LIST is NULL.  Set *N_BYTES_IN_BUFFER
    to the number of bytes read.  If an error occurs, it will be detected
    through ferror when the stream is about to be closed.  If there is an
-   error, give a message but continue reading as usual and return non-zero.
+   error, give a message but continue reading as usual and return nonzero.
    Otherwise return zero.  */
 
 static int
@@ -1330,7 +1330,7 @@ parse_old_offset (const char *s)
    multiple of all format spec sizes.  Write the final block.  Finally,
    write on a line by itself the offset of the byte after the last byte
    read.  Accumulate return values from calls to read_block and
-   check_and_close, and if any was non-zero, return non-zero.
+   check_and_close, and if any was nonzero, return nonzero.
    Otherwise, return zero.  */
 
 static int
@@ -1423,7 +1423,7 @@ dump (void)
    A string constant is a run of at least `string_min' ASCII
    graphic (or formatting) characters terminated by a null.
    Based on a function written by Richard Stallman for a
-   pre-POSIX version of od.  Return non-zero if an error
+   pre-POSIX version of od.  Return nonzero if an error
    occurs.  Otherwise, return zero.  */
 
 static int
diff --git a/src/paste.c b/src/paste.c
index 5a3467ed4..50e53b177 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -77,10 +77,10 @@ static char *delims;
 /* A pointer to the character after the end of `delims'. */
 static char *delim_end;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/pr.c b/src/pr.c
index 465a06c16..99fea937b 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -324,7 +324,7 @@ static int output_position;
    Important for converting tabs to spaces on input. */
 static int input_position;
 
-/* Count number of failed opens so we can exit with non-zero
+/* Count number of failed opens so we can exit with nonzero
    status if there were any.  */
 static int failed_opens = 0;
 
@@ -427,10 +427,10 @@ static int *clump_buff;
 /* True means we truncate lines longer than chars_per_column. */
 static int truncate_lines = FALSE;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/split.c b/src/split.c
index 9df7e6992..d589a9f9d 100644
--- a/src/split.c
+++ b/src/split.c
@@ -70,13 +70,13 @@ static int input_desc;
 /* Descriptor on which output file is open.  */
 static int output_desc;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
-/* If non-zero, print a diagnostic on standard error just before each
+/* If nonzero, print a diagnostic on standard error just before each
    output file is opened. */
 static int verbose;
 
diff --git a/src/sum.c b/src/sum.c
index f43917fb2..20713540c 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -39,10 +39,10 @@ static int have_read_stdin;
 /* Right-rotate 32-bit integer variable C. */
 #define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x8000; else (c) >>= 1;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/tac.c b/src/tac.c
index a2ca2fe6d..bcf352e7c 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -103,10 +103,10 @@ static struct re_pattern_buffer compiled_separator;
 /* The name of a temporary file containing a copy of pipe input. */
 static char *tempfile;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/tail.c b/src/tail.c
index 1613412a7..99ad6c8d3 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -113,10 +113,10 @@ char *program_name;
 /* Nonzero if we have ever read standard input.  */
 static int have_read_stdin;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
diff --git a/src/tr.c b/src/tr.c
index 41f14fedf..eda215664 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -196,7 +196,7 @@ struct Spec_list
     /* The number of [c*] and [c*0] constructs that appear in this spec.  */
     int n_indefinite_repeats;
 
-    /* If n_indefinite_repeats is non-zero, this points to the List_element
+    /* If n_indefinite_repeats is nonzero, this points to the List_element
        corresponding to the last [c*] or [c*0] construct encountered in
        this spec.  Otherwise it is undefined.  */
     struct List_element *indefinite_repeat_element;
@@ -225,7 +225,7 @@ struct E_string
   size_t len;
 };
 
-/* Return non-zero if the Ith character of escaped string ES matches C
+/* Return nonzero if the Ith character of escaped string ES matches C
    and is not escaped itself.  */
 #define ES_MATCH(ES, I, C) ((ES)->s[(I)] == (C) && !(ES)->escaped[(I)])
 
@@ -237,29 +237,29 @@ int safe_read ();
 /* The name by which this program was run.  */
 char *program_name;
 
-/* When non-zero, each sequence in the input of a repeated character
+/* When nonzero, each sequence in the input of a repeated character
    (call it c) is replaced (in the output) by a single occurrence of c
    for every c in the squeeze set.  */
 static int squeeze_repeats = 0;
 
-/* When non-zero, removes characters in the delete set from input.  */
+/* When nonzero, removes characters in the delete set from input.  */
 static int delete = 0;
 
 /* Use the complement of set1 in place of set1.  */
 static int complement = 0;
 
-/* When non-zero, this flag causes GNU tr to provide strict
+/* When nonzero, this flag causes GNU tr to provide strict
    compliance with POSIX draft 1003.2.11.2.  The POSIX spec
    says that when -d is used without -s, string2 (if present)
    must be ignored.  Silently ignoring arguments is a bad idea.
    The default GNU behavior is to give a usage message and exit.
-   Additionally, when this flag is non-zero, tr prints warnings
+   Additionally, when this flag is nonzero, tr prints warnings
    on stderr if it is being used in a manner that is not portable.
    Applicable warnings are given by default, but are suppressed
    if the environment variable `POSIXLY_CORRECT' is set, since
    being POSIX conformant means we can't issue such messages.
    Warnings on the following topics are suppressed when this
-   variable is non-zero:
+   variable is nonzero:
    1. Ambiguous octal escapes.  */
 static int posix_pedantic;
 
@@ -275,7 +275,7 @@ static int posix_pedantic;
    corresponding character in string2.  That is, string1 is effectively
    truncated to the length of string2.
 
-   When non-zero, this flag causes GNU tr to imitate the behavior
+   When nonzero, this flag causes GNU tr to imitate the behavior
    of System V tr when translating with string1 longer than string2.
    The default is to emulate BSD tr.  This flag is ignored in modes where
    no translation is performed.  Emulating the System V tr
@@ -330,10 +330,10 @@ static SET_TYPE in_delete_set[N_CHARS];
    two specification strings and the delete switch is not given.  */
 static char xlate[N_CHARS];
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const long_options[] =
@@ -417,7 +417,7 @@ translation or deletion.\n\
   exit (status);
 }
 
-/* Return non-zero if the character C is a member of the
+/* Return nonzero if the character C is a member of the
    equivalence class containing the character EQUIV_CLASS.  */
 
 static int
@@ -426,7 +426,7 @@ is_equiv_class_member (unsigned int equiv_class, unsigned int c)
   return (equiv_class == c);
 }
 
-/* Return non-zero if the character C is a member of the
+/* Return nonzero if the character C is a member of the
    character class CHAR_CLASS.  */
 
 static int
@@ -482,7 +482,7 @@ is_char_class_member (enum Char_class char_class, unsigned int c)
 /* Perform the first pass over each range-spec argument S, converting all
    \c and \ddd escapes to their one-byte representations.  The conversion
    is done in-place, so S must point to writable storage.  If an invalid
-   quote sequence is found print an error message and return non-zero.
+   quote sequence is found print an error message and return nonzero.
    Otherwise set *LEN to the length of the resulting string and return
    zero.  The resulting array of characters may contain zero-bytes;
    however, on input, S is assumed to be null-terminated, and hence
@@ -720,7 +720,7 @@ append_normal_char (struct Spec_list *list, unsigned int c)
 
 /* Append a newly allocated structure representing the range
    of characters from FIRST to LAST to the specification list LIST.
-   Return non-zero if LAST precedes FIRST in the collating sequence,
+   Return nonzero if LAST precedes FIRST in the collating sequence,
    zero otherwise.  This means that '[c-c]' is acceptable.  */
 
 static int
@@ -754,7 +754,7 @@ append_range (struct Spec_list *list, unsigned int first, unsigned int last)
 /* If CHAR_CLASS_STR is a valid character class string, append a
    newly allocated structure representing that character class to the end
    of the specification list LIST and return 0.  If CHAR_CLASS_STR is not
-   a valid string return non-zero.  */
+   a valid string return nonzero.  */
 
 static int
 append_char_class (struct Spec_list *list,
@@ -801,7 +801,7 @@ append_repeated_char (struct Spec_list *list, unsigned int the_char,
    the length of that string, LEN, if LEN is exactly one, append
    a newly allocated structure representing the specified
    equivalence class to the specification list, LIST and return zero.
-   If LEN is not 1, return non-zero.  */
+   If LEN is not 1, return nonzero.  */
 
 static int
 append_equiv_class (struct Spec_list *list,
@@ -844,7 +844,7 @@ substr (const unsigned char *p, size_t first_idx, size_t last_idx)
 /* Search forward starting at START_IDX for the 2-char sequence
    (PRE_BRACKET_CHAR,']') in the string P of length P_LEN.  If such
    a sequence is found, set *RESULT_IDX to the index of the first
-   character and return non-zero. Otherwise return zero.  P may contain
+   character and return nonzero. Otherwise return zero.  P may contain
    zero bytes.  */
 
 static int
@@ -867,7 +867,7 @@ find_closing_delim (const struct E_string *es, size_t start_idx,
    containing embedded zero bytes, to a long integer value.
    If the string represents a negative value, a value larger
    than LONG_MAX, or if all LEN characters do not represent a
-   valid integer, return non-zero and do not modify *VAL.
+   valid integer, return nonzero and do not modify *VAL.
    Otherwise, return zero and set *VAL to the converted value.  */
 
 static int
@@ -961,7 +961,7 @@ find_bracketed_repeat (const struct E_string *es, size_t start_idx,
   return -1;			/* No bracket found.  */
 }
 
-/* Return non-zero if the string at ES->s[IDX] matches the regular
+/* Return nonzero if the string at ES->s[IDX] matches the regular
    expression `\*[0-9]*\]', zero otherwise.  To match, the `*' and
    the `]' must not be escaped.  */
 
@@ -1089,7 +1089,7 @@ build_spec_list (const struct E_string *es, struct Spec_list *result)
 		    }
 		  free (opnd_str);
 
-		  /* Return non-zero if append_*_class reports a problem.  */
+		  /* Return nonzero if append_*_class reports a problem.  */
 		  if (parse_failed)
 		    return 1;
 		  else
@@ -1423,7 +1423,7 @@ spec_init (struct Spec_list *spec_list)
    one converts all \c and \ddd escapes to their one-byte representations.
    The second constructs a linked specification list, SPEC_LIST, of the
    characters and constructs that comprise the argument string.  If either
-   of these passes detects an error, this function returns non-zero.  */
+   of these passes detects an error, this function returns nonzero.  */
 
 static int
 parse_str (const unsigned char *s, struct Spec_list *spec_list)
@@ -1769,7 +1769,7 @@ read_and_xlate (unsigned char *buf, long int size, PFI not_used)
 /* Initialize a boolean membership set IN_SET with the character
    values obtained by traversing the linked list of constructs S
    using the function `get_next'.  If COMPLEMENT_THIS_SET is
-   non-zero the resulting set is complemented.  */
+   nonzero the resulting set is complemented.  */
 
 static void
 set_initialize (struct Spec_list *s, int complement_this_set, SET_TYPE *in_set)
diff --git a/src/unexpand.c b/src/unexpand.c
index c019ce07f..9ea05ab15 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -92,10 +92,10 @@ static int have_read_stdin;
 /* Status to return to the system. */
 static int exit_status;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/uniq.c b/src/uniq.c
index 10c36d194..aa2b4e441 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -66,10 +66,10 @@ enum output_mode
 /* Which lines to output. */
 static enum output_mode mode;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exit.  */
+/* If nonzero, print the version on standard output then exit.  */
 static int show_version;
 
 static struct option const longopts[] =
diff --git a/src/wc.c b/src/wc.c
index 17d67e587..bb903f1a2 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -47,10 +47,10 @@ static int have_read_stdin;
 /* The error code to return to the system. */
 static int exit_status;
 
-/* If non-zero, display usage information and exit.  */
+/* If nonzero, display usage information and exit.  */
 static int show_help;
 
-/* If non-zero, print the version on standard output then exits.  */
+/* If nonzero, print the version on standard output then exits.  */
 static int show_version;
 
 static struct option const longopts[] =