bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: removing empty parens after function names


From: Paul Eggert
Subject: Re: removing empty parens after function names
Date: Tue, 18 Dec 2007 00:01:41 -0800
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux)

address@hidden (Karl Berry) writes:

> rms just requested that we remove the empty parentheses after function
> names on, e.g., http://www.gnu.org/software/gnulib/MODULES.html.  He
> refers to the "GNU Manuals" node of standards.texi,

Here's a first draft of a patch to do this.  It touches many modules;
I yet haven't tried to untangle them or to generate a ChangeLog.
MODULES.html.sh is affected, I guess (I haven't looked into the
details or tried to run the result) and so is a lot of code.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index e825ce3..0af930b 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1409,7 +1409,8 @@ func_module ()
     element=`gnulib-tool --extract-description $1 \
              | sed -e "$sed_lt" -e "$sed_gt" -e 
"$sed_remove_trailing_empty_line" \
                    -e 's,^, ,' \
-                   -e 's,\([^a-zA-Z_]\)'"${posix_functions}"'(),\1<A 
HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A>(),g' \
+                   -e 's,\([^a-zA-Z_]\)'"${posix_functions}"' function:,\1<A 
HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A> function:,g' \
+                   -e 's,\([^a-zA-Z_]\)'"${posix_functions}"' macro:,\1<A 
HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A> macro:,g' \
                    -e 's,^ ,,'`
     func_echo "<TD ALIGN=LEFT VALIGN=TOP WIDTH=\"80%\">$element"
 
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index cc087d0..437c39b 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2007-07-22 16:09'; # UTC
+my $VERSION = '2007-12-18 07:17'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -37,8 +37,8 @@ my %valid_release_types = map {$_ => 1} qw (alpha beta major);
 
 END
 {
-  # Nobody ever checks the status of print()s.  That's okay, because
-  # if any do fail, we're guaranteed to get an indicator when we close()
+  # Nobody ever checks the status of calls to 'print'.  That's okay, because
+  # if any do fail, we're guaranteed to get an indicator when we close
   # the filehandle.
   #
   # Close stdout now, and if there were no errors, return happy status.
@@ -53,7 +53,7 @@ END
 
   # Don't be so arrogant as to assume that we're the first END handler
   # defined, and thus the last one invoked.  There may be others yet
-  # to come.  $? will be passed on to them, and to the final _exit().
+  # to come.  $? will be passed on to them, and to the final _exit call.
   #
   # If it isn't already an error, make it one (and if it _is_ an error,
   # preserve the value: it might be important).
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 302cbf6..dd50fdc 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-12-12'
+timestamp='2007-12-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -414,7 +414,7 @@ case 
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
+#include <stdio.h>  /* for printf prototype */
        int main (int argc, char *argv[]) {
 #else
        int main (argc, argv) int argc; char *argv[]; {
diff --git a/doc/alloca-opt.texi b/doc/alloca-opt.texi
index 307a8f1..cf59666 100644
--- a/doc/alloca-opt.texi
+++ b/doc/alloca-opt.texi
@@ -9,17 +9,17 @@
 @c Texts.  A copy of the license is included in the ``GNU Free
 @c Documentation License'' file as part of this distribution.
 
-The alloca-opt module provides for a function alloca() which allocates memory
-on the stack, where the system allows it. A memory block allocated with 
alloca()
-exists only until the function that calls alloca() returns or exits abruptly.
+The alloca-opt module provides for a function alloca which allocates memory
+on the stack, where the system allows it. A memory block allocated with alloca
+exists only until the function that calls alloca returns or exits abruptly.
 
 There are a few systems where this is not possible: HP-UX systems, and some
 other platforms when the C++ compiler is used. On these platforms the 
alloca-opt
 module provides no replacement, just a preprocessor macro HAVE_ALLOCA.
 
-The user can #include <alloca.h> on all platforms, and use alloca() on those
+The user can #include <alloca.h> on all platforms, and use alloca on those
 platforms where the preprocessor macro HAVE_ALLOCA evaluates to true. If
 HAVE_ALLOCA is false, the code should use a heap-based memory allocation
-based on malloc() or - in C++ - 'new'. Note that the #include <alloca.h> must 
be
+based on malloc or - in C++ - 'new'. Note that the #include <alloca.h> must be
 the first one after the autoconf-generated config.h. Thanks to AIX for this 
nice
 restriction!
diff --git a/doc/alloca.texi b/doc/alloca.texi
index 7041039..11733a7 100644
--- a/doc/alloca.texi
+++ b/doc/alloca.texi
@@ -9,19 +9,19 @@
 @c Texts.  A copy of the license is included in the ``GNU Free
 @c Documentation License'' file as part of this distribution.
 
-The alloca module provides for a function alloca() which allocates memory
-on the stack, where the system allows it. A memory block allocated with 
alloca()
-exists only until the function that calls alloca() returns or exits abruptly.
+The alloca module provides for a function alloca which allocates memory
+on the stack, where the system allows it. A memory block allocated with alloca
+exists only until the function that calls alloca returns or exits abruptly.
 
 There are a few systems where this is not possible: HP-UX systems, and some
 other platforms when the C++ compiler is used. On these platforms the alloca
-module provides a malloc() based emulation. This emulation will not free a
+module provides a malloc based emulation. This emulation will not free a
 memory block immediately when the calling function returns, but rather will
-wait until the next alloca() call from a function with the same or a shorter
+wait until the next alloca call from a function with the same or a shorter
 stack length. Thus, in some cases, a few memory blocks will be kept although
 they are not needed any more.
 
-The user can #include <alloca.h> and use alloca() on all platforms. Note
+The user can #include <alloca.h> and use alloca on all platforms. Note
 that the #include <alloca.h> must be the first one after the autoconf-generated
 config.h. Thanks to AIX for this nice restriction!
 
diff --git a/doc/error.texi b/doc/error.texi
index 3a80486..24ab0a0 100644
--- a/doc/error.texi
+++ b/doc/error.texi
@@ -18,9 +18,9 @@ does not depend on the @code{progname} module.  Why?  Because
 @code{error} is released under the LGPL, whereas @code{progname} is
 GPL.  RMS does not want additional baggage accompanying the
 @code{error} module, so an LGPL user must provide their own
-replacement @code{program_name}, and a GPL user should manually 
+replacement @code{program_name}, and a GPL user should manually
 specify using the @code{progname} module.
 
 Additionally, using the @code{progname} module is not something that
-can be done implicitly. It requires that every @code{main()} function
+can be done implicitly. It requires that every @code{main} function
 be modified to set @code{program_name} as one of its first actions.
diff --git a/doc/functions/errno.texi b/doc/functions/errno.texi
index 1e7fa11..dfd83e6 100644
--- a/doc/functions/errno.texi
+++ b/doc/functions/errno.texi
@@ -14,5 +14,5 @@ Portability problems not fixed by Gnulib:
 @itemize
 @item
 On Windows, the socket functions don't set @code{errno}; their error code is
-available through @code{WSAGetLastError()} instead.
+available through @code{WSAGetLastError} instead.
 @end itemize
diff --git a/doc/gnulib-intro.texi b/doc/gnulib-intro.texi
index d5d7408..4663160 100644
--- a/doc/gnulib-intro.texi
+++ b/doc/gnulib-intro.texi
@@ -35,7 +35,7 @@ that.
 Similarly, Gnulib has a facility for executing a command in a
 subprocess.  It is at the same time a portability enhancement (it
 works on GNU, Unix, and Windows, compared to the classical
address@hidden()}/@code{exec()} which is not portable to Windows), as well
address@hidden/@code{exec} which is not portable to Windows), as well
 as an application aid: it takes care of redirecting stdin and/or
 stdout if desired, and emits an error message if the subprocess
 failed.
@@ -175,7 +175,7 @@ C++ language or from the Linux kernel.
 @subsection Interfaces to external libraries
 
 Examples are the @samp{iconv} module, which interfaces to the
address@hidden()} facility, regardless whether it is contained in libc or in
address@hidden function, regardless whether it is contained in libc or in
 an external @code{libiconv}.  Or the @samp{readline} module, which
 interfaces to the GNU readline library.
 
@@ -299,4 +299,3 @@ locally add modules that are treated like Gnulib modules by
 @end enumerate
 
 This is achieved by the @samp{--local-dir} option of @code{gnulib-tool}.
-
diff --git a/gnulib-tool b/gnulib-tool
index 1cdb902..4e381ba 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1766,7 +1766,7 @@ EXTRA_LOCALE_CATEGORIES =
 
 # This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
 # context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
+# package uses functions taking also a message context, like pgettext, or
 # if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
 USE_MSGCTXT = no
 EOF
diff --git a/lib/areadlink.c b/lib/areadlink.c
index 4e770eb..1745630 100644
--- a/lib/areadlink.c
+++ b/lib/areadlink.c
@@ -52,8 +52,8 @@ areadlink (char const *filename)
 #define INITIAL_BUF_SIZE 1024
 
   /* Allocate the initial buffer on the stack.  This way, in the common
-     case of a symlink of small size, we get away with a single small malloc()
-     instead of a big malloc() followed by a shrinking realloc().  */
+     case of a symlink of small size, we get away with a single small malloc
+     instead of a big malloc followed by a shrinking realloc().  */
   char initial_buf[INITIAL_BUF_SIZE];
 
   char *buffer = initial_buf;
diff --git a/lib/argp-help.c b/lib/argp-help.c
index 4c0ca60..f1a03ad 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -88,11 +88,11 @@ struct uparams
   int dup_args_note;
 
   /* Various output columns.  */
-  int short_opt_col;      /* column in which short options start */   
-  int long_opt_col;       /* column in which long options start */ 
+  int short_opt_col;      /* column in which short options start */
+  int long_opt_col;       /* column in which long options start */
   int doc_opt_col;        /* column in which doc options start */
   int opt_doc_col;        /* column in which option text starts */
-  int header_col;         /* column in which group headers are printed */ 
+  int header_col;         /* column in which group headers are printed */
   int usage_indent;       /* indentation of wrapped usage lines */
   int rmargin;            /* right margin used for wrapping */
 
@@ -160,7 +160,7 @@ fill_in_uparams (const struct argp_state *state)
 {
   const char *var = getenv ("ARGP_HELP_FMT");
   struct uparams new_params = uparams;
-  
+
 #define SKIPWS(p) do { while (isspace ((unsigned char) *p)) p++; } while (0);
 
   if (var)
@@ -169,7 +169,7 @@ fill_in_uparams (const struct argp_state *state)
       while (*var)
        {
          SKIPWS (var);
-         
+
          if (isalpha ((unsigned char) *var))
            {
              size_t var_len;
@@ -180,9 +180,9 @@ fill_in_uparams (const struct argp_state *state)
              while (isalnum ((unsigned char) *arg) || *arg == '-' || *arg == 
'_')
                arg++;
              var_len = arg - var;
-             
+
              SKIPWS (arg);
-             
+
              if (*arg == '\0' || *arg == ',')
                unspec = 1;
              else if (*arg == '=')
@@ -190,7 +190,7 @@ fill_in_uparams (const struct argp_state *state)
                  arg++;
                  SKIPWS (arg);
                }
-             
+
              if (unspec)
                {
                  if (var[0] == 'n' && var[1] == 'o' && var[2] == '-')
@@ -209,7 +209,7 @@ fill_in_uparams (const struct argp_state *state)
                    arg++;
                  SKIPWS (arg);
                }
-             
+
              for (un = uparam_names; un->name; un++)
                if (strlen (un->name) == var_len
                    && strncmp (var, un->name, var_len) == 0)
@@ -676,7 +676,7 @@ hol_cluster_cmp (const struct hol_cluster *cl1, const 
struct hol_cluster *cl2)
 {
   /* If one cluster is deeper than the other, use its ancestor at the same
      level, so that finding the common ancestor is straightforward.
-     
+
      clN->depth > 0 means that clN->parent != NULL (see hol_add_cluster) */
   while (cl1->depth > cl2->depth)
     cl1 = cl1->parent;
@@ -806,7 +806,7 @@ hol_entry_cmp (const struct hol_entry *entry1,
 #endif
          /* Compare ignoring case, except when the options are both the
             same letter, in which case lower-case always comes first.  */
-         return lower_cmp ? lower_cmp : 
+         return lower_cmp ? lower_cmp :
                     (rc = first2 - first1) ?
                     rc : HOL_ENTRY_PTRCMP(entry1, entry2);
        }
@@ -1842,7 +1842,7 @@ __argp_error (const struct argp_state *state, const char 
*fmt, ...)
 weak_alias (__argp_error, argp_error)
 #endif

-/* Similar to the standard gnu error-reporting function error(), but will
+/* Similar to the standard gnu error-reporting function 'error', but will
    respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
    to STATE->err_stream.  This is useful for argument parsing code that is
    shared between program startup (when exiting is desired) and runtime
diff --git a/lib/argp.h b/lib/argp.h
index aa76eb4..a9ce6c7 100644
--- a/lib/argp.h
+++ b/lib/argp.h
@@ -234,7 +234,7 @@ struct argp
      none was supplied).  If KEY isn't understood, ARGP_ERR_UNKNOWN should be
      returned.  If a non-zero, non-ARGP_ERR_UNKNOWN value is returned, then
      parsing is stopped immediately, and that value is returned from
-     argp_parse().  For special (non-user-supplied) values of KEY, see the
+     argp_parse.  For special (non-user-supplied) values of KEY, see the
      ARGP_KEY_ definitions below.  */
   argp_parser_t parser;
 
@@ -536,7 +536,7 @@ extern void __argp_error (const struct argp_state 
*__restrict __state,
                          const char *__restrict __fmt, ...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
 
-/* Similar to the standard gnu error-reporting function error(), but will
+/* Similar to the standard gnu error-reporting function 'error', but will
    respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
    to STATE->err_stream.  This is useful for argument parsing code that is
    shared between program startup (when exiting is desired) and runtime
diff --git a/lib/argz.c b/lib/argz.c
index 9c18319..db6dc0b 100644
--- a/lib/argz.c
+++ b/lib/argz.c
@@ -156,7 +156,7 @@ argz_insert (char **pargz, size_t *pargz_len, char *before, 
const char *entry)
       return ENOMEM;
 
     /* Make BEFORE point to the equivalent offset in ARGZ that it
-       used to have in *PARGZ incase realloc() moved the block.  */
+       used to have in *PARGZ in case realloc moved the block.  */
     before = argz + offset;
 
     /* Move the ARGZ entries starting at BEFORE up into the new
diff --git a/lib/backupfile.c b/lib/backupfile.c
index 1420edd..0d564cd 100644
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -80,7 +80,7 @@
    of `digit' even when the host does not conform to POSIX.  */
 #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
 
-/* The results of opendir() in this file are not used with dirfd and fchdir,
+/* The results of opendir in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef opendir
 #undef closedir
diff --git a/lib/basename.c b/lib/basename.c
index 426ed40..b279618 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -60,7 +60,7 @@ last_component (char const *name)
    Return the last file name component of NAME, allocated with
    xmalloc.  On systems with drive letters, a leading "./"
    distinguishes relative names that would otherwise look like a drive
-   letter.  Unlike POSIX basename(), NAME cannot be NULL,
+   letter.  Unlike POSIX basename, NAME cannot be NULL,
    base_name("") returns "", and the first trailing slash is not
    stripped.
 
diff --git a/lib/binary-io.h b/lib/binary-io.h
index 273d35a..28d4170 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -42,10 +42,10 @@
 #  define fileno _fileno
 # endif
 # if defined __DJGPP__ || defined __CYGWIN__
-#  include <io.h> /* declares setmode() */
+#  include <io.h> /* declares setmode */
 # endif
 # ifdef __DJGPP__
-#  include <unistd.h> /* declares isatty() */
+#  include <unistd.h> /* declares isatty */
 #  /* Avoid putting stdin/stdout in binary mode if it is connected to the
 #     console, because that would make it impossible for the user to
 #     interrupt the program through Ctrl-C or Ctrl-Break.  */
diff --git a/lib/calloc.c b/lib/calloc.c
index 554a58d..fbf0452 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,4 +1,4 @@
-/* calloc() function that is glibc compatible.
+/* calloc function that is glibc compatible.
    This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
diff --git a/lib/canon-host.c b/lib/canon-host.c
index b5aa1b7..94daf7a 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -29,7 +29,7 @@
 static int last_cherror;
 
 /* Single-threaded of wrapper for canon_host_r.  After a NULL return, error
-   messages may be retrieved via ch_strerror().  */
+   messages may be retrieved via ch_strerror.  */
 char *
 canon_host (const char *host)
 {
@@ -39,7 +39,7 @@ canon_host (const char *host)
 /* Return a malloc'd string containing the canonical hostname associated with
    HOST, or NULL if a canonical name cannot be determined.  On NULL return,
    if CHERROR is not NULL, set *CHERROR to an error code as returned by
-   getaddrinfo().  Use ch_strerror_r() or gai_strerror() to convert a *CHERROR
+   getaddrinfo.  Use ch_strerror_r() or gai_strerror() to convert a *CHERROR
    value to a string suitable for error messages.
 
    WARNINGS
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index e8d2b65..5b3cd3d 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -17,7 +17,7 @@
 
 #include <config.h>
 
-/* Avoid a clash of our rpl_realpath() function with the prototype in
+/* Avoid a clash of our rpl_realpath function with the prototype in
    <stdlib.h> on Solaris 2.5.1.  */
 #undef realpath
 
@@ -77,7 +77,7 @@
 #  define __getcwd(buf, max) getwd (buf)
 # endif
 # define __readlink readlink
-  /* On systems without symbolic links, call stat() instead of lstat().  */
+  /* On systems without symbolic links, call stat instead of lstat.  */
 # if !defined S_ISNLK && !HAVE_READLINK
 #  define lstat stat
 # endif
diff --git a/lib/chown.c b/lib/chown.c
index 3582b04..f6a0092 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -29,10 +29,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
-/* Below we refer to the system's chown().  */
+/* Below we refer to the system's chown.  */
 #undef chown
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index 283d8af..079d434 100644
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -71,7 +71,7 @@
 #endif
 
 #if !GNULIB_FCNTL_SAFER
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 # undef open
 # undef close
@@ -142,10 +142,10 @@ static gl_list_t /* <int> */ volatile descriptors;
 
    Criterion 3) would also discourage GL_ARRAY_LIST and GL_CARRAY_LIST,
    if they were not already excluded.  Namely, these implementations use
-   xrealloc(), leaving a time window in which in the list->elements pointer
+   xrealloc, leaving a time window in which in the list->elements pointer
    points to already deallocated memory.  To avoid a crash in the signal
    handler at such a moment, all destructive operations would have to
-   protected by block/unblock_fatal_signals (), in this case too.
+   protected by block/unblock_fatal_signals, in this case too.
 
    A list of type GL_LINKEDHASH_LIST without duplicates fulfills all
    requirements:
@@ -277,7 +277,7 @@ create_temp_dir (const char *prefix, const char *parentdir,
       /* See whether the array needs to be extended.  */
       if (cleanup_list.tempdir_count == cleanup_list.tempdir_allocated)
        {
-         /* Note that we cannot use xrealloc(), because then the cleanup()
+         /* Note that we cannot use xrealloc, because then the cleanup()
             function could access an already deallocated array.  */
          struct tempdir * volatile *old_array = cleanup_list.tempdir_list;
          size_t old_allocated = cleanup_list.tempdir_allocated;
@@ -290,7 +290,7 @@ create_temp_dir (const char *prefix, const char *parentdir,
            at_fatal_signal (&cleanup);
          else
            {
-             /* Don't use memcpy() here, because memcpy takes non-volatile
+             /* Don't use memcpy here, because memcpy takes non-volatile
                 arguments and is therefore not guaranteed to complete all
                 memory stores before the next statement.  */
              size_t k;
@@ -309,7 +309,7 @@ create_temp_dir (const char *prefix, const char *parentdir,
 
       tmpdirp = &cleanup_list.tempdir_list[cleanup_list.tempdir_count];
       /* Initialize *tmpdirp before incrementing tempdir_count, so that
-        cleanup() will skip this entry before it is fully initialized.  */
+        cleanup will skip this entry before it is fully initialized.  */
       *tmpdirp = NULL;
       cleanup_list.tempdir_count++;
     }
@@ -571,7 +571,7 @@ cleanup_temp_dir (struct temp_dir *dir)
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
 /* On Windows, opening a file with _O_TEMPORARY has the effect of passing
-   the FILE_FLAG_DELETE_ON_CLOSE flag to CreateFile(), which has the effect
+   the FILE_FLAG_DELETE_ON_CLOSE flag to CreateFile, which has the effect
    of deleting the file when it is closed - even when the program crashes.
    But (according to the Cygwin sources) it works only on Windows NT or newer.
    So we cache the info whether we are running on Windows NT or newer.  */
@@ -631,7 +631,7 @@ open_temp (const char *file_name, int flags, mode_t mode)
   int saved_errno;
 
   block_fatal_signals ();
-  /* Note: 'open' here is actually open() or open_safer().  */
+  /* Note: 'open' here is actually either 'open' or 'open_safer'.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   /* Use _O_TEMPORARY when possible, to increase the chances that the
      temporary file is removed when the process crashes.  */
@@ -657,7 +657,7 @@ fopen_temp (const char *file_name, const char *mode)
   int saved_errno;
 
   block_fatal_signals ();
-  /* Note: 'fopen' here is actually fopen() or fopen_safer().  */
+  /* Note: 'fopen' here is actually 'fopen' or 'fopen_safer'.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
   /* Use _O_TEMPORARY when possible, to increase the chances that the
      temporary file is removed when the process crashes.  */
diff --git a/lib/copy-file.c b/lib/copy-file.c
index 1587905..b343d8a 100644
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -45,7 +45,7 @@
 
 #define _(str) gettext (str)
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index dc83985..35751d6 100644
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.c
@@ -307,7 +307,7 @@ compile_csharp_using_mono (const char * const *sources,
         line if it starts with "Compilation succeeded".  */
       fp = fdopen (fd[0], "r");
       if (fp == NULL)
-       error (EXIT_FAILURE, errno, _("fdopen() failed"));
+       error (EXIT_FAILURE, errno, _("fdopen failed"));
       line[0] = NULL; linesize[0] = 0;
       line[1] = NULL; linesize[1] = 0;
       l = 0;
diff --git a/lib/des.c b/lib/des.c
index e2c7986..45cb483 100644
--- a/lib/des.c
+++ b/lib/des.c
@@ -420,7 +420,7 @@ gl_des_is_weak_key (const char * key)
     data[6] = (right >> 8) &0xff; data[7] = right &0xff;
 
 /*
- * des_key_schedule():   Calculate 16 subkeys pairs (even/odd) for
+ * des_key_schedule:     Calculate 16 subkeys pairs (even/odd) for
  *                       16 encryption rounds.
  *                       To calculate subkeys for decryption the caller
  *                       have to reorder the generated subkeys.
diff --git a/lib/dirname.c b/lib/dirname.c
index c27e5b5..3243ff8 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -59,7 +59,7 @@ dir_len (char const *file)
 
    Return the leading directories part of FILE, allocated with xmalloc.
    Works properly even if there are trailing slashes (by effectively
-   ignoring them).  Unlike POSIX dirname(), FILE cannot be NULL.
+   ignoring them).  Unlike POSIX dirname, FILE cannot be NULL.
 
    If lstat (FILE) would succeed, then { chdir (dir_name (FILE));
    lstat (base_name (FILE)); } will access the same file.  Likewise,
diff --git a/lib/eealloc.h b/lib/eealloc.h
index c81b16e..df88ecb 100644
--- a/lib/eealloc.h
+++ b/lib/eealloc.h
@@ -19,15 +19,15 @@
 #ifndef _EEALLOC_H
 #define _EEALLOC_H
 
-/* malloc() and realloc() are allowed to return NULL when asked to allocate
+/* malloc and realloc are allowed to return NULL when asked to allocate
    a memory block of 0 bytes; this is not an out-of-memory condition.
    (See ISO C 99 section 7.20.3.)  In some places, this is not welcome,
    because it requires extra checking (so as not to confuse a zero-sized
    allocation with an out-of-memory condition).  This file provides
-   malloc()/realloc() workalikes which return non-NULL pointers for
-   succeeding zero-sized allocations.  GNU libc already defines malloc()
-   and realloc() this way; on such platforms the workalikes are aliased
-   to the original malloc()/realloc() functions.  */
+   malloc/realloc workalikes which return non-NULL pointers for
+   succeeding zero-sized allocations.  GNU libc already defines malloc
+   and realloc this way; on such platforms the workalikes are aliased
+   to the original malloc/realloc functions.  */
 
 #include <stdlib.h>
 
diff --git a/lib/execute.c b/lib/execute.c
index 30ce000..77a7dd7 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -68,7 +68,7 @@ extern char **environ;
 # define STDERR_FILENO 2
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
@@ -76,7 +76,7 @@ extern char **environ;
 
 #ifdef EINTR
 
-/* EINTR handling for close(), open().
+/* EINTR handling for close, open.
    These functions can return -1/EINTR even though we don't have any
    signal handlers set up, namely when we get interrupted via SIGSTOP.  */
 
@@ -190,8 +190,8 @@ execute (const char *progname,
 #else
 
   /* Unix API.  */
-  /* Note about 127: Some errors during posix_spawnp() cause the function
-     posix_spawnp() to return an error code; some other errors cause the
+  /* Note about 127: Some errors during posix_spawnp cause the function
+     posix_spawnp to return an error code; some other errors cause the
      subprocess to exit with return code 127.  It is implementation
      dependent which error is reported which way.  We treat both cases as
      equivalent.  */
@@ -266,7 +266,7 @@ execute (const char *progname,
 #else
   if (slave_process)
     block_fatal_signals ();
-  /* Use vfork() instead of fork() for efficiency.  */
+  /* Use vfork instead of fork, for efficiency.  */
   if ((child = vfork ()) == 0)
     {
       /* Child process code.  */
diff --git a/lib/execute.h b/lib/execute.h
index 8b99d58..0fe8043 100644
--- a/lib/execute.h
+++ b/lib/execute.h
@@ -29,7 +29,7 @@
    purpose is to write to standard output.
    If slave_process is true, the child process will be terminated when its
    creator receives a catchable fatal signal.
-   It is recommended that no signal is blocked or ignored while execute()
+   It is recommended that no signal is blocked or ignored while 'execute'
    is called.  See pipe.h for the reason.  */
 extern int execute (const char *progname,
                    const char *prog_path, char **prog_argv,
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 5157d7c..485c6d5 100644
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -112,7 +112,7 @@ init_fatal_signals (void)
 typedef void (*action_t) (void);
 
 /* Type of an entry in the actions array.
-   The 'action' field is accessed from within the fatal_signal_handler(),
+   The 'action' field is accessed from within fatal_signal_handler,
    therefore we mark it as 'volatile'.  */
 typedef struct
 {
@@ -158,9 +158,9 @@ fatal_signal_handler (int sig)
     }
 
   /* Now execute the signal's default action.
-     If signal() blocks the signal being delivered for the duration of the
+     If 'signal' blocks the signal being delivered for the duration of the
      signal handler's execution, the re-raised signal is delivered when this
-     handler returns; otherwise it is delivered already during raise().  */
+     handler returns; otherwise it is delivered already during 'raise'.  */
   uninstall_handlers ();
 #if HAVE_RAISE
   raise (sig);
@@ -197,8 +197,8 @@ at_fatal_signal (action_t action)
 
   if (actions_count == actions_allocated)
     {
-      /* Extend the actions array.  Note that we cannot use xrealloc(),
-        because then the cleanup() function could access an already
+      /* Extend the actions array.  Note that we cannot use xrealloc,
+        because then the cleanup function could access an already
         deallocated array.  */
       actions_entry_t *old_actions = actions;
       size_t old_actions_allocated = actions_allocated;
@@ -207,7 +207,7 @@ at_fatal_signal (action_t action)
        XNMALLOC (new_actions_allocated, actions_entry_t);
       size_t k;
 
-      /* Don't use memcpy() here, because memcpy takes non-volatile arguments
+      /* Don't use memcpy here, because memcpy takes non-volatile arguments
         and is therefore not guaranteed to complete all memory stores before
         the next statement.  */
       for (k = 0; k < old_actions_allocated; k++)
diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h
index 6cc2884..034ec92 100644
--- a/lib/fatal-signal.h
+++ b/lib/fatal-signal.h
@@ -39,11 +39,11 @@ extern "C" {
      - The cleanup function can do all kinds of system calls.
      - It can also access application dependent memory locations and data
        structures provided they are in a consistent state. One way to ensure
-       this is through block_fatal_signals()/unblock_fatal_signals(), see
+       this is through block_fatal_signals/unblock_fatal_signals, see
        below.  Another - more tricky - way to ensure this is the careful use
        of 'volatile'.
    However,
-     - malloc() and similarly complex facilities are not safe to be called
+     - malloc and similarly complex facilities are not safe to be called
        because they are not guaranteed to be in a consistent state.
      - Also, the cleanup function must not block the catchable fatal signals
        and leave them blocked upon return.
@@ -57,14 +57,14 @@ extern void at_fatal_signal (void (*function) (void));
 /* Sometimes it is necessary to block the usually fatal signals while the
    data structures being accessed by the cleanup action are being built or
    reorganized.  This is the case, for example, when a temporary file or
-   directory is created through mkstemp() or mkdtemp(), because these
+   directory is created through mkstemp or mkdtemp, because these
    functions create the temporary file or directory _before_ returning its
    name to the application.  */
 
 /* Temporarily delay the catchable fatal signals.
    The signals will be blocked (= delayed) until the next call to
-   unblock_fatal_signals().  If the signals are already blocked, a further
-   call to block_fatal_signals() has no effect.  */
+   unblock_fatal_signals.  If the signals are already blocked, a further
+   call to block_fatal_signals has no effect.  */
 extern void block_fatal_signals (void);
 
 /* Stop delaying the catchable fatal signals.  */
diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index 5f659bf..ad8e3d9 100644
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -27,7 +27,7 @@ int
 fbufmode (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
 # if HAVE___FLBF                    /* glibc >= 2.2 */
diff --git a/lib/fchdir.c b/lib/fchdir.c
index 246987c..96757dc 100644
--- a/lib/fchdir.c
+++ b/lib/fchdir.c
@@ -75,7 +75,8 @@ ensure_dirs_slot (size_t fd)
     }
 }
 
-/* Override open() and close(), to keep track of the open file descriptors.  */
+/* Override 'open' and 'close', to keep track of the open file
+   descriptors.  */
 
 int
 rpl_close (int fd)
@@ -135,7 +136,7 @@ rpl_open (const char *filename, int flags, ...)
   return fd;
 }
 
-/* Override opendir() and closedir(), to keep track of the open file
+/* Override opendir and closedir, to keep track of the open file
    descriptors.  Needed because there is a function dirfd().  */
 
 int
@@ -179,7 +180,7 @@ rpl_opendir (const char *filename)
   return dp;
 }
 
-/* Override dup() and dup2(), to keep track of open file descriptors.  */
+/* Override dup and dup2, to keep track of open file descriptors.  */
 
 int
 rpl_dup (int oldfd)
@@ -251,7 +252,7 @@ rpl_dup2 (int oldfd, int newfd)
   return retval;
 }
 
-/* Implement fchdir() in terms of chdir().  */
+/* Implement fchdir in terms of chdir.  */
 
 int
 fchdir (int fd)
diff --git a/lib/findprog.c b/lib/findprog.c
index 3b8cd39..4ac8b40 100644
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -77,9 +77,9 @@ find_in_path (const char *progname)
       /* Concatenate dir and progname.  */
       progpathname = concatenated_filename (dir, progname, NULL);
 
-      /* On systems which have the eaccess() system call, let's use it.
+      /* On systems which have the eaccess system call, let's use it.
         On other systems, let's hope that this program is not installed
-        setuid or setgid, so that it is ok to call access() despite its
+        setuid or setgid, so that it is ok to call 'access' despite its
         design flaw.  */
       if (eaccess (progpathname, X_OK) == 0)
        {
@@ -88,7 +88,7 @@ find_in_path (const char *progname)
            {
              free (progpathname);
 
-             /* Add the "./" prefix for real, that concatenated_filename()
+             /* Add the "./" prefix for real, that concatenated_filename
                 optimized away.  This avoids a second PATH search when the
                 caller uses execlp/execvp.  */
              progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
diff --git a/lib/findprog.h b/lib/findprog.h
index 8d1a5af..32b4744 100644
--- a/lib/findprog.h
+++ b/lib/findprog.h
@@ -28,7 +28,7 @@ extern "C" {
    return PROGNAME unmodified.
    Because of the latter case, callers should use execlp/execvp, not
    execl/execv on the returned pathname.
-   The returned string is freshly malloc()ed if it is != PROGNAME.  */
+   The returned string is freshly malloced if it is != PROGNAME.  */
 extern const char *find_in_path (const char *progname);
 
 
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index d1008c2..92a638c 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -280,7 +280,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR 
*string_end,
 # if defined _LIBC && ! WIDE_CHAR_VERSION
                    /* The following code is glibc specific but does
                       there a good job in speeding up the code since
-                      we can avoid the btowc() call.  */
+                      we can avoid the btowc call.  */
                    if (_ISCTYPE ((UCHAR) *n, wt))
                      goto matched;
 # else
diff --git a/lib/fpurge.c b/lib/fpurge.c
index cc230fb..8fc1da5 100644
--- a/lib/fpurge.c
+++ b/lib/fpurge.c
@@ -57,7 +57,7 @@ fpurge (FILE *fp)
 #else
 
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 # if defined _IO_ferror_unlocked    /* GNU libc, BeOS */
   fp->_IO_read_end = fp->_IO_read_ptr;
diff --git a/lib/freadable.c b/lib/freadable.c
index e49c950..1c9ac83 100644
--- a/lib/freadable.c
+++ b/lib/freadable.c
@@ -23,7 +23,7 @@ bool
 freadable (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
   return (fp->_flags & _IO_NO_READS) == 0;
diff --git a/lib/freading.c b/lib/freading.c
index dcdc3d2..51c8227 100644
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -27,7 +27,7 @@ bool
 freading (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
   return ((fp->_flags & _IO_NO_WRITES) != 0
diff --git a/lib/fseek.c b/lib/fseek.c
index 282c531..1d7cca3 100644
--- a/lib/fseek.c
+++ b/lib/fseek.c
@@ -1,4 +1,4 @@
-/* An fseek() function that, together with fflush(), is POSIX compliant.
+/* An fseek function that, together with fflush(), is POSIX compliant.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fseeko.c b/lib/fseeko.c
index 97dcf6d..9f4c3a1 100644
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -1,4 +1,4 @@
-/* An fseeko() function that, together with fflush(), is POSIX compliant.
+/* An fseeko function that, together with fflush(), is POSIX compliant.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/fseterr.c b/lib/fseterr.c
index b34ef75..8bcd20a 100644
--- a/lib/fseterr.c
+++ b/lib/fseterr.c
@@ -25,7 +25,7 @@ void
 fseterr (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
   fp->_flags |= _IO_ERR_SEEN;
@@ -53,7 +53,7 @@ fseterr (FILE *fp)
      Wow! 6 system calls for something that is just a bit operation!
      Not activated on any system, because there is no way to repair FP when
      the sequence of system calls fails, and library code should not call
-     abort().  */
+     the 'abort' function.  */
   int saved_errno;
   int fd;
   int fd2;
diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
index f0e51e7..7423312 100644
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -70,7 +70,7 @@
 #define NOTE_DELETE(ctxt, xoff) ctxt->xvec_edit_count++
 #define NOTE_INSERT(ctxt, yoff) ctxt->yvec_edit_count++
 /* We don't need USE_HEURISTIC, since it is unlikely in typical uses of
-   fstrcmp().  */
+ fstrcmp().  */
 #include "diffseq.h"
 
 
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 23d40ea..932bb9f 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -55,7 +55,7 @@
 # include "full-read.h"
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of open in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/ftell.c b/lib/ftell.c
index 84622d7..6e5edea 100644
--- a/lib/ftell.c
+++ b/lib/ftell.c
@@ -1,4 +1,4 @@
-/* An ftell() function that works around platform bugs.
+/* An ftell function that works around platform bugs.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/ftello.c b/lib/ftello.c
index f252408..bcbdbf1 100644
--- a/lib/ftello.c
+++ b/lib/ftello.c
@@ -1,4 +1,4 @@
-/* An ftello() function that works around platform bugs.
+/* An ftello function that works around platform bugs.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/fts.c b/lib/fts.c
index ceb8935..6ac97e0 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1078,7 +1078,7 @@ mem1:                             saved_errno = errno;
                                __set_errno (saved_errno);
                                return (NULL);
                        }
-                       /* Did realloc() change the pointer? */
+                       /* Did realloc change the pointer? */
                        if (oldaddr != sp->fts_path) {
                                doadjust = true;
                                if (ISSET(FTS_NOCHDIR))
@@ -1165,7 +1165,7 @@ mem1:                             saved_errno = errno;
                closedir(dirp);
 
        /*
-        * If realloc() changed the address of the file name, adjust the
+        * If realloc changed the address of the file name, adjust the
         * addresses for the rest of the tree and the dir list.
         */
        if (doadjust)
@@ -1184,7 +1184,7 @@ mem1:                             saved_errno = errno;
        /*
         * If descended after called from fts_children or after called from
         * fts_read and nothing found, get back.  At the root level we use
-        * the saved fd; if one of fts_open()'s arguments is a relative name
+        * the saved fd; if one of fts_open's arguments is a relative name
         * to an empty directory, we wind up here with no other way back.  If
         * can't get back, we're done.
         */
diff --git a/lib/fts_.h b/lib/fts_.h
index 82213fc..d98a19a 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -214,7 +214,7 @@ typedef struct _ftsent {
 # define FTS_FOLLOW     2              /* follow symbolic link */
 # define FTS_NOINSTR    3              /* no instructions */
 # define FTS_SKIP       4              /* discard node */
-       unsigned short int fts_instr;   /* fts_set() instructions */
+       unsigned short int fts_instr;   /* fts_set instructions */
 
        struct stat fts_statp[1];       /* stat(2) information */
        char fts_name[1];               /* file name */
diff --git a/lib/full-read.h b/lib/full-read.h
index a341ee0..f5e347f 100644
--- a/lib/full-read.h
+++ b/lib/full-read.h
@@ -1,4 +1,4 @@
-/* An interface to read() that reads all it is asked to read.
+/* An interface to 'read' that reads all it is asked to read.
 
    Copyright (C) 2002 Free Software Foundation, Inc.
 
diff --git a/lib/full-write.h b/lib/full-write.h
index 9a80146..d280d27 100644
--- a/lib/full-write.h
+++ b/lib/full-write.h
@@ -1,4 +1,4 @@
-/* An interface to write() that writes all it is asked to write.
+/* An interface to 'write' that writes all it is asked to write.
 
    Copyright (C) 2002-2003 Free Software Foundation, Inc.
 
diff --git a/lib/fwritable.c b/lib/fwritable.c
index 5617bee..ab3b502 100644
--- a/lib/fwritable.c
+++ b/lib/fwritable.c
@@ -23,7 +23,7 @@ bool
 fwritable (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
   return (fp->_flags & _IO_NO_WRITES) == 0;
diff --git a/lib/fwriteerror.h b/lib/fwriteerror.h
index 613b7e0..208a98e 100644
--- a/lib/fwriteerror.h
+++ b/lib/fwriteerror.h
@@ -18,19 +18,19 @@
 /* There are two approaches for detecting a write error on a stream opened
    for writing:
 
-     (a) Test the return value of every fwrite() or fprintf() call, and react
+     (a) Test the return value of every fwrite or fprintf call, and react
          immediately.
-     (b) Just before fclose(), test the error indicator in the stream and
-         the return value of the final fclose() call.
+     (b) Just before fclose, test the error indicator in the stream and
+         the return value of the final fclose call.
 
    The benefit of (a) is that non file related errors (such that ENOMEM during
    fprintf) and temporary error conditions can be diagnosed accurately.
 
    A theoretical benefit of (a) is also that, on POSIX systems, in the case of
-   an ENOSPC error, errno is set and can be used by error() to provide a more
+   an ENOSPC error, errno is set and can be used by 'error' to provide a more
    accurate error message. But in practice, this benefit is not big because
    users can easily figure out by themselves why a file cannot be written to,
-   and furthermore the function fwriteerror() can provide errno as well.
+   and furthermore the function fwriteerror can provide errno as well.
 
    The big drawback of (a) is extensive error checking code: Every function
    which does stream output must return an error indicator.
diff --git a/lib/fwriting.c b/lib/fwriting.c
index 3ae6d56..df79e20 100644
--- a/lib/fwriting.c
+++ b/lib/fwriting.c
@@ -23,7 +23,7 @@ bool
 fwriting (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
-     <stdio.h>, because they need it for implementing getc() and putc() as
+     <stdio.h>, because they need it for implementing getc and putc as
      fast macros.  */
 #if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
   return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0;
diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index 94e0880..d1bfe99 100644
--- a/lib/gc-gnulib.c
+++ b/lib/gc-gnulib.c
@@ -68,7 +68,7 @@
 # include "rijndael-api-fst.h"
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index b4ef242..2fb13e8 100644
--- a/lib/getaddrinfo.h
+++ b/lib/getaddrinfo.h
@@ -60,8 +60,8 @@ struct addrinfo
 
 #if 0
 /* The commented out definitions below are not yet implemented in the
-   GNULIB getaddrinfo() replacement, so are not yet needed and may, in fact,
-   cause conflicts on systems with a getaddrinfo() function which does not
+   GNULIB getaddrinfo replacement, so are not yet needed and may, in fact,
+   cause conflicts on systems with a getaddrinfo function which does not
    define them.
 
    If they are restored, be sure to protect the definitions with #ifndef.  */
@@ -127,7 +127,7 @@ extern void freeaddrinfo (struct addrinfo *ai);
 #endif
 
 #if !HAVE_DECL_GAI_STRERROR
-/* Convert error return from getaddrinfo() to a string.
+/* Convert error return from getaddrinfo to a string.
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/gai_strerror.html>.  */
 extern const char *gai_strerror (int ecode);
diff --git a/lib/getcwd.c b/lib/getcwd.c
index 2397c08..911d63c 100644
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -104,7 +104,7 @@
 # define __readdir readdir
 #endif
 
-/* The results of opendir() in this file are not used with dirfd and fchdir,
+/* The results of opendir in this file are not used with dirfd and fchdir,
    therefore save some unnecessary recursion in fchdir.c.  */
 #undef opendir
 #undef closedir
@@ -334,7 +334,7 @@ __getcwd (char *buf, size_t size)
            memcpy (dotlist + dotlen, d->d_name, _D_ALLOC_NAMLEN (d));
            entry_status = __lstat (dotlist, &st);
 #endif
-           /* We don't fail here if we cannot stat() a directory entry.
+           /* We don't fail here if we cannot stat a directory entry.
               This can happen when (network) file systems fail.  If this
               entry is in fact the one we are looking for we will find
               out soon as we reach the end of the directory without
diff --git a/lib/getdomainname.h b/lib/getdomainname.h
index 47f23a7..95ad90e 100644
--- a/lib/getdomainname.h
+++ b/lib/getdomainname.h
@@ -19,7 +19,7 @@
 
 #if HAVE_GETDOMAINNAME
 
-/* Get getdomainname() declaration.  */
+/* Get getdomainname declaration.  */
 # include <unistd.h>
 
 #else
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index eac8483..a2f190e 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -552,7 +552,7 @@ getloadavg (double loadavg[], int nelem)
 # endif /* HAVE_LIBKSTAT */
 
 # if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
-/* Use pstat_getdynamic() because we don't have to be root.  */
+/* Use pstat_getdynamic because we don't have to be root.  */
 #  define LDAV_DONE
 #  undef LOAD_AVE_TYPE
 
diff --git a/lib/getpass.c b/lib/getpass.c
index 17d5137..5406452 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -178,9 +178,9 @@ getpass (const char *prompt)
 
 /* For PASS_MAX. */
 #include <limits.h>
-/* For _getch(). */
+/* For _getch. */
 #include <conio.h>
-/* For strdup(). */
+/* For strdup. */
 #include <string.h>
 
 #ifndef PASS_MAX
diff --git a/lib/gettext.h b/lib/gettext.h
index 9d76ec9..49901ab 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -25,8 +25,8 @@
 # include <libintl.h>
 
 /* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
-   the gettext() and ngettext() macros.  This is an alternative to calling
-   textdomain(), and is useful for libraries.  */
+   the gettext and ngettext macros.  This is an alternative to calling
+   textdomain, and is useful for libraries.  */
 # ifdef DEFAULT_TEXT_DOMAIN
 #  undef gettext
 #  define gettext(Msgid) \
@@ -84,7 +84,7 @@
 #endif
 
 /* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
+   extraction of messages, but does not call gettext.  The run-time
    translation is done at a different place in the code.
    The argument, String, should be a literal string.  Concatenated strings
    and other string expressions won't work.
diff --git a/lib/gl_anyavltree_list2.h b/lib/gl_anyavltree_list2.h
index f468688..532b4e5 100644
--- a/lib/gl_anyavltree_list2.h
+++ b/lib/gl_anyavltree_list2.h
@@ -88,7 +88,7 @@ gl_tree_create (gl_list_implementation_t implementation,
       list->root->parent = NULL;
 
 #if WITH_HASHTABLE
-      /* Now that the tree is built, node_position() works.  Now we can
+      /* Now that the tree is built, node_position works.  Now we can
         add the nodes to the hash table.  */
       add_nodes_to_buckets (list);
 #endif
@@ -419,7 +419,7 @@ gl_tree_add_first (gl_list_t list, const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -478,7 +478,7 @@ gl_tree_add_last (gl_list_t list, const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -537,7 +537,7 @@ gl_tree_add_before (gl_list_t list, gl_list_node_t node, 
const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -596,7 +596,7 @@ gl_tree_add_after (gl_list_t list, gl_list_node_t node, 
const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -612,7 +612,7 @@ gl_tree_remove_node (gl_list_t list, gl_list_node_t node)
 #if WITH_HASHTABLE
   /* Remove node from the hash table.
      Note that this is only possible _before_ the node is removed from the
-     tree structure, because remove_from_bucket() uses node_position().  */
+     tree structure, because remove_from_bucket uses node_position.  */
   remove_from_bucket (list, node);
 #endif
 
diff --git a/lib/gl_anylinked_list2.h b/lib/gl_anylinked_list2.h
index 9d481a3..1fecdae 100644
--- a/lib/gl_anylinked_list2.h
+++ b/lib/gl_anylinked_list2.h
@@ -376,7 +376,7 @@ gl_linked_indexof_from_to (gl_list_t list, size_t 
start_index, size_t end_index,
   {
 #if WITH_HASHTABLE
     /* Here the hash table doesn't help much.  It only allows us to minimize
-       the number of equals() calls, by looking up first the node and then
+       the number of equals calls, by looking up first the node and then
        its index.  */
     size_t hashcode =
       (list->base.hashcode_fn != NULL
diff --git a/lib/gl_anyrbtree_list2.h b/lib/gl_anyrbtree_list2.h
index 09e8421..6fd23f2 100644
--- a/lib/gl_anyrbtree_list2.h
+++ b/lib/gl_anyrbtree_list2.h
@@ -103,7 +103,7 @@ gl_tree_create (gl_list_implementation_t implementation,
       list->root->parent = NULL;
 
 #if WITH_HASHTABLE
-      /* Now that the tree is built, node_position() works.  Now we can
+      /* Now that the tree is built, node_position works.  Now we can
         add the nodes to the hash table.  */
       add_nodes_to_buckets (list);
 #endif
@@ -642,7 +642,7 @@ gl_tree_add_first (gl_list_t list, const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -699,7 +699,7 @@ gl_tree_add_last (gl_list_t list, const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -749,7 +749,7 @@ gl_tree_add_before (gl_list_t list, gl_list_node_t node, 
const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -799,7 +799,7 @@ gl_tree_add_after (gl_list_t list, gl_list_node_t node, 
const void *elt)
 #if WITH_HASHTABLE
   /* Add node to the hash table.
      Note that this is only possible _after_ the node has been added to the
-     tree structure, because add_to_bucket() uses node_position().  */
+     tree structure, because add_to_bucket uses node_position.  */
   add_to_bucket (list, new_node);
   hash_resize_after_add (list);
 #endif
@@ -815,7 +815,7 @@ gl_tree_remove_node (gl_list_t list, gl_list_node_t node)
 #if WITH_HASHTABLE
   /* Remove node from the hash table.
      Note that this is only possible _before_ the node is removed from the
-     tree structure, because remove_from_bucket() uses node_position().  */
+     tree structure, because remove_from_bucket uses node_position.  */
   remove_from_bucket (list, node);
 #endif
 
diff --git a/lib/gl_list.h b/lib/gl_list.h
index 1a2f9fb..352835f 100644
--- a/lib/gl_list.h
+++ b/lib/gl_list.h
@@ -297,7 +297,7 @@ extern void gl_list_iterator_free (gl_list_iterator_t 
*iterator);
 /* The following functions are for lists without duplicates where the
    order is given by a sort criterion.  */
 
-/* Type of function used to compare two elements.  Same as for qsort().
+/* Type of function used to compare two elements.  Same as for qsort.
    NULL denotes pointer comparison.  */
 typedef int (*gl_listelement_compar_fn) (const void *elt1, const void *elt2);
 
diff --git a/lib/gl_oset.h b/lib/gl_oset.h
index 0ecc611..a761c19 100644
--- a/lib/gl_oset.h
+++ b/lib/gl_oset.h
@@ -65,7 +65,7 @@ extern "C" {
 
 /* -------------------------- gl_oset_t Data Type -------------------------- */
 
-/* Type of function used to compare two elements.  Same as for qsort().
+/* Type of function used to compare two elements.  Same as for qsort.
    NULL denotes pointer comparison.  */
 typedef int (*gl_setelement_compar_fn) (const void *elt1, const void *elt2);
 
diff --git a/lib/gl_sublist.h b/lib/gl_sublist.h
index a14498b..df8198a 100644
--- a/lib/gl_sublist.h
+++ b/lib/gl_sublist.h
@@ -31,7 +31,7 @@ extern "C" {
      - Modifications to the sublist affect the whole list.
      - Modifications to the whole list are immediately visible in the sublist.
      - The sublist is only valid as long as the whole list is valid.
-     - The sublist must not be passed to the gl_list_sortedlist_add() function.
+     - The sublist must not be passed to the gl_list_sortedlist_add function.
  */
 extern gl_list_t gl_sublist_create (gl_list_t whole_list,
                                    size_t start_index, size_t end_index);
diff --git a/lib/glob.c b/lib/glob.c
index 1d31d77..7a02580 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -182,7 +182,7 @@ static const char *next_brace_sub (const char *begin, int 
flags) __THROW;
 #endif
 
 #ifndef _LIBC
-/* The results of opendir() in this file are not used with dirfd and fchdir,
+/* The results of opendir in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 # undef opendir
 # undef closedir
@@ -1293,7 +1293,7 @@ glob_in_dir (const char *pattern, const char *directory, 
int flags,
     }
   else if (meta == 0)
     {
-      /* Since we use the normal file functions we can also use stat()
+      /* Since we use the normal file functions we can also use stat
         to verify the file is there.  */
       struct stat st;
       struct_stat64 st64;
diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index f1d61b9..68d183b 100644
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -52,13 +52,13 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
 
 #if REPLACE_ICONV_UTF
   /* Special handling of conversion between UTF-8 and UTF-{16,32}{BE,LE}.
-     Do this here, before calling the real iconv_open(), because  OSF/1 5.1
-     iconv() to these encoding inserts a BOM, which is wrong.
+     Do this here, before calling the real iconv_open, because  OSF/1 5.1
+     iconv to these encoding inserts a BOM, which is wrong.
      We do not need to handle conversion between arbitrary encodings and
      UTF-{16,32}{BE,LE}, because the 'striconveh' module implements two-step
      conversion throough UTF-8.
      The _ICONV_* constants are chosen to be disjoint from any iconv_t
-     returned by the system's iconv_open() functions.  Recall that iconv_t
+     returned by the system's iconv_open functions.  Recall that iconv_t
      is a scalar type.  */
   if (c_toupper (fromcode[0]) == 'U'
       && c_toupper (fromcode[1]) == 'T'
@@ -114,7 +114,7 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
   }
 
   /* Convert the encodings to upper case, because
-       1. in the arguments of iconv_open() on AIX, HP-UX, and OSF/1 the case
+       1. in the arguments of iconv_open on AIX, HP-UX, and OSF/1 the case
          matters,
        2. it makes searching in the table faster.  */
   {
diff --git a/lib/imaxabs.c b/lib/imaxabs.c
index 2cb4d7a..205798a 100644
--- a/lib/imaxabs.c
+++ b/lib/imaxabs.c
@@ -1,4 +1,4 @@
-/* imaxabs() function: absolute value of 'intmax_t'.
+/* imaxabs function: absolute value of 'intmax_t'.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/imaxdiv.c b/lib/imaxdiv.c
index 81e7d80..be24f97 100644
--- a/lib/imaxdiv.c
+++ b/lib/imaxdiv.c
@@ -1,4 +1,4 @@
-/* imaxdiv() function: division of 'intmax_t'.
+/* imaxdiv function: division of 'intmax_t'.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index 6cbf8cb..ea552cb 100644
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -92,7 +92,7 @@ inet_pton (int af, const char *restrict src, void *restrict 
dst)
 
 /* int
  * inet_pton4(src, dst)
- *     like inet_aton() but without all the hexadecimal, octal (with the
+ *     like inet_aton but without all the hexadecimal, octal (with the
  *     exception of 0) and shorthand.
  * return:
  *     1 if `src' is a valid dotted quad, else 0.
@@ -220,7 +220,7 @@ inet_pton6 (const char *restrict src, unsigned char 
*restrict dst)
        {
          tp += NS_INADDRSZ;
          saw_xdigit = 0;
-         break;                /* '\0' was seen by inet_pton4(). */
+         break;                /* '\0' was seen by inet_pton4. */
        }
       return (0);
     }
@@ -234,7 +234,7 @@ inet_pton6 (const char *restrict src, unsigned char 
*restrict dst)
   if (colonp != NULL)
     {
       /*
-       * Since some memmove()'s erroneously fail to handle
+       * Since some memmove implementations erroneously fail to handle
        * overlapping regions, we'll do the shift by hand.
        */
       const int n = tp - colonp;
diff --git a/lib/javacomp.c b/lib/javacomp.c
index a05267a..fa33a0f 100644
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -51,7 +51,7 @@
 
 #define _(str) gettext (str)
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
@@ -598,7 +598,7 @@ is_envjavac_gcj (const char *javac)
          fclose (fp);
          goto failed;
        }
-      /* It is safe to call c_strstr() instead of strstr() here; see the
+      /* It is safe to call c_strstr instead of strstr here; see the
         comments in c-strstr.h.  */
       envjavac_gcj = (c_strstr (line, "gcj") != NULL);
 
diff --git a/lib/javaversion.c b/lib/javaversion.c
index 4ce564b..b3949d0 100644
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -73,7 +73,7 @@ execute_and_read_line (const char *progname,
   fp = fdopen (fd[0], "r");
   if (fp == NULL)
     {
-      error (0, errno, _("fdopen() failed"));
+      error (0, errno, _("fdopen failed"));
       return false;
     }
 
diff --git a/lib/javaversion.h b/lib/javaversion.h
index 9d8d2dd..07d5ed2 100644
--- a/lib/javaversion.h
+++ b/lib/javaversion.h
@@ -24,7 +24,7 @@ extern "C" {
 #endif
 
 
-/* Return information about the Java version used by execute_java_class().
+/* Return information about the Java version used by execute_java_class.
    This is the value of System.getProperty("java.specification.version").
    Some possible values are: 1.1, 1.2, 1.3, 1.4, 1.5, 1.6.  Return NULL if
    the Java version cannot be determined.  */
diff --git a/lib/localename.c b/lib/localename.c
index af4c229..76c47d5 100644
--- a/lib/localename.c
+++ b/lib/localename.c
@@ -719,7 +719,7 @@ gl_locale_name_canonicalize (char *name)
      ISO 3166) names.  Prior to MacOS X 10.3, there is no API for doing this.
      Therefore we do it ourselves, using a table based on the results of the
      MacOS X 10.3.8 function
-     CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
+     CFLocaleCreateCanonicalLocaleIdentifierFromString.  */
   typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
          legacy_entry;
   static const legacy_entry legacy_table[] = {
@@ -976,7 +976,7 @@ gl_locale_name_canonicalize (char *name)
 #endif
 
 /* XPG3 defines the result of 'setlocale (category, NULL)' as:
-   "Directs 'setlocale()' to query 'category' and return the current
+   "Directs 'setlocale' to query 'category' and return the current
     setting of 'local'."
    However it does not specify the exact format.  Neither do SUSV2 and
    ISO C 99.  So we can use this feature only on selected systems (e.g.
@@ -987,7 +987,7 @@ gl_locale_name_canonicalize (char *name)
 
 /* Determine the current locale's name, and canonicalize it into XPG syntax
      address@hidden
-   The codeset part in the result is not reliable; the locale_charset()
+   The codeset part in the result is not reliable; the locale_charset
    should be used for codeset information instead.
    The result must not be freed; it is statically allocated.  */
 
diff --git a/lib/localename.h b/lib/localename.h
index f633ad8..6b33a3a 100644
--- a/lib/localename.h
+++ b/lib/localename.h
@@ -33,27 +33,27 @@ extern "C" {
    CATEGORYNAME is the name of CATEGORY as a string, e.g. "LC_MESSAGES".
    Return the locale category's name, canonicalized into XPG syntax
      address@hidden
-   The codeset part in the result is not reliable; the locale_charset()
+   The codeset part in the result is not reliable; locale_charset
    should be used for codeset information instead.
    The result must not be freed; it is statically allocated.  */
 extern const char * gl_locale_name (int category, const char *categoryname);
 
-/* Determine the current locale's name, as specified by setlocale() calls
+/* Determine the current locale's name, as specified by setlocale calls
    or by environment variables.
    CATEGORY is a locale category abbreviation, as defined in <locale.h>,
    but not LC_ALL. E.g. LC_MESSAGES.
    CATEGORYNAME is the name of CATEGORY as a string, e.g. "LC_MESSAGES".
    Return the locale category's name, canonicalized into XPG syntax
      address@hidden
-   or NULL if no locale has been specified to setlocale() or by environment
+   or NULL if no locale has been specified to setlocale or by environment
    variables.
-   The codeset part in the result is not reliable; the locale_charset()
+   The codeset part in the result is not reliable; locale_charset
    should be used for codeset information instead.
    The result must not be freed; it is statically allocated.  */
 extern const char * gl_locale_name_posix (int category, const char 
*categoryname);
 
 /* Determine the default locale's name.  This is the current locale's name,
-   if not specified by setlocale() calls or by environment variables.  This
+   if not specified by setlocale calls or by environment variables.  This
    locale name is usually determined by systems settings that the user can
    manipulate through a GUI.
 
diff --git a/lib/lseek.c b/lib/lseek.c
index db8dbfb..e3fc9b7 100644
--- a/lib/lseek.c
+++ b/lib/lseek.c
@@ -1,4 +1,4 @@
-/* An lseek() function that detects pipes.
+/* An lseek function that detects pipes.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/lstat.c b/lib/lstat.c
index 9dcb4cd..b16532b 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -39,7 +39,7 @@
    but on Solaris 9 and earlier it does not.
 
    If FILE has a trailing slash and specifies a symbolic link,
-   then use stat() to get more info on the referent of FILE.
+   then use stat to get more info on the referent of FILE.
    If the referent is a non-directory, then set errno to ENOTDIR
    and return -1.  Otherwise, return stat's result.  */
 
@@ -57,7 +57,7 @@ rpl_lstat (const char *file, struct stat *sbuf)
     return 0;
 
   /* FILE refers to a symbolic link and the name ends with a slash.
-     Call stat() to get info about the link's referent.  */
+     Call stat to get info about the link's referent.  */
 
   /* If stat fails, then we do the same.  */
   if (stat (file, sbuf) != 0)
diff --git a/lib/malloc.c b/lib/malloc.c
index eba131d..e9fd857 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -1,4 +1,4 @@
-/* malloc() function that is glibc compatible.
+/* malloc function that is glibc compatible.
 
    Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc.
 
diff --git a/lib/malloca.c b/lib/malloca.c
index 4145bf6..db3ef2a 100644
--- a/lib/malloca.c
+++ b/lib/malloca.c
@@ -21,25 +21,25 @@
 /* Specification.  */
 #include "malloca.h"
 
-/* The speed critical point in this file is freea() applied to an alloca()
-   result: it must be fast, to match the speed of alloca().  The speed of
-   mmalloca() and freea() in the other case are not critical, because they
+/* The speed critical point in this file is freea applied to an alloca
+   result: it must be fast, to match the speed of alloca.  The speed of
+   mmalloca and freea in the other case are not critical, because they
    are only invoked for big memory sizes.  */
 
 #if HAVE_ALLOCA
 
-/* Store the mmalloca() results in a hash table.  This is needed to reliably
-   distinguish a mmalloca() result and an alloca() result.
+/* Store the mmalloca results in a hash table.  This is needed to reliably
+   distinguish a mmalloca result and an alloca() result.
 
-   Although it is possible that the same pointer is returned by alloca() and
-   by mmalloca() at different times in the same application, it does not lead
-   to a bug in freea(), because:
-     - Before a pointer returned by alloca() can point into malloc()ed memory,
+   Although it is possible that the same pointer is returned by alloca and
+   by mmalloca at different times in the same application, it does not lead
+   to a bug in freea, because:
+     - Before a pointer returned by alloca can point into malloced memory,
        the function must return, and once this has happened the programmer must
-       not call freea() on it anyway.
-     - Before a pointer returned by mmalloca() can point into the stack, it
-       must be freed.  The only function that can free it is freea(), and
-       when freea() frees it, it also removes it from the hash table.  */
+       not call freea on it anyway.
+     - Before a pointer returned by mmalloca can point into the stack, it
+       must be freed.  The only function that can free it is freea, and
+       when freea frees it, it also removes it from the hash table.  */
 
 #define MAGIC_NUMBER 0x1415fb4a
 #define MAGIC_SIZE sizeof (int)
@@ -65,8 +65,8 @@ void *
 mmalloca (size_t n)
 {
 #if HAVE_ALLOCA
-  /* Allocate one more word, that serves as an indicator for malloc()ed
-     memory, so that freea() of an alloca() result is fast.  */
+  /* Allocate one more word, that serves as an indicator for malloced
+     memory, so that freea of an alloca() result is fast.  */
   size_t nplus = n + HEADER_SIZE;
 
   if (nplus >= n)
@@ -105,16 +105,16 @@ mmalloca (size_t n)
 void
 freea (void *p)
 {
-  /* mmalloca() may have returned NULL.  */
+  /* mmalloca may have returned NULL.  */
   if (p != NULL)
     {
-      /* Attempt to quickly distinguish the mmalloca() result - which has
-        a magic indicator word - and the alloca() result - which has an
+      /* Attempt to quickly distinguish the mmalloca result - which has
+        a magic indicator word - and the alloca result - which has an
         uninitialized indicator word.  It is for this test that sa_increment
-        additional bytes are allocated in the alloca() case.  */
+        additional bytes are allocated in the alloca case.  */
       if (((int *) p)[-1] == MAGIC_NUMBER)
        {
-         /* Looks like a mmalloca() result.  To see whether it really is one,
+         /* Looks like a mmalloca result.  To see whether it really is one,
             perform a lookup in the hash table.  */
          size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
          void **chain = &mmalloca_results[slot];
@@ -131,7 +131,7 @@ freea (void *p)
              chain = &((struct header *) ((char *) *chain - 
HEADER_SIZE))->next;
            }
        }
-      /* At this point, we know it was not a mmalloca() result.  */
+      /* At this point, we know it was not a mmalloca result.  */
     }
 }
 #endif
diff --git a/lib/malloca.h b/lib/malloca.h
index 2f74b96..10880c8 100644
--- a/lib/malloca.h
+++ b/lib/malloca.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 
 /* malloca(N) is a safe variant of alloca(N).  It allocates N bytes of
-   memory allocated on the stack, that must be freed using freea() before
+   memory allocated on the stack, that must be freed using freea before
    the function returns.  Upon failure, it returns NULL.  */
 #if HAVE_ALLOCA
 # define malloca(N) \
@@ -63,7 +63,7 @@ extern "C" {
 #endif
 extern void * mmalloca (size_t n);
 
-/* Free a block of memory allocated through malloca().  */
+/* Free a block of memory allocated through malloca.  */
 #if HAVE_ALLOCA
 extern void freea (void *p);
 #else
diff --git a/lib/malloca.valgrind b/lib/malloca.valgrind
index 52f0a50..e784750 100644
--- a/lib/malloca.valgrind
+++ b/lib/malloca.valgrind
@@ -1,4 +1,4 @@
-# Suppress a valgrind message about use of uninitialized memory in freea().
+# Suppress a valgrind message about use of uninitialized memory in freea.
 # This use is OK because it provides only a speedup.
 {
     freea
diff --git a/lib/mbfile.h b/lib/mbfile.h
index 92c3fb7..84a556c 100644
--- a/lib/mbfile.h
+++ b/lib/mbfile.h
@@ -103,7 +103,7 @@ mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi 
*mbf)
       mbf->bufcount++;
     }
 
-  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  /* Handle most ASCII characters quickly, without calling mbrtowc.  */
   if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0]))
     {
       /* These characters are part of the basic character set.  ISO C 99
@@ -194,7 +194,7 @@ mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi 
*mbf)
   mbf->bufcount -= bytes;
   if (mbf->bufcount > 0)
     {
-      /* It's not worth calling memmove() for so few bytes.  */
+      /* It's not worth calling memmove for so few bytes.  */
       unsigned int count = mbf->bufcount;
       char *p = &mbf->buf[0];
 
diff --git a/lib/mbiter.h b/lib/mbiter.h
index b274da7..5a3f7ae 100644
--- a/lib/mbiter.h
+++ b/lib/mbiter.h
@@ -119,7 +119,7 @@ mbiter_multi_next (struct mbiter_multi *iter)
     return;
   if (iter->in_shift)
     goto with_shift;
-  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  /* Handle most ASCII characters quickly, without calling mbrtowc.  */
   if (is_basic (*iter->cur.ptr))
     {
       /* These characters are part of the basic character set.  ISO C 99
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 3c54133..695ca3d 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -26,13 +26,13 @@
 
 #include <string.h>
 
-/* Get isprint().  */
+/* Get isprint.  */
 #include <ctype.h>
 
-/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+/* Get mbstate_t, mbrtowc, mbsinit, wcwidth.  */
 #include <wchar.h>
 
-/* Get iswcntrl().  */
+/* Get iswcntrl.  */
 #include <wctype.h>
 
 #ifndef mbsinit
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 15da406..295597e 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -16,7 +16,7 @@
 
 #include <stddef.h>
 
-/* Avoid a clash of our mbswidth() with a function of the same name defined
+/* Avoid a clash of our mbswidth with a function of the same name defined
    in UnixWare 7.1.1 <wchar.h>.  We need this #include before the #define
    below.
    However, we don't want to #include <wchar.h> on all platforms because
diff --git a/lib/mbuiter.h b/lib/mbuiter.h
index 213e710..cfbb44f 100644
--- a/lib/mbuiter.h
+++ b/lib/mbuiter.h
@@ -127,7 +127,7 @@ mbuiter_multi_next (struct mbuiter_multi *iter)
     return;
   if (iter->in_shift)
     goto with_shift;
-  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  /* Handle most ASCII characters quickly, without calling mbrtowc.  */
   if (is_basic (*iter->cur.ptr))
     {
       /* These characters are part of the basic character set.  ISO C 99
diff --git a/lib/mktime.c b/lib/mktime.c
index a91fb20..5d2e85a 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -504,9 +504,9 @@ time_t
 mktime (struct tm *tp)
 {
 #ifdef _LIBC
-  /* POSIX.1 8.1.1 requires that whenever mktime() is called, the
+  /* POSIX.1 8.1.1 requires that whenever mktime is called, the
      time zone names contained in the external variable `tzname' shall
-     be set as if the tzset() function had been called.  */
+     be set as if the tzset function had been called.  */
   __tzset ();
 #endif
 
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 4c975c6..2bd4943 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -138,12 +138,12 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
 
-/* The results of opendir() in this file are not used with dirfd and fchdir,
+/* The results of opendir in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef opendir
 #undef closedir
@@ -490,8 +490,8 @@ read_file_system_list (bool need_fs_type)
 
 #if defined MOUNTED_FS_STAT_DEV /* BeOS */
   {
-    /* The next_dev() and fs_stat_dev() system calls give the list of
-       all file systems, including the information returned by statvfs()
+    /* The next_dev and fs_stat_dev system calls give the list of
+       all file systems, including the information returned by statvfs
        (fs type, total blocks, free blocks etc.), but without the mount
        point. But on BeOS all file systems except / are mounted in the
        rootfs, directly under /.
@@ -682,7 +682,7 @@ read_file_system_list (bool need_fs_type)
 
     if (ferror (fp))
       {
-       /* The last fread() call must have failed.  */
+       /* The last fread call must have failed.  */
        int saved_errno = errno;
        fclose (fp);
        errno = saved_errno;
diff --git a/lib/obstack.h b/lib/obstack.h
index 1bf4b2f..80f4cfb 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -49,7 +49,7 @@ symbols.
 In practice this often means you will build many short symbols and a
 few long symbols.  At the time you are reading a symbol you don't know
 how long it is.  One traditional method is to read a symbol into a
-buffer, realloc()ating the buffer every time you try to read a symbol
+buffer, reallocating the buffer every time you try to read a symbol
 that is longer than the buffer.  This is beaut, but you still will
 want to copy the symbol from the buffer to a more permanent
 symbol-table entry say about half the time.
diff --git a/lib/open.c b/lib/open.c
index a52bf93..4e76434 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -21,7 +21,7 @@
 /* Specification.  */
 #include <fcntl.h>
 
-/* If the fchdir replacement is used, open() is defined in fchdir.c.  */
+/* If the fchdir replacement is used, 'open' is defined in fchdir.c.  */
 #ifndef FCHDIR_REPLACEMENT
 
 # include <stdarg.h>
diff --git a/lib/openat-proc.c b/lib/openat-proc.c
index e84dc45..c6e13fa 100644
--- a/lib/openat-proc.c
+++ b/lib/openat-proc.c
@@ -33,7 +33,7 @@
 #include "same-inode.h"
 #include "xalloc.h"
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index 7551300..d8b685a 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -48,7 +48,7 @@
 # endif
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
@@ -61,7 +61,7 @@
 typedef size_t info_t;
 # else
 /* For each memory region, we store the original pointer returned by
-   malloc().  */
+   malloc.  */
 typedef void * info_t;
 # endif
 
@@ -105,7 +105,7 @@ get_memnode (void *aligned_ptr)
 
   if (c == NULL)
     /* An attempt to free untracked memory.  A wrong pointer was passed
-       to pagealign_free().  */
+       to pagealign_free.  */
     abort ();
 
   /* Remove this entry from the list, save the return value, and free it.  */
diff --git a/lib/pipe.c b/lib/pipe.c
index f10cc95..cabd5f0 100644
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -67,7 +67,7 @@ extern char **environ;
 # define STDERR_FILENO 2
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
@@ -134,9 +134,9 @@ create_pipe (const char *progname,
 #if defined _MSC_VER || defined __MINGW32__
 
   /* Native Woe32 API.
-     This uses _pipe(), dup2(), and spawnv().  It could also be implemented
-     using the low-level functions CreatePipe(), DuplicateHandle(),
-     CreateProcess() and _open_osfhandle(); see the GNU make and GNU clisp
+     This uses _pipe, dup2, and spawnv.  It could also be implemented
+     using the low-level functions CreatePipe, DuplicateHandle,
+     CreateProcess and _open_osfhandle; see the GNU make and GNU clisp
      and cvs source code.  */
   int ifd[2];
   int ofd[2];
@@ -198,7 +198,7 @@ create_pipe (const char *progname,
                  || (dup2 (stdoutfd, STDOUT_FILENO) >= 0
                      && close (stdoutfd) >= 0)))))
     /* The child process doesn't inherit ifd[0], ifd[1], ofd[0], ofd[1],
-       but it inherits all open()ed or dup2()ed file handles (which is what
+       but it inherits all opened or dup2ed file handles (which is what
        we want in the case of STD*_FILENO) and also orig_stdin,
        orig_stdout, orig_stderr (which is not explicitly wanted but
        harmless).  */
@@ -363,7 +363,7 @@ create_pipe (const char *progname,
 # else
   if (slave_process)
     block_fatal_signals ();
-  /* Use vfork() instead of fork() for efficiency.  */
+  /* Use vfork instead of fork for efficiency.  */
   if ((child = vfork ()) == 0)
     {
       /* Child process code.  */
diff --git a/lib/pipe.h b/lib/pipe.h
index b484775..0a37fa2 100644
--- a/lib/pipe.h
+++ b/lib/pipe.h
@@ -38,7 +38,7 @@ extern "C" {
    process exits with an error message; otherwise, an error message is given
    if null_stderr is false, then -1 is returned and fd[] remain uninitialized.
 
-   After finishing communication, the caller should call wait_subprocess()
+   After finishing communication, the caller should call wait_subprocess
    to get rid of the subprocess in the process table.
 
    If slave_process is true, the child process will be terminated when its
@@ -49,8 +49,8 @@ extern "C" {
 
    If exit_on_error is false, a child process id of -1 should be treated the
    same way as a subprocess which accepts no input, produces no output and
-   terminates with exit code 127.  Why?  Some errors during posix_spawnp()
-   cause the function posix_spawnp() to return an error code; some other
+   terminates with exit code 127.  Why?  Some errors during posix_spawnp
+   cause the function posix_spawnp to return an error code; some other
    errors cause the subprocess to exit with return code 127.  It is
    implementation dependent which error is reported which way.  The caller
    must treat both cases as equivalent.
@@ -58,10 +58,10 @@ extern "C" {
    It is recommended that no signal is blocked or ignored (i.e. have a
    signal handler with value SIG_IGN) while any of these functions is called.
    The reason is that child processes inherit the mask of blocked signals
-   from their parent (both through posix_spawn() and fork()/exec());
+   from their parent (both through posix_spawn and fork/exec);
    likewise, signals ignored in the parent are also ignored in the child
    (except possibly for SIGCHLD).  And POSIX:2001 says [in the description
-   of exec()]:
+   of exec]:
        "it should be noted that many existing applications wrongly
         assume that they start with certain signals set to the default
         action and/or unblocked. In particular, applications written
diff --git a/lib/posixtm.c b/lib/posixtm.c
index fff53f5..a5251f1 100644
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -190,7 +190,7 @@ posixtime (time_t *p, const char *s, unsigned int 
syntax_bits)
 #ifdef lint
   /* Placate gcc-4's -Wuninitialized.
      posix_time_parse fails to set all of tm0 only when it returns
-     nonzero (due to year() returning nonzero), and in that case,
+     nonzero (due to year returning nonzero), and in that case,
      this code doesn't use the tm0 at all.  */
     = { 0, }
 #endif
diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index e3aa95a..7c7c6d9 100644
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -60,7 +60,7 @@
 # include <stdint.h>
 #endif
 
-/* malloc(), realloc(), free().  */
+/* malloc, realloc, free.  */
 #include <stdlib.h>
 
 /* errno.  */
diff --git a/lib/progname.c b/lib/progname.c
index fa5aa8b..3ffbe4d 100644
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -26,7 +26,7 @@
 
 
 /* String containing name the program is called with.
-   To be initialized by main().  */
+   To be initialized by the 'main' function.  */
 const char *program_name = NULL;
 
 /* Set program_name, based on argv[0].  */
diff --git a/lib/progname.h b/lib/progname.h
index 82615c6..7da3091 100644
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -18,7 +18,7 @@
 #ifndef _PROGNAME_H
 #define _PROGNAME_H
 
-/* Programs using this file should do the following in main():
+/* Programs using this file should do the following in their main functions:
      set_program_name (argv[0]);
  */
 
diff --git a/lib/progreloc.c b/lib/progreloc.c
index 7c677b0..bef179b 100644
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -74,7 +74,7 @@
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
@@ -94,7 +94,7 @@ static int executable_fd = -1;
 static bool
 maybe_executable (const char *filename)
 {
-  /* Woe32 lacks the access() function, but Cygwin doesn't.  */
+  /* Woe32 lacks the 'access' function, but Cygwin doesn't.  */
 #if !(defined WIN32_NATIVE && !defined __CYGWIN__)
   if (access (filename, X_OK) < 0)
     return false;
@@ -199,7 +199,7 @@ find_executable (const char *argv0)
     return canonicalize_file_name (location);
 #endif
   /* Guess the executable's full path.  We assume the executable has been
-     called via execlp() or execvp() with properly set up argv[0].  The
+     called via execlp or execvp with properly set up argv[0].  The
      login(1) convention to add a '-' prefix to argv[0] is not supported.  */
   {
     bool has_slash = false;
@@ -308,7 +308,7 @@ set_program_name_and_installdir (const char *argv0,
        {
          if (sizeof (EXEEXT) > sizeof (""))
            {
-             /* Compare using an inlined copy of c_strncasecmp(), because
+             /* Compare using an inlined copy of c_strncasecmp, because
                 the filenames may have undergone a case conversion since
                 they were packaged.  In other words, EXEEXT may be ".exe"
                 on one system and ".EXE" on another.  */
diff --git a/lib/readlink.c b/lib/readlink.c
index 5cccdc9..ee0e4b2 100644
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -1,4 +1,4 @@
-/* Stub for readlink().
+/* Stub for readlink.
    Copyright (C) 2003-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,10 +26,10 @@
 
 #if !HAVE_READLINK
 
-/* readlink() substitute for systems that don't have a readlink() function,
+/* readlink substitute for systems that don't have a readlink() function,
    such as DJGPP 2.03 and mingw32.  */
 
-/* The official POSIX return type of readlink() is ssize_t, but since here
+/* The official POSIX return type of readlink is ssize_t, but since here
    we have no declaration in a public header file, we use 'int' as return
    type.  */
 
@@ -38,9 +38,9 @@ readlink (const char *path, char *buf, size_t bufsize)
 {
   struct stat statbuf;
 
-  /* In general we should use lstat() here, not stat().  But on platforms
-     without symbolic links lstat() - if it exists - would be equivalent to
-     stat(), therefore we can use stat().  This saves us a configure check.  */
+  /* In general we should use lstat here, not stat.  But on platforms
+     without symbolic links lstat - if it exists - would be equivalent to
+     stat, therefore we can use stat.  This saves us a configure check.  */
   if (stat (path, &statbuf) >= 0)
     errno = EINVAL;
   return -1;
diff --git a/lib/realloc.c b/lib/realloc.c
index b61c2ca..1085ec5 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -1,4 +1,4 @@
-/* realloc() function that is glibc compatible.
+/* realloc function that is glibc compatible.
 
    Copyright (C) 1997, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
@@ -32,7 +32,7 @@
 
 /* Below we want to call the system's malloc and realloc.
    Undefine the symbols here so that including <stdlib.h> provides a
-   declaration of malloc(), not of rpl_malloc(), and likewise for realloc.  */
+   declaration of malloc, not of rpl_malloc(), and likewise for realloc.  */
 #undef malloc
 #undef realloc
 
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 5c07f93..1076ca4 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -47,7 +47,7 @@
 # define __libc_lock_unlock(NAME) do { } while (0)
 #endif
 
-/* In case that the system doesn't have isblank().  */
+/* In case that the system doesn't have isblank.  */
 #if !defined _LIBC && ! (defined isblank || (HAVE_ISBLANK && 
HAVE_DECL_ISBLANK))
 # define isblank(ch) ((ch) == ' ' || (ch) == '\t')
 #endif
@@ -362,7 +362,7 @@ typedef struct
 struct re_string_t
 {
   /* Indicate the raw buffer which is the original string passed as an
-     argument of regexec(), re_search(), etc..  */
+     argument of regexec, re_search, etc.  */
   const unsigned char *raw_mbs;
   /* Store the multibyte string.  In case of "case insensitive mode" like
      REG_ICASE, upper cases of the string are stored, otherwise MBS points
diff --git a/lib/regexec.c b/lib/regexec.c
index b136570..b6eff55 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -287,13 +287,13 @@ compat_symbol (libc, __compat_regexec, regexec, 
GLIBC_2_0);
    while the later two operate on concatenation of STRING1 and STRING2
    with lengths LENGTH1 and LENGTH2, respectively.
 
-   re_match() matches the compiled pattern in BUFP against the string,
+   re_match matches the compiled pattern in BUFP against the string,
    starting at index START.
 
-   re_search() first tries matching at index START, then it tries to match
+   re_search first tries matching at index START, then it tries to match
    starting from index START + 1, and so on.  The last start position tried
    is START + RANGE.  (Thus RANGE = 0 forces re_search to operate the same
-   way as re_match().)
+   way as re_match.)
 
    The parameter STOP of re_{match,search}_2 specifies that no match exceeding
    the first STOP characters of the concatenation of the strings should be
@@ -2702,10 +2702,10 @@ transit_state_bkref (re_match_context_t *mctx, const 
re_node_set *nodes)
 }
 
 /* Enumerate all the candidates which the backreference BKREF_NODE can match
-   at BKREF_STR_IDX, and register them by match_ctx_add_entry().
+   at BKREF_STR_IDX, and register them by match_ctx_add_entry.
    Note that we might collect inappropriate candidates here.
    However, the cost of checking them strictly here is too high, then we
-   delay these checking for prune_impossible_nodes().  */
+   delay these checking for prune_impossible_nodes.  */
 
 static reg_errcode_t
 internal_function
@@ -2851,7 +2851,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx 
bkref_str_idx)
   return REG_NOERROR;
 }
 
-/* Helper functions for get_subexp().  */
+/* Helper functions for get_subexp.  */
 
 /* Check SUB_LAST can arrive to the back reference BKREF_NODE at BKREF_STR.
    If it can arrive, register the sub expression expressed with SUB_TOP
@@ -3066,7 +3066,7 @@ check_arrival (re_match_context_t *mctx, state_array_t 
*path, Idx top_node,
 
 /* Calculate the destination nodes of CUR_NODES at STR_IDX, and append them
    to NEXT_NODES.
-   TODO: This function is similar to the functions transit_state*(),
+   TODO: This function is similar to the functions transit_state*,
         however this function has many additional works.
         Can't we unify them?  */
 
diff --git a/lib/relocatable.c b/lib/relocatable.c
index 5e1dde6..dd06c64 100644
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -18,7 +18,7 @@
    USA.  */
 
 
-/* Tell glibc's <stdio.h> to provide a prototype for getline().
+/* Tell glibc's <stdio.h> to provide a prototype for the getline function.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
@@ -333,7 +333,7 @@ static void
 find_shared_library_fullname ()
 {
 #if defined __linux__ && __GLIBC__ >= 2
-  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
+  /* Linux has /proc/self/maps. glibc 2 has the getline function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */
diff --git a/lib/relocatable.h b/lib/relocatable.h
index f6d3832..9ec60f1 100644
--- a/lib/relocatable.h
+++ b/lib/relocatable.h
@@ -52,9 +52,9 @@ extern RELOCATABLE_DLL_EXPORTED void
    directory.  */
 extern const char * relocate (const char *pathname);
 
-/* Memory management: relocate() leaks memory, because it has to construct
+/* Memory management: 'relocate' leaks memory, because it has to construct
    a fresh pathname.  If this is a problem because your program calls
-   relocate() frequently, think about caching the result.  */
+   'relocate' frequently, think about caching the result.  */
 
 /* Convenience function:
    Computes the current installation prefix, based on the original
diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c
index ca186c3..3827709 100644
--- a/lib/relocwrapper.c
+++ b/lib/relocwrapper.c
@@ -40,7 +40,7 @@
 
    We don't want to internationalize this wrapper because then it would
    depend on libintl and therefore need relocation itself.  So use only
-   libc functions, no gettext(), no error(), no xmalloc(), no xsetenv().
+   libc functions, no gettext, no error, no xmalloc, no xsetenv.
  */
 
 #include <config.h>
@@ -73,7 +73,7 @@ add_dotbin (const char *filename)
          static const char exeext[] = EXEEXT;
          if (filename_len > exeext_len)
            {
-             /* Compare using an inlined copy of c_strncasecmp(), because
+             /* Compare using an inlined copy of c_strncasecmp, because
                 the filenames may have undergone a case conversion since
                 they were packaged.  In other words, EXEEXT may be ".exe"
                 on one system and ".EXE" on another.  */
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
   char *full_program_name;
 
   /* Set the program name and perform preparations for
-     get_full_program_name() and relocate().  */
+     get_full_program_name and relocate.  */
   set_program_name_and_installdir (argv[0], INSTALLPREFIX, INSTALLDIR);
 
   /* Get the full program path.  (Important if accessed through a symlink.)  */
diff --git a/lib/safe-read.h b/lib/safe-read.h
index ba19171..09393d3 100644
--- a/lib/safe-read.h
+++ b/lib/safe-read.h
@@ -1,4 +1,4 @@
-/* An interface to read() that retries after interrupts.
+/* An interface to 'read' that retries after interrupts.
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/safe-write.h b/lib/safe-write.h
index da036a9..662ea29 100644
--- a/lib/safe-write.h
+++ b/lib/safe-write.h
@@ -1,4 +1,4 @@
-/* An interface to write() that retries after interrupts.
+/* An interface to 'write' that retries after interrupts.
    Copyright (C) 2002 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/savedir.c b/lib/savedir.c
index b837414..a1543de 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -42,7 +42,7 @@
 # define NAME_SIZE_DEFAULT 512
 #endif
 
-/* The results of opendir() in this file are not used with dirfd and fchdir,
+/* The results of opendir in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef opendir
 #undef closedir
diff --git a/lib/setenv.h b/lib/setenv.h
index 9f5d0b7..56637bf 100644
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -16,7 +16,7 @@
 
 #if HAVE_SETENV || HAVE_UNSETENV
 
-/* Get setenv(), unsetenv() declarations.  */
+/* Get setenv, unsetenv declarations.  */
 # include <stdlib.h>
 
 #endif
@@ -36,7 +36,7 @@ extern int setenv (const char *name, const char *value, int 
replace);
 #if HAVE_UNSETENV
 
 # if VOID_UNSETENV
-/* On some systems, unsetenv() returns void.
+/* On some systems, unsetenv returns void.
    This is the case for FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4.  */
 #  define unsetenv(name) ((unsetenv)(name), 0)
 # endif
diff --git a/lib/signbitd.c b/lib/signbitd.c
index 8907766..f543c59 100644
--- a/lib/signbitd.c
+++ b/lib/signbitd.c
@@ -1,4 +1,4 @@
-/* signbit() macro: Determine the sign bit of a floating-point number.
+/* signbit macro: Determine the sign bit of a floating-point number.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/signbitf.c b/lib/signbitf.c
index 8b0f93c..3855ac9 100644
--- a/lib/signbitf.c
+++ b/lib/signbitf.c
@@ -1,4 +1,4 @@
-/* signbit() macro: Determine the sign bit of a floating-point number.
+/* signbit macro: Determine the sign bit of a floating-point number.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/signbitl.c b/lib/signbitl.c
index 7024697..ac6c758 100644
--- a/lib/signbitl.c
+++ b/lib/signbitl.c
@@ -1,4 +1,4 @@
-/* signbit() macro: Determine the sign bit of a floating-point number.
+/* signbit macro: Determine the sign bit of a floating-point number.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index 221fc96..83642f9 100644
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 /* We assume that a platform without POSIX signal blocking functions also
-   does not have the POSIX sigaction() function, only the signal() function.
+   does not have the POSIX sigaction function, only the signal function.
    This is true for Woe32 platforms.  */
 
 /* A signal handler.  */
diff --git a/lib/sleep.c b/lib/sleep.c
index 9c56b9b..97e056a 100644
--- a/lib/sleep.c
+++ b/lib/sleep.c
@@ -41,6 +41,6 @@ sleep (unsigned int seconds)
 
 #else
 
- #error "Please port gnulib sleep.c to your platform, possibly using usleep() 
or select(), then report this to bug-gnulib."
+ #error "Please port gnulib sleep.c to your platform, possibly using usleep or 
select, then report this to bug-gnulib."
 
 #endif
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 772709c..5307ee2 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -201,7 +201,7 @@ extern int vsprintf (char *str, const char *format, va_list 
args)
 #  define vasprintf rpl_vasprintf
 # endif
 # if @REPLACE_VASPRINTF@ || address@hidden@
-  /* Write formatted output to a string dynamically allocated with malloc().
+  /* Write formatted output to a string dynamically allocated with malloc.
      If the memory allocation succeeds, store the address of the string in
      *RESULT and return the number of resulting bytes, excluding the trailing
      NUL.  Upon memory allocation error, or some other error, return -1.  */
@@ -241,7 +241,7 @@ extern FILE * freopen (const char *filename, const char 
*mode, FILE *stream);
 #if @GNULIB_FSEEKO@
 # if @REPLACE_FSEEKO@
 /* Provide fseek, fseeko functions that are aware of a preceding
-   fflush(), and which detect pipes.  */
+   fflush, and which detect pipes.  */
 #  define fseeko rpl_fseeko
 extern int fseeko (FILE *fp, off_t offset, int whence);
 #  define fseek(fp, offset, whence) fseeko (fp, (off_t)(offset), whence)
diff --git a/lib/strftime.c b/lib/strftime.c
index c6a9c80..d92451c 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -430,7 +430,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
   /* We cannot make the following values variables since we must delay
      the evaluation of these values until really needed since some
      expressions might not be valid in every situation.  The `struct tm'
-     might be generated by a strptime() call that initialized
+     might be generated by a strptime call that initialized
      only a few elements.  Dereference the pointers only if the format
      requires this.  Then it is ok to fail if the pointers are invalid.  */
 # define a_wkday \
@@ -469,7 +469,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
   zone = NULL;
 #if HAVE_TM_ZONE
   /* The POSIX test suite assumes that setting
-     the environment variable TZ to a new value before calling strftime()
+     the environment variable TZ to a new value before calling strftime
      will influence the result (the %Z format) even if the information in
      TP is computed with a totally different time zone.
      This is bogus: though POSIX allows bad behavior like this,
@@ -1294,7 +1294,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
            }
 
 #if HAVE_TZNAME
-         /* The tzset() call might have changed the value.  */
+         /* The tzset call might have changed the value.  */
          if (!(zone && *zone) && tp->tm_isdst >= 0)
            zone = tzname[tp->tm_isdst != 0];
 #endif
diff --git a/lib/striconv.c b/lib/striconv.c
index ea4fa29..587897f 100644
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -83,8 +83,8 @@ mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
              return -1;
          }
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-       /* Irix iconv() inserts a NUL byte if it cannot convert.
-          NetBSD iconv() inserts a question mark if it cannot convert.
+       /* Irix iconv inserts a NUL byte if it cannot convert.
+          NetBSD iconv inserts a question mark if it cannot convert.
           Only GNU libiconv and GNU libc are known to prefer to fail rather
           than doing a lossy conversion.  */
        else if (res > 0)
@@ -157,8 +157,8 @@ mem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
              goto fail;
          }
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-       /* Irix iconv() inserts a NUL byte if it cannot convert.
-          NetBSD iconv() inserts a question mark if it cannot convert.
+       /* Irix iconv inserts a NUL byte if it cannot convert.
+          NetBSD iconv inserts a question mark if it cannot convert.
           Only GNU libiconv and GNU libc are known to prefer to fail rather
           than doing a lossy conversion.  */
        else if (res > 0)
@@ -208,12 +208,12 @@ str_cd_iconv (const char *src, iconv_t cd)
      function is usable for UTF-7, we have to exclude the NUL byte from the
      conversion and add it by hand afterwards.  */
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-  /* Irix iconv() inserts a NUL byte if it cannot convert.
-     NetBSD iconv() inserts a question mark if it cannot convert.
+  /* Irix iconv inserts a NUL byte if it cannot convert.
+     NetBSD iconv inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
-     than doing a lossy conversion.  For other iconv() implementations,
+     than doing a lossy conversion.  For other iconv implementations,
      we have to look at the number of irreversible conversions returned;
-     but this information is lost when iconv() returns for an E2BIG reason.
+     but this information is lost when iconv returns for an E2BIG reason.
      Therefore we cannot use the second, faster algorithm.  */
 
   char *result = NULL;
@@ -244,7 +244,7 @@ str_cd_iconv (const char *src, iconv_t cd)
 
 # else
   /* This algorithm is likely faster than the one above.  But it may produce
-     iconv() returns for an E2BIG reason, when the output size guess is too
+     iconv returns for an E2BIG reason, when the output size guess is too
      small.  Therefore it can only be used when we don't need the number of
      irreversible conversions performed.  */
   char *result;
@@ -449,7 +449,7 @@ str_iconv (const char *src, const char *from_codeset, const 
char *to_codeset)
       /* This is a different error code than if iconv_open existed but didn't
         support from_codeset and to_codeset, so that the caller can emit
         an error message such as
-          "iconv() is not supported. Installing GNU libiconv and
+          "iconv is not supported. Installing GNU libiconv and
            then reinstalling this package would fix this."  */
       errno = ENOSYS;
       return NULL;
diff --git a/lib/striconveh.c b/lib/striconveh.c
index 99bbe18..2361647 100644
--- a/lib/striconveh.c
+++ b/lib/striconveh.c
@@ -48,8 +48,8 @@
    a conversion error, and it returns in *INCREMENTED a boolean telling whether
    it has incremented the input pointers past the error location.  */
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-/* Irix iconv() inserts a NUL byte if it cannot convert.
-   NetBSD iconv() inserts a question mark if it cannot convert.
+/* Irix iconv inserts a NUL byte if it cannot convert.
+   NetBSD iconv inserts a question mark if it cannot convert.
    Only GNU libiconv and GNU libc are known to prefer to fail rather
    than doing a lossy conversion.  */
 static size_t
@@ -96,7 +96,7 @@ iconv_carefully (iconv_t cd,
   *inbytesleft = inptr_end - inptr;
   if (res != (size_t)(-1) && res > 0)
     {
-      /* iconv() has already incremented INPTR.  We cannot go back to a
+      /* iconv has already incremented INPTR.  We cannot go back to a
         previous INPTR, otherwise the state inside CD would become invalid,
         if FROM_CODESET is a stateful encoding.  So, tell the caller that
         *INBUF has already been incremented.  */
@@ -147,13 +147,13 @@ iconv_carefully_1 (iconv_t cd,
   *inbuf = inptr;
   *inbytesleft = inptr_end - inptr;
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-  /* Irix iconv() inserts a NUL byte if it cannot convert.
-     NetBSD iconv() inserts a question mark if it cannot convert.
+  /* Irix iconv inserts a NUL byte if it cannot convert.
+     NetBSD iconv inserts a question mark if it cannot convert.
      Only GNU libiconv and GNU libc are known to prefer to fail rather
      than doing a lossy conversion.  */
   if (res != (size_t)(-1) && res > 0)
     {
-      /* iconv() has already incremented INPTR.  We cannot go back to a
+      /* iconv has already incremented INPTR.  We cannot go back to a
         previous INPTR, otherwise the state inside CD would become invalid,
         if FROM_CODESET is a stateful encoding.  So, tell the caller that
         *INBUF has already been incremented.  */
@@ -256,7 +256,7 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
   /* When a conversion error occurs, we cannot start using CD1 and CD2 at
      this point: FROM_CODESET may be a stateful encoding like ISO-2022-KR.
      Instead, we have to start afresh from the beginning of SRC.  */
-  /* Use a temporary buffer, so that for small strings, a single malloc()
+  /* Use a temporary buffer, so that for small strings, a single malloc
      call will be sufficient.  */
 # define tmpbufsize 4096
   /* The alignment is needed when converting e.g. to glibc's WCHAR_T or
@@ -334,8 +334,8 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
          /* Use iconv_carefully instead of iconv here, because:
             - If TO_CODESET is UTF-8, we can do the error handling in this
               loop, no need for a second loop,
-            - With iconv() implementations other than GNU libiconv and GNU
-              libc, if we use iconv() in a big swoop, checking for an E2BIG
+            - With iconv implementations other than GNU libiconv and GNU
+              libc, if we use iconv in a big swoop, checking for an E2BIG
               return, we lose the number of irreversible conversions.  */
          res = iconv_carefully (cd,
                                 &inptr, &insize,
@@ -785,8 +785,8 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
                            length = out2ptr - result;
                          }
 # if !defined _LIBICONV_VERSION && !defined __GLIBC__
-                       /* Irix iconv() inserts a NUL byte if it cannot convert.
-                          NetBSD iconv() inserts a question mark if it cannot
+                       /* Irix iconv inserts a NUL byte if it cannot convert.
+                          NetBSD iconv inserts a question mark if it cannot
                           convert.
                           Only GNU libiconv and GNU libc are known to prefer
                           to fail rather than doing a lossy conversion.  */
@@ -1095,7 +1095,7 @@ mem_iconveh (const char *src, size_t srclen,
       /* This is a different error code than if iconv_open existed but didn't
         support from_codeset and to_codeset, so that the caller can emit
         an error message such as
-          "iconv() is not supported. Installing GNU libiconv and
+          "iconv is not supported. Installing GNU libiconv and
            then reinstalling this package would fix this."  */
       errno = ENOSYS;
       return -1;
@@ -1223,7 +1223,7 @@ str_iconveh (const char *src,
       /* This is a different error code than if iconv_open existed but didn't
         support from_codeset and to_codeset, so that the caller can emit
         an error message such as
-          "iconv() is not supported. Installing GNU libiconv and
+          "iconv is not supported. Installing GNU libiconv and
            then reinstalling this package would fix this."  */
       errno = ENOSYS;
       return NULL;
diff --git a/lib/string.in.h b/lib/string.in.h
index c60e2f3..3ef9a52 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -105,7 +105,7 @@ extern char *stpncpy (char *restrict __dst, char const 
*restrict __src,
 #endif
 
 #if defined GNULIB_POSIXCHECK
-/* strchr() does not work with multibyte strings if the locale encoding is
+/* strchr does not work with multibyte strings if the locale encoding is
    GB18030 and the character to be searched is a digit.  */
 # undef strchr
 # define strchr(s,c) \
@@ -174,7 +174,7 @@ extern size_t strnlen (char const *__string, size_t 
__maxlen);
 #endif
 
 #if defined GNULIB_POSIXCHECK
-/* strcspn() assumes the second argument is a list of single-byte characters.
+/* strcspn assumes the second argument is a list of single-byte characters.
    Even in this simple case, it does not work with multibyte strings if the
    locale encoding is GB18030 and one of the characters to be searched is a
    digit.  */
@@ -192,7 +192,7 @@ extern size_t strnlen (char const *__string, size_t 
__maxlen);
 extern char *strpbrk (char const *__s, char const *__accept);
 # endif
 # if defined GNULIB_POSIXCHECK
-/* strpbrk() assumes the second argument is a list of single-byte characters.
+/* strpbrk assumes the second argument is a list of single-byte characters.
    Even in this simple case, it does not work with multibyte strings if the
    locale encoding is GB18030 and one of the characters to be searched is a
    digit.  */
@@ -212,7 +212,7 @@ extern char *strpbrk (char const *__s, char const 
*__accept);
 #endif
 
 #if defined GNULIB_POSIXCHECK
-/* strspn() assumes the second argument is a list of single-byte characters.
+/* strspn assumes the second argument is a list of single-byte characters.
    Even in this simple case, it cannot work with multibyte strings.  */
 # undef strspn
 # define strspn(s,a) \
@@ -223,7 +223,7 @@ extern char *strpbrk (char const *__s, char const 
*__accept);
 #endif
 
 #if defined GNULIB_POSIXCHECK
-/* strrchr() does not work with multibyte strings if the locale encoding is
+/* strrchr does not work with multibyte strings if the locale encoding is
    GB18030 and the character to be searched is a digit.  */
 # undef strrchr
 # define strrchr(s,c) \
@@ -239,7 +239,7 @@ extern char *strpbrk (char const *__s, char const 
*__accept);
    If *STRINGP was already NULL, nothing happens.
    Return the old value of *STRINGP.
 
-   This is a variant of strtok() that is multithread-safe and supports
+   This is a variant of strtok that is multithread-safe and supports
    empty fields.
 
    Caveat: It modifies the original string.
@@ -248,7 +248,7 @@ extern char *strpbrk (char const *__s, char const 
*__accept);
    Caveat: It doesn't work with multibyte strings unless all of the delimiter
            characters are ASCII characters < 0x30.
 
-   See also strtok_r().  */
+   See also strtok_r.  */
 #if @GNULIB_STRSEP@
 # if ! @HAVE_STRSEP@
 extern char *strsep (char **restrict __stringp, char const *restrict __delim);
@@ -270,7 +270,7 @@ extern char *strsep (char **restrict __stringp, char const 
*restrict __delim);
 #endif
 
 #if defined GNULIB_POSIXCHECK
-/* strstr() does not work with multibyte strings if the locale encoding is
+/* strstr does not work with multibyte strings if the locale encoding is
    different from UTF-8:
    POSIX says that it operates on "strings", and "string" in POSIX is defined
    as a sequence of bytes, not of characters.  */
@@ -288,7 +288,7 @@ extern char *strsep (char **restrict __stringp, char const 
*restrict __delim);
 extern char *strcasestr (const char *haystack, const char *needle);
 #endif
 #if defined GNULIB_POSIXCHECK
-/* strcasestr() does not work with multibyte strings:
+/* strcasestr does not work with multibyte strings:
    It is a glibc extension, and glibc implements it only for unibyte
    locales.  */
 # undef strcasestr
@@ -311,7 +311,7 @@ extern char *strcasestr (const char *haystack, const char 
*needle);
        x = strtok_r(NULL, "=", &sp);   // x = NULL
                // s = "abc\0-def\0"
 
-   This is a variant of strtok() that is multithread-safe.
+   This is a variant of strtok that is multithread-safe.
 
    For the POSIX documentation for this function, see:
    http://www.opengroup.org/susv3xsh/strtok.html
@@ -322,7 +322,7 @@ extern char *strcasestr (const char *haystack, const char 
*needle);
    Caveat: It doesn't work with multibyte strings unless all of the delimiter
            characters are ASCII characters < 0x30.
 
-   See also strsep().  */
+   See also strsep.  */
 #if @GNULIB_STRTOK_R@
 # if ! @HAVE_DECL_STRTOK_R@
 extern char *strtok_r (char *restrict s, char const *restrict delim,
@@ -363,7 +363,7 @@ extern size_t mbsnlen (const char *string, size_t len);
 #if @GNULIB_MBSCHR@
 /* Locate the first single-byte character C in the character string STRING,
    and return a pointer to it.  Return NULL if C is not found in STRING.
-   Unlike strchr(), this function works correctly in multibyte locales with
+   Unlike strchr, this function works correctly in multibyte locales with
    encodings such as GB18030.  */
 # define mbschr rpl_mbschr /* avoid collision with HP-UX function */
 extern char * mbschr (const char *string, int c);
@@ -372,7 +372,7 @@ extern char * mbschr (const char *string, int c);
 #if @GNULIB_MBSRCHR@
 /* Locate the last single-byte character C in the character string STRING,
    and return a pointer to it.  Return NULL if C is not found in STRING.
-   Unlike strrchr(), this function works correctly in multibyte locales with
+   Unlike strrchr, this function works correctly in multibyte locales with
    encodings such as GB18030.  */
 # define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */
 extern char * mbsrchr (const char *string, int c);
@@ -381,7 +381,7 @@ extern char * mbsrchr (const char *string, int c);
 #if @GNULIB_MBSSTR@
 /* Find the first occurrence of the character string NEEDLE in the character
    string HAYSTACK.  Return NULL if NEEDLE is not found in HAYSTACK.
-   Unlike strstr(), this function works correctly in multibyte locales with
+   Unlike strstr, this function works correctly in multibyte locales with
    encodings different from UTF-8.  */
 extern char * mbsstr (const char *haystack, const char *needle);
 #endif
@@ -392,7 +392,7 @@ extern char * mbsstr (const char *haystack, const char 
*needle);
    or greater than S2.
    Note: This function may, in multibyte locales, return 0 for strings of
    different lengths!
-   Unlike strcasecmp(), this function works correctly in multibyte locales.  */
+   Unlike strcasecmp, this function works correctly in multibyte locales.  */
 extern int mbscasecmp (const char *s1, const char *s2);
 #endif
 
@@ -404,7 +404,7 @@ extern int mbscasecmp (const char *s1, const char *s2);
    than, equal to or greater than the initial segment of S2.
    Note: This function may, in multibyte locales, return 0 for initial segments
    of different lengths!
-   Unlike strncasecmp(), this function works correctly in multibyte locales.
+   Unlike strncasecmp, this function works correctly in multibyte locales.
    But beware that N is not a byte count but a character count!  */
 extern int mbsncasecmp (const char *s1, const char *s2, size_t n);
 #endif
@@ -417,7 +417,7 @@ extern int mbsncasecmp (const char *s1, const char *s2, 
size_t n);
    PREFIX.
    Note: This function may, in multibyte locales, return 0 if STRING is of
    smaller length than PREFIX!
-   Unlike strncasecmp(), this function works correctly in multibyte
+   Unlike strncasecmp, this function works correctly in multibyte
    locales.  */
 extern char * mbspcasecmp (const char *string, const char *prefix);
 #endif
@@ -427,7 +427,7 @@ extern char * mbspcasecmp (const char *string, const char 
*prefix);
    string HAYSTACK, using case-insensitive comparison.
    Note: This function may, in multibyte locales, return success even if
    strlen (haystack) < strlen (needle) !
-   Unlike strcasestr(), this function works correctly in multibyte locales.  */
+   Unlike strcasestr, this function works correctly in multibyte locales.  */
 extern char * mbscasestr (const char *haystack, const char *needle);
 #endif
 
@@ -436,7 +436,7 @@ extern char * mbscasestr (const char *haystack, const char 
*needle);
    in the character string ACCEPT.  Return the number of bytes from the
    beginning of the string to this occurrence, or to the end of the string
    if none exists.
-   Unlike strcspn(), this function works correctly in multibyte locales.  */
+   Unlike strcspn, this function works correctly in multibyte locales.  */
 extern size_t mbscspn (const char *string, const char *accept);
 #endif
 
@@ -444,7 +444,7 @@ extern size_t mbscspn (const char *string, const char 
*accept);
 /* Find the first occurrence in the character string STRING of any character
    in the character string ACCEPT.  Return the pointer to it, or NULL if none
    exists.
-   Unlike strpbrk(), this function works correctly in multibyte locales.  */
+   Unlike strpbrk, this function works correctly in multibyte locales.  */
 # define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
 extern char * mbspbrk (const char *string, const char *accept);
 #endif
@@ -454,7 +454,7 @@ extern char * mbspbrk (const char *string, const char 
*accept);
    not in the character string REJECT.  Return the number of bytes from the
    beginning of the string to this occurrence, or to the end of the string
    if none exists.
-   Unlike strspn(), this function works correctly in multibyte locales.  */
+   Unlike strspn, this function works correctly in multibyte locales.  */
 extern size_t mbsspn (const char *string, const char *reject);
 #endif
 
@@ -466,13 +466,13 @@ extern size_t mbsspn (const char *string, const char 
*reject);
    If *STRINGP was already NULL, nothing happens.
    Return the old value of *STRINGP.
 
-   This is a variant of mbstok_r() that supports empty fields.
+   This is a variant of mbstok_r that supports empty fields.
 
    Caveat: It modifies the original string.
    Caveat: These functions cannot be used on constant strings.
    Caveat: The identity of the delimiting character is lost.
 
-   See also mbstok_r().  */
+   See also mbstok_r.  */
 extern char * mbssep (char **stringp, const char *delim);
 #endif
 
@@ -492,7 +492,7 @@ extern char * mbssep (char **stringp, const char *delim);
    Caveat: These functions cannot be used on constant strings.
    Caveat: The identity of the delimiting character is lost.
 
-   See also mbssep().  */
+   See also mbssep.  */
 extern char * mbstok_r (char *string, const char *delim, char **save_ptr);
 #endif
 
diff --git a/lib/strings.in.h b/lib/strings.in.h
index d87bc41..a5620bd 100644
--- a/lib/strings.in.h
+++ b/lib/strings.in.h
@@ -41,7 +41,7 @@ extern "C" {
 extern int strcasecmp (char const *s1, char const *s2);
 #endif
 #if defined GNULIB_POSIXCHECK
-/* strcasecmp() does not work with multibyte strings:
+/* strcasecmp does not work with multibyte strings:
    POSIX says that it operates on "strings", and "string" in POSIX is defined
    as a sequence of bytes, not of characters.   */
 # undef strcasecmp
@@ -63,7 +63,7 @@ extern int strcasecmp (char const *s1, char const *s2);
 extern int strncasecmp (char const *s1, char const *s2, size_t n);
 #endif
 #if defined GNULIB_POSIXCHECK
-/* strncasecmp() does not work with multibyte strings:
+/* strncasecmp does not work with multibyte strings:
    POSIX says that it operates on "strings", and "string" in POSIX is defined
    as a sequence of bytes, not of characters.  */
 # undef strncasecmp
diff --git a/lib/strptime.c b/lib/strptime.c
index a8791cf..a4e3726 100644
--- a/lib/strptime.c
+++ b/lib/strptime.c
@@ -52,7 +52,7 @@ enum ptime_locale_status { not, loc, raw };
 # define match_string(cs1, s2) \
   (strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1))
 #endif
-/* We intentionally do not use isdigit() for testing because this will
+/* We intentionally do not use isdigit for testing because this will
    lead to problems with the wide character version.  */
 #define get_number(from, to, n) \
   do {                                                                       \
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index c25b6ab..cda58cb 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -64,7 +64,7 @@
 #  include <ws2tcpip.h>
 # endif
 
-/* For shutdown(). */
+/* For 'shutdown'. */
 # if !defined SHUT_RD && defined SD_RECEIVE
 #  define SHUT_RD SD_RECEIVE
 # endif
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 2e411cd..fa0203b 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -261,7 +261,7 @@
 # define lstat stat
 #endif
 
-/* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
+/* mingw's _mkdir function has 1 argument, but we pass 2 arguments.
    Additionally, it declares _mkdir (and depending on compile flags, an
    alias mkdir), only in the nonstandard io.h.  */
 #if ! @HAVE_DECL_MKDIR@ && @HAVE_IO_H@
diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h
index 895d31e..e038005 100644
--- a/lib/sysexits.in.h
+++ b/lib/sysexits.in.h
@@ -1,4 +1,4 @@
-/* exit() exit codes for some BSD system programs.
+/* exit codes for some BSD system programs.
    Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/tempname.c b/lib/tempname.c
index 5a3a326..699d47f 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -192,7 +192,7 @@ static const char letters[] =
                        at the time of the call.
    __GT_FILE:          create the file using open(O_CREAT|O_EXCL)
                        and return a read-write fd.  The file is mode 0600.
-   __GT_BIGFILE:       same as __GT_FILE but use open64().
+   __GT_BIGFILE:       same as __GT_FILE but use open64.
    __GT_DIR:           create a directory, which will be mode 0700.
 
    We use a clever algorithm to get hard-to-predict names. */
diff --git a/lib/tmpfile.c b/lib/tmpfile.c
index 543e363..e88699e 100644
--- a/lib/tmpfile.c
+++ b/lib/tmpfile.c
@@ -38,7 +38,7 @@
 #include "tmpdir.h"
 
 /* On Windows, opening a file with _O_TEMPORARY has the effect of passing
-   the FILE_FLAG_DELETE_ON_CLOSE flag to CreateFile(), which has the effect
+   the FILE_FLAG_DELETE_ON_CLOSE flag to CreateFile, which has the effect
    of deleting the file when it is closed - even when the program crashes.
    But (according to the Cygwin sources) it works only on Windows NT or newer.
    So we cache the info whether we are running on Windows NT or newer.  */
@@ -116,7 +116,7 @@ tmpfile (void)
       if (retval > 0)
        errno = ENAMETOOLONG;
       else
-       /* Ideally this should translate GetLastError () to an errno value.  */
+       /* Ideally this should translate GetLastError to an errno value.  */
        errno = ENOENT;
     }
 
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 31201d3..5750093 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -17,7 +17,7 @@
 
 /* Written by Bruno Haible <address@hidden>.  */
 
-/* Note: This file requires the locale_charset() function.  See in
+/* Note: This file requires the locale_charset function.  See in
    libiconv-1.8/libcharset/INTEGRATE for how to obtain it.  */
 
 #include <config.h>
@@ -41,7 +41,7 @@
 
 #include "localcharset.h"
 
-/* When we pass a Unicode character to iconv(), we must pass it in a
+/* When we pass a Unicode character to iconv, we must pass it in a
    suitable encoding. The standardized Unicode encodings are
    UTF-8, UCS-2, UCS-4, UTF-16, UTF-16BE, UTF-16LE, UTF-7.
    UCS-2 supports only characters up to \U0000FFFF.
@@ -168,7 +168,7 @@ unicode_to_mb (unsigned int code,
                   (ICONV_CONST char **)&inptr, &inbytesleft,
                   &outptr, &outbytesleft);
       if (inbytesleft > 0 || res == (size_t)(-1)
-         /* Irix iconv() inserts a NUL byte if it cannot convert. */
+         /* Irix iconv inserts a NUL byte if it cannot convert. */
 # if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
          || (res > 0 && code != 0 && outptr - outbuf == 1 && *outbuf == '\0')
 # endif
diff --git a/lib/uniconv.h b/lib/uniconv.h
index ffce643..81b643c 100644
--- a/lib/uniconv.h
+++ b/lib/uniconv.h
@@ -25,10 +25,10 @@
 /* Get enum iconv_ilseq_handler.  */
 #include "striconveh.h"
 
-/* Get iconv_register_autodetect(), mem_iconveha() declaration.  */
+/* Get iconv_register_autodetect, mem_iconveha.  */
 #include "striconveha.h"
 
-/* Get locale_charset() declaration.  */
+/* Get locale_charset.  */
 #include "localcharset.h"
 
 
diff --git a/lib/uniconv/u8-conv-from-enc.c b/lib/uniconv/u8-conv-from-enc.c
index bcd0cd0..c7e76bc 100644
--- a/lib/uniconv/u8-conv-from-enc.c
+++ b/lib/uniconv/u8-conv-from-enc.c
@@ -38,7 +38,7 @@ u8_conv_from_encoding (const char *fromcode,
 {
   if (STRCASEEQ (fromcode, "UTF-8", 'U','T','F','-','8',0,0,0,0))
     {
-      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv().  */
+      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv.  */
       uint8_t *result;
 
       if (u8_check ((const uint8_t *) src, srclen))
diff --git a/lib/uniconv/u8-conv-to-enc.c b/lib/uniconv/u8-conv-to-enc.c
index bc2cc09..f3975ae 100644
--- a/lib/uniconv/u8-conv-to-enc.c
+++ b/lib/uniconv/u8-conv-to-enc.c
@@ -40,7 +40,7 @@ u8_conv_to_encoding (const char *tocode,
 
   if (STRCASEEQ (tocode, "UTF-8", 'U','T','F','-','8',0,0,0,0))
     {
-      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv().  */
+      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv.  */
 #if CONFIG_UNICODE_SAFETY
       if (u8_check (src, srclen))
        {
diff --git a/lib/uniconv/u8-strconv-to-enc.c b/lib/uniconv/u8-strconv-to-enc.c
index a3f12b6..f7c7a31 100644
--- a/lib/uniconv/u8-strconv-to-enc.c
+++ b/lib/uniconv/u8-strconv-to-enc.c
@@ -39,7 +39,7 @@ u8_strconv_to_encoding (const uint8_t *string,
 
   if (STRCASEEQ (tocode, "UTF-8", 'U','T','F','-','8',0,0,0,0))
     {
-      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv().  */
+      /* Conversion from UTF-8 to UTF-8.  No need to go through iconv.  */
       length = u8_strlen (string) + 1;
 #if CONFIG_UNICODE_SAFETY
       if (u8_check (string, length))
diff --git a/lib/unistdio/u-vsprintf.h b/lib/unistdio/u-vsprintf.h
index 15fc173..599933a 100644
--- a/lib/unistdio/u-vsprintf.h
+++ b/lib/unistdio/u-vsprintf.h
@@ -43,7 +43,7 @@ VSPRINTF (DCHAR_T *buf, const FCHAR_T *format, va_list args)
   if (result == NULL)
     return -1;
 
-  /* The infinite buffer size guarantees that the result is not malloc()ed.  */
+  /* The infinite buffer size guarantees that the result is not malloced.  */
   if (result != buf)
     {
       /* length is near SIZE_MAX.  */
diff --git a/lib/unistdio/u16-u16-vasnprintf.c 
b/lib/unistdio/u16-u16-vasnprintf.c
index e33851e..796c134 100644
--- a/lib/unistdio/u16-u16-vasnprintf.c
+++ b/lib/unistdio/u16-u16-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/u16-vasnprintf.c b/lib/unistdio/u16-vasnprintf.c
index 3ce19d4..064aaa3 100644
--- a/lib/unistdio/u16-vasnprintf.c
+++ b/lib/unistdio/u16-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/u32-u32-vasnprintf.c 
b/lib/unistdio/u32-u32-vasnprintf.c
index b272af3..dd5e633 100644
--- a/lib/unistdio/u32-u32-vasnprintf.c
+++ b/lib/unistdio/u32-u32-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/u32-vasnprintf.c b/lib/unistdio/u32-vasnprintf.c
index 6aac623..3fd229d 100644
--- a/lib/unistdio/u32-vasnprintf.c
+++ b/lib/unistdio/u32-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/u8-u8-vasnprintf.c b/lib/unistdio/u8-u8-vasnprintf.c
index 7535d4c..c8be0fb 100644
--- a/lib/unistdio/u8-u8-vasnprintf.c
+++ b/lib/unistdio/u8-u8-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/u8-vasnprintf.c b/lib/unistdio/u8-vasnprintf.c
index 0067e6c..794c85f 100644
--- a/lib/unistdio/u8-vasnprintf.c
+++ b/lib/unistdio/u8-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistdio/ulc-vasnprintf.c b/lib/unistdio/ulc-vasnprintf.c
index e89b7ff..fca73b2 100644
--- a/lib/unistdio/ulc-vasnprintf.c
+++ b/lib/unistdio/ulc-vasnprintf.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
diff --git a/lib/unistr.h b/lib/unistr.h
index ae247a5..3c74827 100644
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -114,7 +114,7 @@ extern uint16_t *
 /* Return the length (number of units) of the first character in S, which is
    no longer than N.  Return 0 if it is the NUL character.  Return -1 upon
    failure.  */
-/* Similar to mblen(), except that s must not be NULL.  */
+/* Similar to mblen, except that s must not be NULL.  */
 extern int
        u8_mblen (const uint8_t *s, size_t n);
 extern int
@@ -126,7 +126,7 @@ extern int
    its 'ucs4_t' representation in *PUC.  Upon failure, *PUC is set to 0xfffd,
    and an appropriate number of units is returned.
    The number of available units, N, must be > 0.  */
-/* Similar to mbtowc(), except that puc and s must not be NULL, n must be > 0,
+/* Similar to mbtowc, except that puc and s must not be NULL, n must be > 0,
    and the NUL character is not treated specially.  */
 /* The variants with _safe suffix are safe, even if the library is compiled
    without --enable-safety.  */
@@ -272,8 +272,8 @@ u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n)
    and -1 is returned for an invalid sequence of units, -2 is returned for an
    incomplete sequence of units.
    The number of available units, N, must be > 0.  */
-/* Similar to u*_mbtouc(), except that the return value gives more details
-   about the failure, similar to mbrtowc().  */
+/* Similar to u*_mbtouc, except that the return value gives more details
+   about the failure, similar to mbrtowc.  */
 
 #ifdef GNULIB_UNISTR_U8_MBTOUCR
 extern int
@@ -293,7 +293,7 @@ extern int
 /* Put the multibyte character represented by UC in S, returning its
    length.  Return -1 upon failure, -2 if the number of available units, N,
    is too small.  The latter case cannot occur if N >= 6/2/1, respectively.  */
-/* Similar to wctomb(), except that s must not be NULL, and the argument n
+/* Similar to wctomb, except that s must not be NULL, and the argument n
    must be specified.  */
 
 #ifdef GNULIB_UNISTR_U8_UCTOMB
@@ -365,7 +365,7 @@ u32_uctomb (uint32_t *s, ucs4_t uc, int n)
 #endif
 
 /* Copy N units from SRC to DEST.  */
-/* Similar to memcpy().  */
+/* Similar to memcpy.  */
 extern uint8_t *
        u8_cpy (uint8_t *dest, const uint8_t *src, size_t n);
 extern uint16_t *
@@ -375,7 +375,7 @@ extern uint32_t *
 
 /* Copy N units from SRC to DEST, guaranteeing correct behavior for
    overlapping memory areas.  */
-/* Similar to memmove().  */
+/* Similar to memmove.  */
 extern uint8_t *
        u8_move (uint8_t *dest, const uint8_t *src, size_t n);
 extern uint16_t *
@@ -385,7 +385,7 @@ extern uint32_t *
 
 /* Set the first N characters of S to UC.  UC should be a character that
    occupies only 1 unit.  */
-/* Similar to memset().  */
+/* Similar to memset.  */
 extern uint8_t *
        u8_set (uint8_t *s, ucs4_t uc, size_t n);
 extern uint16_t *
@@ -394,7 +394,7 @@ extern uint32_t *
        u32_set (uint32_t *s, ucs4_t uc, size_t n);
 
 /* Compare S1 and S2, each of length N.  */
-/* Similar to memcmp().  */
+/* Similar to memcmp.  */
 extern int
        u8_cmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
@@ -403,7 +403,7 @@ extern int
        u32_cmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Search the string at S for UC.  */
-/* Similar to memchr().  */
+/* Similar to memchr.  */
 extern uint8_t *
        u8_chr (const uint8_t *s, size_t n, ucs4_t uc);
 extern uint16_t *
@@ -412,7 +412,7 @@ extern uint32_t *
        u32_chr (const uint32_t *s, size_t n, ucs4_t uc);
 
 /* Count the number of Unicode characters in the N units from S.  */
-/* Similar to mbsnlen().  */
+/* Similar to mbsnlen.  */
 extern size_t
        u8_mbsnlen (const uint8_t *s, size_t n);
 extern size_t
@@ -472,7 +472,7 @@ extern const uint32_t *
        u32_prev (ucs4_t *puc, const uint32_t *s, const uint32_t *start);
 
 /* Return the number of units in S.  */
-/* Similar to strlen(), wcslen().  */
+/* Similar to strlen, wcslen.  */
 extern size_t
        u8_strlen (const uint8_t *s);
 extern size_t
@@ -481,7 +481,7 @@ extern size_t
        u32_strlen (const uint32_t *s);
 
 /* Return the number of units in S, but at most MAXLEN.  */
-/* Similar to strnlen(), wcsnlen().  */
+/* Similar to strnlen, wcsnlen.  */
 extern size_t
        u8_strnlen (const uint8_t *s, size_t maxlen);
 extern size_t
@@ -490,7 +490,7 @@ extern size_t
        u32_strnlen (const uint32_t *s, size_t maxlen);
 
 /* Copy SRC to DEST.  */
-/* Similar to strcpy(), wcscpy().  */
+/* Similar to strcpy, wcscpy.  */
 extern uint8_t *
        u8_strcpy (uint8_t *dest, const uint8_t *src);
 extern uint16_t *
@@ -499,7 +499,7 @@ extern uint32_t *
        u32_strcpy (uint32_t *dest, const uint32_t *src);
 
 /* Copy SRC to DEST, returning the address of the terminating NUL in DEST.  */
-/* Similar to stpcpy().  */
+/* Similar to stpcpy.  */
 extern uint8_t *
        u8_stpcpy (uint8_t *dest, const uint8_t *src);
 extern uint16_t *
@@ -508,7 +508,7 @@ extern uint32_t *
        u32_stpcpy (uint32_t *dest, const uint32_t *src);
 
 /* Copy no more than N units of SRC to DEST.  */
-/* Similar to strncpy(), wcsncpy().  */
+/* Similar to strncpy, wcsncpy.  */
 extern uint8_t *
        u8_strncpy (uint8_t *dest, const uint8_t *src, size_t n);
 extern uint16_t *
@@ -518,7 +518,7 @@ extern uint32_t *
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */
-/* Similar to stpncpy().  */
+/* Similar to stpncpy.  */
 extern uint8_t *
        u8_stpncpy (uint8_t *dest, const uint8_t *src, size_t n);
 extern uint16_t *
@@ -527,7 +527,7 @@ extern uint32_t *
        u32_stpncpy (uint32_t *dest, const uint32_t *src, size_t n);
 
 /* Append SRC onto DEST.  */
-/* Similar to strcat(), wcscat().  */
+/* Similar to strcat, wcscat.  */
 extern uint8_t *
        u8_strcat (uint8_t *dest, const uint8_t *src);
 extern uint16_t *
@@ -536,7 +536,7 @@ extern uint32_t *
        u32_strcat (uint32_t *dest, const uint32_t *src);
 
 /* Append no more than N units of SRC onto DEST.  */
-/* Similar to strncat(), wcsncat().  */
+/* Similar to strncat, wcsncat.  */
 extern uint8_t *
        u8_strncat (uint8_t *dest, const uint8_t *src, size_t n);
 extern uint16_t *
@@ -545,7 +545,7 @@ extern uint32_t *
        u32_strncat (uint32_t *dest, const uint32_t *src, size_t n);
 
 /* Compare S1 and S2.  */
-/* Similar to strcmp(), wcscmp().  */
+/* Similar to strcmp, wcscmp.  */
 extern int
        u8_strcmp (const uint8_t *s1, const uint8_t *s2);
 extern int
@@ -554,7 +554,7 @@ extern int
        u32_strcmp (const uint32_t *s1, const uint32_t *s2);
 
 /* Compare no more than N units of S1 and S2.  */
-/* Similar to strncmp(), wcsncmp().  */
+/* Similar to strncmp, wcsncmp.  */
 extern int
        u8_strncmp (const uint8_t *s1, const uint8_t *s2, size_t n);
 extern int
@@ -563,7 +563,7 @@ extern int
        u32_strncmp (const uint32_t *s1, const uint32_t *s2, size_t n);
 
 /* Duplicate S, returning an identical malloc'd string.  */
-/* Similar to strdup(), wcsdup().  */
+/* Similar to strdup, wcsdup.  */
 extern uint8_t *
        u8_strdup (const uint8_t *s);
 extern uint16_t *
@@ -572,7 +572,7 @@ extern uint32_t *
        u32_strdup (const uint32_t *s);
 
 /* Find the first occurrence of UC in STR.  */
-/* Similar to strchr(), wcschr().  */
+/* Similar to strchr, wcschr.  */
 extern uint8_t *
        u8_strchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
@@ -581,7 +581,7 @@ extern uint32_t *
        u32_strchr (const uint32_t *str, ucs4_t uc);
 
 /* Find the last occurrence of UC in STR.  */
-/* Similar to strrchr(), wcsrchr().  */
+/* Similar to strrchr, wcsrchr.  */
 extern uint8_t *
        u8_strrchr (const uint8_t *str, ucs4_t uc);
 extern uint16_t *
@@ -591,7 +591,7 @@ extern uint32_t *
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters not in REJECT.  */
-/* Similar to strcspn(), wcscspn().  */
+/* Similar to strcspn, wcscspn.  */
 extern size_t
        u8_strcspn (const uint8_t *str, const uint8_t *reject);
 extern size_t
@@ -601,7 +601,7 @@ extern size_t
 
 /* Return the length of the initial segment of STR which consists entirely
    of Unicode characters in ACCEPT.  */
-/* Similar to strspn(), wcsspn().  */
+/* Similar to strspn, wcsspn.  */
 extern size_t
        u8_strspn (const uint8_t *str, const uint8_t *accept);
 extern size_t
@@ -610,7 +610,7 @@ extern size_t
        u32_strspn (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence in STR of any character in ACCEPT.  */
-/* Similar to strpbrk(), wcspbrk().  */
+/* Similar to strpbrk, wcspbrk.  */
 extern uint8_t *
        u8_strpbrk (const uint8_t *str, const uint8_t *accept);
 extern uint16_t *
@@ -619,7 +619,7 @@ extern uint32_t *
        u32_strpbrk (const uint32_t *str, const uint32_t *accept);
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
-/* Similar to strstr(), wcsstr().  */
+/* Similar to strstr, wcsstr.  */
 extern uint8_t *
        u8_strstr (const uint8_t *haystack, const uint8_t *needle);
 extern uint16_t *
@@ -645,7 +645,7 @@ extern bool
 
 /* Divide STR into tokens separated by characters in DELIM.
    This interface is actually more similar to wcstok than to strtok.  */
-/* Similar to strtok_r(), wcstok().  */
+/* Similar to strtok_r, wcstok.  */
 extern uint8_t *
        u8_strtok (uint8_t *str, const uint8_t *delim, uint8_t **ptr);
 extern uint16_t *
diff --git a/lib/unistr/u8-stpcpy.c b/lib/unistr/u8-stpcpy.c
index a5c15c5..c4bb277 100644
--- a/lib/unistr/u8-stpcpy.c
+++ b/lib/unistr/u8-stpcpy.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Ensure stpcpy() gets declared.  */
+/* Ensure stpcpy gets declared.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
diff --git a/lib/unistr/u8-stpncpy.c b/lib/unistr/u8-stpncpy.c
index 87f254d..48c9d42 100644
--- a/lib/unistr/u8-stpncpy.c
+++ b/lib/unistr/u8-stpncpy.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Ensure stpncpy() gets declared.  */
+/* Ensure stpncpy gets declared.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
diff --git a/lib/unistr/u8-strnlen.c b/lib/unistr/u8-strnlen.c
index 32ce7b8..62072da 100644
--- a/lib/unistr/u8-strnlen.c
+++ b/lib/unistr/u8-strnlen.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Ensure strnlen() gets declared.  */
+/* Ensure strnlen gets declared.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
diff --git a/lib/uniwidth.h b/lib/uniwidth.h
index cdc7d96..2ab41b0 100644
--- a/lib/uniwidth.h
+++ b/lib/uniwidth.h
@@ -22,7 +22,7 @@
 /* Get size_t.  */
 #include <stddef.h>
 
-/* Get locale_charset() declaration.  */
+/* Get locale_charset declaration.  */
 #include "localcharset.h"
 
 #ifdef __cplusplus
diff --git a/lib/utime.c b/lib/utime.c
index 9ddb8b8..2096f31 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -46,7 +46,7 @@ struct utimbuf
 };
 #endif
 
-/* The results of open() in this file are not used with fchdir,
+/* The results of 'open' in this file are not used with fchdir,
    therefore save some unnecessary work in fchdir.c.  */
 #undef open
 #undef close
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index f26b42b..3952830 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -44,7 +44,7 @@
      DCHAR_IS_UINT16_T  Set to 1 if DCHAR_T is uint16_t.
      DCHAR_IS_UINT32_T  Set to 1 if DCHAR_T is uint32_t.  */
 
-/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf.
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
 #ifndef _GNU_SOURCE
@@ -67,10 +67,10 @@
 # endif
 #endif
 
-#include <locale.h>    /* localeconv() */
-#include <stdio.h>     /* snprintf(), sprintf() */
-#include <stdlib.h>    /* abort(), malloc(), realloc(), free() */
-#include <string.h>    /* memcpy(), strlen() */
+#include <locale.h>    /* localeconv */
+#include <stdio.h>     /* snprintf, sprintf */
+#include <stdlib.h>    /* abort, malloc, realloc, free */
+#include <string.h>    /* memcpy, strlen */
 #include <errno.h>     /* errno */
 #include <limits.h>    /* CHAR_BIT */
 #include <float.h>     /* DBL_MAX_EXP, LDBL_MAX_EXP */
@@ -126,7 +126,7 @@
 # if HAVE_WCSLEN
 #  define local_wcslen wcslen
 # else
-   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+   /* Solaris 2.5.1 has wcslen in a separate library libw.so. To avoid
       a dependency towards this library, here is a local substitute.
       Define this substitute only once, even if this file is included
       twice in the same compilation unit.  */
@@ -173,8 +173,8 @@ local_wcslen (const wchar_t *s)
   /* TCHAR_T is wchar_t.  */
 # define USE_SNPRINTF 1
 # if HAVE_DECL__SNWPRINTF
-   /* On Windows, the function swprintf() has a different signature than
-      on Unix; we use the _snwprintf() function instead.  */
+   /* On Windows, the function swprintf has a different signature than
+      on Unix; we use the _snwprintf function instead.  */
 #  define SNPRINTF _snwprintf
 # else
    /* Unix.  */
@@ -213,7 +213,7 @@ decimal_point_char ()
   const char *point;
   /* Determine it in a multithread-safe way.  We know nl_langinfo is
      multithread-safe on glibc systems, but is not required to be multithread-
-     safe by POSIX.  sprintf(), however, is multithread-safe.  localeconv()
+     safe by POSIX.  sprintf, however, is multithread-safe.  localeconv
      is rarely multithread-safe.  */
 #  if HAVE_NL_LANGINFO && __GLIBC__
   point = nl_langinfo (RADIXCHAR);
@@ -270,7 +270,7 @@ typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * 
CHAR_BIT == GMP_TWOLI
 typedef struct
 {
   size_t nlimbs;
-  mp_limb_t *limbs; /* Bits in little-endian order, allocated with malloc().  
*/
+  mp_limb_t *limbs; /* Bits in little-endian order, allocated with malloc.  */
 } mpn_t;
 
 /* Compute the product of two bignums >= 0.
@@ -4050,7 +4050,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   alignof (TCHAR_T) <= alignof (DCHAR_T).  */
 # define TCHARS_PER_DCHAR (sizeof (DCHAR_T) / sizeof (TCHAR_T))
                /* Ensure that maxlen below will be >= 2.  Needed on BeOS,
-                  where an snprintf() with maxlen==1 acts like sprintf().  */
+                  where an snprintf with maxlen==1 acts like sprintf().  */
                ENSURE_ALLOCATION (xsum (length,
                                         (2 + TCHARS_PER_DCHAR - 1)
                                         / TCHARS_PER_DCHAR));
@@ -4227,13 +4227,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                      }
 
 #if USE_SNPRINTF
-                   /* Portability: Not all implementations of snprintf()
+                   /* Portability: Not all implementations of snprintf
                       are ISO C 99 compliant.  Determine the number of
-                      bytes that snprintf() has produced or would have
+                      bytes that snprintf has produced or would have
                       produced.  */
                    if (count >= 0)
                      {
-                       /* Verify that snprintf() has NUL-terminated its
+                       /* Verify that snprintf has NUL-terminated its
                           result.  */
                        if (count < maxlen
                            && ((TCHAR_T *) (result + length)) [count] != '\0')
@@ -4244,21 +4244,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                      }
                    else
                      {
-                       /* snprintf() doesn't understand the '%n'
+                       /* snprintf doesn't understand the '%n'
                           directive.  */
                        if (fbp[1] != '\0')
                          {
                            /* Don't use the '%n' directive; instead, look
-                              at the snprintf() return value.  */
+                              at the snprintf return value.  */
                            fbp[1] = '\0';
                            continue;
                          }
                        else
                          {
-                           /* Look at the snprintf() return value.  */
+                           /* Look at the snprintf return value.  */
                            if (retcount < 0)
                              {
-                               /* HP-UX 10.20 snprintf() is doubly deficient:
+                               /* HP-UX 10.20 snprintf is doubly deficient:
                                   It doesn't understand the '%n' directive,
                                   *and* it returns -1 (rather than the length
                                   that would have been required) when the
@@ -4288,9 +4288,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 
 #if USE_SNPRINTF
                    /* Handle overflow of the allocated buffer.
-                      If such an overflow occurs, a C99 compliant snprintf()
+                      If such an overflow occurs, a C99 compliant snprintf
                       returns a count >= maxlen.  However, a non-compliant
-                      snprintf() function returns only count = maxlen - 1.  To
+                      snprintf function returns only count = maxlen - 1.  To
                       cover both cases, test whether count >= maxlen - 1.  */
                    if ((unsigned int) count + 1 >= maxlen)
                      {
@@ -4308,7 +4308,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 maxlen > (unsigned int) count + 1
                               and so we don't get here again.
                               And allocate proportionally, to avoid looping
-                              eternally if snprintf() reports a too small
+                              eternally if snprintf reports a too small
                               count.  */
                            size_t n =
                              xmax (xsum (length,
@@ -4327,7 +4327,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                    if (prec_ourselves)
                      {
                        /* Handle the precision.  */
-                       TCHAR_T *prec_ptr = 
+                       TCHAR_T *prec_ptr =
 # if USE_SNPRINTF
                          (TCHAR_T *) (result + length);
 # else
@@ -4460,7 +4460,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                            else
                              {
                                /* ENSURE_ALLOCATION will move the array
-                                  (because it uses realloc().  */
+                                  (because it uses realloc).  */
                                ENSURE_ALLOCATION (xsum (length, count));
                                tmpsrc = (TCHAR_T *) (result + length);
                              }
@@ -4601,9 +4601,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                    /* Here still count <= allocated - length.  */
 
 #if !DCHAR_IS_TCHAR || USE_SNPRINTF
-                   /* The snprintf() result did fit.  */
+                   /* The snprintf result did fit.  */
 #else
-                   /* Append the sprintf() result.  */
+                   /* Append the sprintf result.  */
                    memcpy (result + length, tmp, count * sizeof (DCHAR_T));
 #endif
 #if !USE_SNPRINTF
@@ -4649,8 +4649,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
     CLEANUP ();
     *lengthp = length;
     /* Note that we can produce a big string of a length > INT_MAX.  POSIX
-       says that snprintf() fails with errno = EOVERFLOW in this case, but
-       that's only because snprintf() returns an 'int'.  This function does
+       says that snprintf fails with errno = EOVERFLOW in this case, but
+       that's only because snprintf returns an 'int'.  This function does
        not have this limitation.  */
     return result;
 
diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h
index 7a0c01f..e7870a0 100644
--- a/lib/vasnprintf.h
+++ b/lib/vasnprintf.h
@@ -41,7 +41,7 @@
 extern "C" {
 #endif
 
-/* Write formatted output to a string dynamically allocated with malloc().
+/* Write formatted output to a string dynamically allocated with malloc.
    You can pass a preallocated buffer for the result in RESULTBUF and its
    size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
    If successful, return the address of the string (this may be = RESULTBUF
diff --git a/lib/verror.c b/lib/verror.c
index 0a7981e..564ed9b 100644
--- a/lib/verror.c
+++ b/lib/verror.c
@@ -38,7 +38,7 @@
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.
    Use the globals error_print_progname and error_message_count similarly
-   to error().  */
+   to 'error'.  */
 void
 verror (int status, int errnum, const char *format, va_list args)
 {
@@ -50,7 +50,7 @@ verror (int status, int errnum, const char *format, va_list 
args)
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.
    If FNAME is not NULL, prepend the message with `FNAME:LINENO:'.
    Use the globals error_print_progname, error_message_count, and
-   error_one_per_line similarly to error_at_line().  */
+   error_one_per_line similarly to error_at_line.  */
 void
 verror_at_line (int status, int errnum, const char *file,
                 unsigned int line_number, const char *format, va_list args)
diff --git a/lib/verror.h b/lib/verror.h
index 4d3b7ce..64eef7d 100644
--- a/lib/verror.h
+++ b/lib/verror.h
@@ -28,7 +28,7 @@ extern "C" {
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.
    Use the globals error_print_progname and error_message_count similarly
-   to error().  */
+   to 'error'.  */
 
 extern void verror (int __status, int __errnum, const char *__format,
                     va_list __args)
@@ -39,7 +39,7 @@ extern void verror (int __status, int __errnum, const char 
*__format,
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.
    If FNAME is not NULL, prepend the message with `FNAME:LINENO:'.
    Use the globals error_print_progname, error_message_count, and
-   error_one_per_line similarly to error_at_line().  */
+   error_one_per_line similarly to error_at_line.  */
 
 extern void verror_at_line (int __status, int __errnum, const char *__fname,
                             unsigned int __lineno, const char *__format,
diff --git a/lib/w32spawn.h b/lib/w32spawn.h
index 7ebbb4c..04ed6a2 100644
--- a/lib/w32spawn.h
+++ b/lib/w32spawn.h
@@ -19,7 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/* Get _get_osfhandle() and _open_osfhandle().  */
+/* Get _get_osfhandle and _open_osfhandle.  */
 #include <io.h>
 
 #include <stdbool.h>
@@ -54,15 +54,15 @@ dup_noinherit (int fd)
   return nfd;
 }
 
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
+/* Prepares an argument vector before calling 'spawn'.
+   Note that 'spawn' does not by itself call the command interpreter
      (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
       ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
          GetVersionEx(&v);
          v.dwPlatformId == VER_PLATFORM_WIN32_NT;
       }) ? "cmd.exe" : "command.com").
    Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   CreateProcess.  We must quote the arguments since Win32 CreateProcess
    interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
    special way:
    - Space and tab are interpreted as delimiters. They are not treated as
diff --git a/lib/wait-process.c b/lib/wait-process.c
index 97bc57f..75f2c3e 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -102,8 +102,8 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/* The return value of spawnvp() is really a process handle as returned
-   by CreateProcess().  Therefore we can kill it using TerminateProcess.  */
+/* The return value of spawnvp is really a process handle as returned
+   by CreateProcess.  Therefore we can kill it using TerminateProcess.  */
 #define kill(pid,sig) TerminateProcess ((HANDLE) (pid), sig)
 
 #endif
@@ -114,7 +114,7 @@
    (If pid_t was an atomic type like sig_atomic_t, we could just set the
    'child' field to 0 when unregistering a slave process, and wouldn't need
    the 'used' field.)
-   The 'used' and 'child' fields are accessed from within the cleanup_slaves()
+   The 'used' and 'child' fields are accessed from within the cleanup_slaves
    action, therefore we mark them as 'volatile'.  */
 typedef struct
 {
@@ -162,7 +162,7 @@ cleanup_slaves (void)
 
 /* Register a subprocess as being a slave process.  This means that the
    subprocess will be terminated when its creator receives a catchable fatal
-   signal or exits normally.  Registration ends when wait_subprocess()
+   signal or exits normally.  Registration ends when wait_subprocess
    notices that the subprocess has exited.  */
 void
 register_slave_subprocess (pid_t child)
@@ -195,8 +195,8 @@ register_slave_subprocess (pid_t child)
 
   if (slaves_count == slaves_allocated)
     {
-      /* Extend the slaves array.  Note that we cannot use xrealloc(),
-        because then the cleanup_slaves() function could access an already
+      /* Extend the slaves array.  Note that we cannot use xrealloc,
+        because then the cleanup_slaves function could access an already
         deallocated array.  */
       slaves_entry_t *old_slaves = slaves;
       size_t new_slaves_allocated = 2 * slaves_allocated;
@@ -205,7 +205,7 @@ register_slave_subprocess (pid_t child)
        malloc (new_slaves_allocated * sizeof (slaves_entry_t));
       if (new_slaves == NULL)
        {
-         /* xalloc_die() will call exit() which will invoke cleanup_slaves().
+         /* xalloc_die will call 'exit' which will invoke cleanup_slaves().
             Additionally we need to kill child, because it's not yet among
             the slaves list.  */
          kill (child, TERMINATOR);
@@ -253,14 +253,14 @@ wait_subprocess (pid_t child, const char *progname,
                 bool slave_process, bool exit_on_error)
 {
 #if HAVE_WAITID && defined WNOWAIT && 0
-  /* Commented out because waitid() with WNOWAIT doesn't work: On Solaris 7
+  /* Commented out because waitid with WNOWAIT doesn't work: On Solaris 7
      and OSF/1 4.0, it returns -1 and sets errno = ECHILD, and on HP-UX 10.20
      it just hangs.  */
-  /* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
+  /* Use of waitid with WNOWAIT avoids a race condition: If slave_process is
      true, and this process sleeps a very long time between the return from
-     waitpid() and the execution of unregister_slave_subprocess(), and
+     waitpid and the execution of unregister_slave_subprocess(), and
      meanwhile another process acquires the same PID as child, and then - still
-     before unregister_slave_subprocess() - this process gets a fatal signal,
+     before unregister_slave_subprocess - this process gets a fatal signal,
      it would kill the other totally unrelated process.  */
   siginfo_t info;
   for (;;)
@@ -338,7 +338,7 @@ wait_subprocess (pid_t child, const char *progname,
       abort ();
     }
 #else
-  /* waitpid() is just as portable as wait() nowadays.  */
+  /* waitpid is just as portable as wait() nowadays.  */
   WAIT_T status;
 
   *(int *) &status = 0;
diff --git a/lib/wait-process.h b/lib/wait-process.h
index d5beebc..d504373 100644
--- a/lib/wait-process.h
+++ b/lib/wait-process.h
@@ -54,7 +54,7 @@ extern int wait_subprocess (pid_t child, const char *progname,
 
 /* Register a subprocess as being a slave process.  This means that the
    subprocess will be terminated when its creator receives a catchable fatal
-   signal or exits normally.  Registration ends when wait_subprocess()
+   signal or exits normally.  Registration ends when wait_subprocess
    notices that the subprocess has exited.  */
 extern void register_slave_subprocess (pid_t child);
 
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index 924a338..0312e6e 100644
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -23,7 +23,7 @@
  * <http://www.opengroup.org/susv3xbd/wchar.h.html>
  *
  * For now, this just ensures proper prerequisite inclusion order and
- * the declaration of wcwidth().
+ * the declaration of wcwidth.
  */
 
 #ifndef _GL_WCHAR_H
diff --git a/lib/xmalloca.h b/lib/xmalloca.h
index 4a96300..1364917 100644
--- a/lib/xmalloca.h
+++ b/lib/xmalloca.h
@@ -27,7 +27,7 @@ extern "C" {
 
 
 /* xmalloca(N) is a checking safe variant of alloca(N).  It allocates N bytes
-   of memory allocated on the stack, that must be freed using freea() before
+   of memory allocated on the stack, that must be freed using freea before
    the function returns.  Upon failure, it exits with an error message.  */
 #if HAVE_ALLOCA
 # define xmalloca(N) \
diff --git a/lib/xsetenv.h b/lib/xsetenv.h
index 24b59c2..1bb963f 100644
--- a/lib/xsetenv.h
+++ b/lib/xsetenv.h
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Get unsetenv().  It can be used without error checking.  */
+/* Get unsetenv.  It can be used without error checking.  */
 #include "setenv.h"
 
 #ifdef __cplusplus
diff --git a/lib/xsize.h b/lib/xsize.h
index 341fb16..17a89c9 100644
--- a/lib/xsize.h
+++ b/lib/xsize.h
@@ -31,14 +31,14 @@
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
-   These computations can lead to overflow.  When this happens, malloc()
+   These computations can lead to overflow.  When this happens, malloc
    returns a piece of memory that is way too small, and the program then
    crashes while attempting to fill the memory.
    To avoid this, the functions and macros in this file check for overflow.
    The convention is that SIZE_MAX represents overflow.
    malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
-   implementation that uses mmap --, it's recommended to use size_overflow_p()
-   or size_in_bounds_p() before invoking malloc().
+   implementation that uses mmap --, it's recommended to use size_overflow_p
+   or size_in_bounds_p before invoking malloc.
    The example thus becomes:
       size_t size = xsum (header_size, xtimes (n, element_size));
       void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
index 26828a1..223f65f 100644
--- a/lib/xvasprintf.c
+++ b/lib/xvasprintf.c
@@ -55,7 +55,7 @@ xstrcat (size_t argcount, va_list args)
 
   /* Test for overflow in the summing pass above or in (totalsize + 1) below.
      Also, don't return a string longer than INT_MAX, for consistency with
-     vasprintf().  */
+     vasprintf.  */
   if (totalsize == SIZE_MAX || totalsize > INT_MAX)
     {
       errno = EOVERFLOW;
@@ -84,7 +84,7 @@ xvasprintf (const char *format, va_list args)
 
   /* Recognize the special case format = "%s...%s".  It is a frequently used
      idiom for string concatenation and needs to be fast.  We don't want to
-     have a separate function xstrcat() for this purpose.  */
+     have a separate function xstrcat for this purpose.  */
   {
     size_t argcount = 0;
     const char *f;
diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
index b371251..5214d1e 100644
--- a/lib/xvasprintf.h
+++ b/lib/xvasprintf.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-/* Write formatted output to a string dynamically allocated with malloc(),
+/* Write formatted output to a string dynamically allocated with malloc,
    and return it.  Upon [ENOMEM] memory allocation error, call xalloc_die.
    On some other error
      - [EOVERFLOW] resulting string length is > INT_MAX,
diff --git a/lib/yesno.c b/lib/yesno.c
index 05bf80e..59bdae5 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -29,7 +29,7 @@ extern int rpmatch (char const *response);
 
    Since this function uses stdin, it is suggested that the caller not
    use STDIN_FILENO directly, and also that the line
-   atexit(close_stdin) be added to main().  */
+   "atexit (close_stdin);" be added to the 'main' function.  */
 
 bool
 yesno (void)
diff --git a/m4/canonicalize-lgpl.m4 b/m4/canonicalize-lgpl.m4
index b0a7902..3c745d2 100644
--- a/m4/canonicalize-lgpl.m4
+++ b/m4/canonicalize-lgpl.m4
@@ -13,7 +13,7 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
   if test $ac_cv_func_canonicalize_file_name = no; then
     AC_LIBOBJ(canonicalize-lgpl)
     AC_DEFINE([realpath], [rpl_realpath],
-      [Define to a replacement function name for realpath().])
+      [Define to a replacement function name for realpath.])
     gl_PREREQ_CANONICALIZE_LGPL
   fi
 ])
diff --git a/m4/ceil.m4 b/m4/ceil.m4
index d89dd32..31e33f7 100644
--- a/m4/ceil.m4
+++ b/m4/ceil.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_CEIL],
 [
-  dnl Test whether ceil() can be used without libm.
+  dnl Test whether ceil can be used without libm.
   gl_FUNC_CEIL_LIBS
   if test "$CEIL_LIBM" = "?"; then
     CEIL_LIBM=
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_CEIL],
   AC_SUBST([CEIL_LIBM])
 ])
 
-# Determines the libraries needed to get the ceil() function.
+# Determines the libraries needed to get the ceil function.
 # Sets CEIL_LIBM.
 AC_DEFUN([gl_FUNC_CEIL_LIBS],
 [
diff --git a/m4/ceilf.m4 b/m4/ceilf.m4
index 0eab474..9703804 100644
--- a/m4/ceilf.m4
+++ b/m4/ceilf.m4
@@ -7,15 +7,15 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_CEILF],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare ceilf().
+  dnl Persuade glibc <math.h> to declare ceilf.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether ceilf() is declared.
+  dnl Test whether ceilf is declared.
   AC_CHECK_DECLS([ceilf], , , [#include <math.h>])
   if test "$ac_cv_have_decl_ceilf" = yes; then
-    dnl Test whether ceilf() can be used without libm.
+    dnl Test whether ceilf can be used without libm.
     gl_FUNC_CEILF_LIBS
     if test "$CEILF_LIBM" = "?"; then
-      dnl Sun C 5.0 on Solaris declares ceilf() and has it in the system-wide
+      dnl Sun C 5.0 on Solaris declares ceilf and has it in the system-wide
       dnl libm.so, but not in the libm.so that the compiler uses.
       REPLACE_CEILF=1
     fi
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_CEILF],
   AC_SUBST([CEILF_LIBM])
 ])
 
-# Determines the libraries needed to get the ceilf() function.
+# Determines the libraries needed to get the ceilf function.
 # Sets CEILF_LIBM.
 AC_DEFUN([gl_FUNC_CEILF_LIBS],
 [
diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 676c64b..219b72f 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -7,15 +7,15 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_CEILL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare ceill().
+  dnl Persuade glibc <math.h> to declare ceill.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether ceill() is declared.
+  dnl Test whether ceill is declared.
   AC_CHECK_DECLS([ceill], , , [#include <math.h>])
   if test "$ac_cv_have_decl_ceill" = yes; then
-    dnl Test whether ceill() can be used without libm.
+    dnl Test whether ceill can be used without libm.
     gl_FUNC_CEILL_LIBS
     if test "$CEILL_LIBM" = "?"; then
-      dnl Sun C 5.0 on Solaris declares ceill() and has it in the system-wide
+      dnl Sun C 5.0 on Solaris declares ceill and has it in the system-wide
       dnl libm.so, but not in the libm.so that the compiler uses.
       REPLACE_CEILL=1
     fi
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_CEILL],
   AC_SUBST([CEILL_LIBM])
 ])
 
-# Determines the libraries needed to get the ceill() function.
+# Determines the libraries needed to get the ceill function.
 # Sets CEILL_LIBM.
 AC_DEFUN([gl_FUNC_CEILL_LIBS],
 [
diff --git a/m4/eaccess.m4 b/m4/eaccess.m4
index 58dba2b..0a2b4bb 100644
--- a/m4/eaccess.m4
+++ b/m4/eaccess.m4
@@ -8,5 +8,5 @@ AC_DEFUN([gl_FUNC_EACCESS],
 [
   AC_CHECK_FUNC(eaccess, ,
     [AC_DEFINE(eaccess, access,
-       [Define as 'access' if you don't have the eaccess() function.])])
+       [Define as 'access' if you don't have the eaccess function.])])
 ])
diff --git a/m4/eoverflow.m4 b/m4/eoverflow.m4
index 3bffd10..6f69d7b 100644
--- a/m4/eoverflow.m4
+++ b/m4/eoverflow.m4
@@ -49,7 +49,7 @@ yes
 ])
       else
         dnl EOVERFLOW isn't defined by the system. Define EOVERFLOW ourselves, 
but
-        dnl don't define it as EINVAL, because snprintf() callers want to
+        dnl don't define it as EINVAL, because snprintf callers want to
         dnl distinguish EINVAL and EOVERFLOW.
         ac_cv_decl_EOVERFLOW=E2BIG
       fi
diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 7690a14..203fbff 100644
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS],
 
 AC_DEFUN([gl_FUNC_EUIDACCESS],
 [
-  dnl Persuade glibc <unistd.h> to declare euidaccess().
+  dnl Persuade glibc <unistd.h> to declare euidaccess.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS_ONCE([euidaccess])
diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index fd170d2..16ac1e1 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FCHDIR],
     AC_LIBOBJ([fchdir])
     gl_PREREQ_FCHDIR
     AC_DEFINE([FCHDIR_REPLACEMENT], 1,
-      [Define if gnulib's fchdir() replacement is used.])
+      [Define if gnulib's fchdir replacement is used.])
     gl_CHECK_NEXT_HEADERS([dirent.h])
     DIRENT_H='dirent.h'
   else
diff --git a/m4/floor.m4 b/m4/floor.m4
index b950e69..2b5718e 100644
--- a/m4/floor.m4
+++ b/m4/floor.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_FLOOR],
 [
-  dnl Test whether floor() can be used without libm.
+  dnl Test whether floor can be used without libm.
   gl_FUNC_FLOOR_LIBS
   if test "$FLOOR_LIBM" = "?"; then
     FLOOR_LIBM=
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FLOOR],
   AC_SUBST([FLOOR_LIBM])
 ])
 
-# Determines the libraries needed to get the floor() function.
+# Determines the libraries needed to get the floor function.
 # Sets FLOOR_LIBM.
 AC_DEFUN([gl_FUNC_FLOOR_LIBS],
 [
diff --git a/m4/floorf.m4 b/m4/floorf.m4
index 8cdaa94..a9bd687 100644
--- a/m4/floorf.m4
+++ b/m4/floorf.m4
@@ -7,15 +7,15 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_FLOORF],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare floorf().
+  dnl Persuade glibc <math.h> to declare floorf.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether floorf() is declared.
+  dnl Test whether floorf is declared.
   AC_CHECK_DECLS([floorf], , , [#include <math.h>])
   if test "$ac_cv_have_decl_floorf" = yes; then
-    dnl Test whether floorf() can be used without libm.
+    dnl Test whether floorf can be used without libm.
     gl_FUNC_FLOORF_LIBS
     if test "$FLOORF_LIBM" = "?"; then
-      dnl Sun C 5.0 on Solaris declares floorf() and has it in the system-wide
+      dnl Sun C 5.0 on Solaris declares floorf and has it in the system-wide
       dnl libm.so, but not in the libm.so that the compiler uses.
       REPLACE_FLOORF=1
     fi
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_FLOORF],
   AC_SUBST([FLOORF_LIBM])
 ])
 
-# Determines the libraries needed to get the floorf() function.
+# Determines the libraries needed to get the floorf function.
 # Sets FLOORF_LIBM.
 AC_DEFUN([gl_FUNC_FLOORF_LIBS],
 [
diff --git a/m4/floorl.m4 b/m4/floorl.m4
index 6207811..c4775a0 100644
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -7,15 +7,15 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_FLOORL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare floorl().
+  dnl Persuade glibc <math.h> to declare floorl.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether floorl() is declared.
+  dnl Test whether floorl is declared.
   AC_CHECK_DECLS([floorl], , , [#include <math.h>])
   if test "$ac_cv_have_decl_floorl" = yes; then
-    dnl Test whether floorl() can be used without libm.
+    dnl Test whether floorl can be used without libm.
     gl_FUNC_FLOORL_LIBS
     if test "$FLOORL_LIBM" = "?"; then
-      dnl Sun C 5.0 on Solaris declares floorl() and has it in the system-wide
+      dnl Sun C 5.0 on Solaris declares floorl and has it in the system-wide
       dnl libm.so, but not in the libm.so that the compiler uses.
       REPLACE_FLOORL=1
     fi
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_FLOORL],
   AC_SUBST([FLOORL_LIBM])
 ])
 
-# Determines the libraries needed to get the floorl() function.
+# Determines the libraries needed to get the floorl function.
 # Sets FLOORL_LIBM.
 AC_DEFUN([gl_FUNC_FLOORL_LIBS],
 [
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 495cbf9..c389876 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -98,10 +98,10 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
                      [_AC_LIBOBJ_FNMATCH])
   if test $ac_cv_func_fnmatch_posix != yes; then
     dnl We must choose a different name for our function, since on ELF systems
-    dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
+    dnl a broken fnmatch in libc.so would override our fnmatch if it is
     dnl compiled into a shared library.
     AC_DEFINE([fnmatch], [posix_fnmatch],
-      [Define to a replacement function name for fnmatch().])
+      [Define to a replacement function name for fnmatch.])
   fi
   AC_SUBST([FNMATCH_H])
 ])
@@ -118,10 +118,10 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
                      [_AC_LIBOBJ_FNMATCH])
   if test $ac_cv_func_fnmatch_gnu != yes; then
     dnl We must choose a different name for our function, since on ELF systems
-    dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
+    dnl a broken fnmatch in libc.so would override our fnmatch if it is
     dnl compiled into a shared library.
     AC_DEFINE([fnmatch], [gnu_fnmatch],
-      [Define to a replacement function name for fnmatch().])
+      [Define to a replacement function name for fnmatch.])
   fi
   AC_SUBST([FNMATCH_H])
 ])
diff --git a/m4/frexp.m4 b/m4/frexp.m4
index ce031e7..612867d 100644
--- a/m4/frexp.m4
+++ b/m4/frexp.m4
@@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_FREXP],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   FREXP_LIBM=
-  AC_CACHE_CHECK([whether frexp() can be used without linking with libm],
+  AC_CACHE_CHECK([whether frexp can be used without linking with libm],
     [gl_cv_func_frexp_no_libm],
     [
       AC_TRY_LINK([#include <math.h>
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_FREXP],
         [gl_cv_func_frexp_no_libm=no])
     ])
   if test $gl_cv_func_frexp_no_libm = no; then
-    AC_CACHE_CHECK([whether frexp() can be used with libm],
+    AC_CACHE_CHECK([whether frexp can be used with libm],
       [gl_cv_func_frexp_in_libm],
       [
         save_LIBS="$LIBS"
@@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_FREXP],
   fi
   if test $gl_func_frexp = yes; then
     AC_DEFINE([HAVE_FREXP], 1,
-      [Define if the frexp() function is available and works.])
+      [Define if the frexp function is available and works.])
   else
     AC_LIBOBJ([frexp])
   fi
@@ -59,7 +59,7 @@ AC_DEFUN([gl_FUNC_FREXP],
 AC_DEFUN([gl_FUNC_FREXP_NO_LIBM],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  AC_CACHE_CHECK([whether frexp() can be used without linking with libm],
+  AC_CACHE_CHECK([whether frexp can be used without linking with libm],
     [gl_cv_func_frexp_no_libm],
     [
       AC_TRY_LINK([#include <math.h>
@@ -81,13 +81,13 @@ AC_DEFUN([gl_FUNC_FREXP_NO_LIBM],
   fi
   if test $gl_func_frexp_no_libm = yes; then
     AC_DEFINE([HAVE_FREXP_IN_LIBC], 1,
-      [Define if the frexp() function is available in libc.])
+      [Define if the frexp function is available in libc.])
   else
     AC_LIBOBJ([frexp])
   fi
 ])
 
-dnl Test whether frexp() works also on denormalized numbers (this fails e.g. on
+dnl Test whether frexp works also on denormalized numbers (this fails e.g. on
 dnl NetBSD 3.0) and on infinite numbers (this fails e.g. on IRIX 6.5 and 
mingw).
 AC_DEFUN([gl_FUNC_FREXP_WORKS],
 [
diff --git a/m4/frexpl.m4 b/m4/frexpl.m4
index 01cb1d9..94b9a43 100644
--- a/m4/frexpl.m4
+++ b/m4/frexpl.m4
@@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_FREXPL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   FREXPL_LIBM=
-  AC_CACHE_CHECK([whether frexpl() can be used without linking with libm],
+  AC_CACHE_CHECK([whether frexpl can be used without linking with libm],
     [gl_cv_func_frexpl_no_libm],
     [
       AC_TRY_LINK([#include <math.h>
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_FREXPL],
         [gl_cv_func_frexpl_no_libm=no])
     ])
   if test $gl_cv_func_frexpl_no_libm = no; then
-    AC_CACHE_CHECK([whether frexpl() can be used with libm],
+    AC_CACHE_CHECK([whether frexpl can be used with libm],
       [gl_cv_func_frexpl_in_libm],
       [
         save_LIBS="$LIBS"
@@ -49,9 +49,9 @@ AC_DEFUN([gl_FUNC_FREXPL],
   fi
   if test $gl_func_frexpl = yes; then
     AC_DEFINE([HAVE_FREXPL], 1,
-      [Define if the frexpl() function is available.])
+      [Define if the frexpl function is available.])
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+    dnl MacOS X 10.3 has frexpl in libc but doesn't declare it in <math.h>.
     AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
   else
     HAVE_DECL_FREXPL=0
@@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_FREXPL],
 AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  AC_CACHE_CHECK([whether frexpl() can be used without linking with libm],
+  AC_CACHE_CHECK([whether frexpl can be used without linking with libm],
     [gl_cv_func_frexpl_no_libm],
     [
       AC_TRY_LINK([#include <math.h>
@@ -85,9 +85,9 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM],
   fi
   if test $gl_func_frexpl_no_libm = yes; then
     AC_DEFINE([HAVE_FREXPL_IN_LIBC], 1,
-      [Define if the frexpl() function is available in libc.])
+      [Define if the frexpl function is available in libc.])
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+    dnl MacOS X 10.3 has frexpl in libc but doesn't declare it in <math.h>.
     AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
   else
     HAVE_DECL_FREXPL=0
@@ -95,7 +95,7 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM],
   fi
 ])
 
-dnl Test whether frexpl() works on finite numbers (this fails on
+dnl Test whether frexpl works on finite numbers (this fails on
 dnl MacOS X 10.4/PowerPC, on AIX 5.1, and on BeOS) and also on infinite numbers
 dnl (this fails e.g. on IRIX 6.5 and mingw).
 AC_DEFUN([gl_FUNC_FREXPL_WORKS],
diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
index 18b96be..73aa7c3 100644
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_GETDELIM],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
 
-  dnl Persuade glibc <stdio.h> to declare getdelim().
+  dnl Persuade glibc <stdio.h> to declare getdelim.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REPLACE_FUNCS([getdelim])
diff --git a/m4/getline.m4 b/m4/getline.m4
index 57625da..9f11d9f 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_GETLINE],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
 
-  dnl Persuade glibc <stdio.h> to declare getline().
+  dnl Persuade glibc <stdio.h> to declare getline.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS_ONCE([getline])
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 54348ce..253bf6d 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-# Provide a getpass() function if the system doesn't have it.
+# Provide a getpass function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
 [
   AC_REPLACE_FUNCS(getpass)
@@ -14,19 +14,19 @@ AC_DEFUN([gl_FUNC_GETPASS],
   fi
 ])
 
-# Provide the GNU getpass() implementation. It supports passwords of
+# Provide the GNU getpass implementation. It supports passwords of
 # arbitrary length (not just 8 bytes as on HP-UX).
 AC_DEFUN([gl_FUNC_GETPASS_GNU],
 [
   AC_CHECK_DECLS_ONCE(getpass)
-  dnl TODO: Detect when GNU getpass() is already found in glibc.
+  dnl TODO: Detect when GNU getpass is already found in glibc.
   AC_LIBOBJ(getpass)
   gl_PREREQ_GETPASS
   dnl We must choose a different name for our function, since on ELF systems
-  dnl an unusable getpass() in libc.so would override our getpass() if it is
+  dnl an unusable getpass in libc.so would override our getpass() if it is
   dnl compiled into a shared library.
   AC_DEFINE([getpass], [gnu_getpass],
-    [Define to a replacement function name for getpass().])
+    [Define to a replacement function name for getpass.])
 ])
 
 # Prerequisites of lib/getpass.c.
diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index 2c52c75..082a01e 100644
--- a/m4/getsubopt.m4
+++ b/m4/getsubopt.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_GETSUBOPT],
 [
-  dnl Persuade glibc <stdlib.h> to declare getsubopt().
+  dnl Persuade glibc <stdlib.h> to declare getsubopt.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index c9ae1f7..5fd6c7b 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -30,7 +30,7 @@ dnl    depending on --{enable,disable}-{shared,static} and on 
the presence of
 dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    implementations (in libc or libintl) without the ngettext function
 dnl    will be ignored.  If NEEDSYMBOL is specified and is
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
@@ -215,8 +215,8 @@ return * gettext ("")$gt_expression_test_code + 
_nl_msg_cat_cntr + *_nl_expand_a
             LIBS="$gt_save_LIBS"])
         fi
 
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl If an already present or preinstalled GNU gettext function is
+        dnl found use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; 
} \
@@ -302,9 +302,9 @@ return * gettext ("")$gt_expression_test_code + 
_nl_msg_cat_cntr + *_nl_expand_a
 
       dnl For backward compatibility. Some packages may be using this.
       AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or 
preinstalled.])
+       [Define if the GNU gettext function is already present or 
preinstalled.])
       AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or 
preinstalled.])
+       [Define if the GNU dcgettext function is already present or 
preinstalled.])
     fi
 
     dnl We need to process the po/ directory.
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index 5671491..920330c 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -11,7 +11,7 @@ dnl Written by Jim Meyering
 
 AC_DEFUN([gl_FUNC_GROUP_MEMBER],
 [
-  dnl Persuade glibc <unistd.h> to declare group_member().
+  dnl Persuade glibc <unistd.h> to declare group_member.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   dnl Do this replacement check manually because I want the hyphen
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 66bc76f..3d3a1dd 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -135,7 +135,7 @@ int main ()
   fi
   if test "$am_func_iconv" = yes; then
     AC_DEFINE(HAVE_ICONV, 1,
-      [Define if you have the iconv() function and it works.])
+      [Define if you have the iconv function and it works.])
   fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING([how to link with libiconv])
@@ -175,6 +175,6 @@ size_t iconv();
     AC_MSG_RESULT([$]{ac_t:-
          }[$]am_cv_proto_iconv)
     AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
+      [Define as const if the declaration of iconv needs const.])
   fi
 ])
diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index e0bb0c3..fa74a66 100644
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN],
       esac
       if test -n "$iconv_flavor"; then
         AC_DEFINE_UNQUOTED([ICONV_FLAVOR], [$iconv_flavor],
-          [Define to a symbolic name denoting the flavor of iconv_open()
+          [Define to a symbolic name denoting the flavor of iconv_open
            implementation.])
         gl_REPLACE_ICONV_OPEN
       fi
@@ -227,7 +227,7 @@ changequote([,])dnl
     if test $gl_cv_func_iconv_supports_utf = no; then
       REPLACE_ICONV_UTF=1
       AC_DEFINE([REPLACE_ICONV_UTF], 1,
-        [Define if the iconv() functions are enhanced to handle the 
UTF-{16,32}{BE,LE} encodings.])
+        [Define if the iconv functions are enhanced to handle the 
UTF-{16,32}{BE,LE} encodings.])
       REPLACE_ICONV=1
       gl_REPLACE_ICONV_OPEN
       AC_LIBOBJ([iconv])
diff --git a/m4/intl.m4 b/m4/intl.m4
index 934408b..52dd602 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -124,7 +124,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
   dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
   dnl in the *.la files - makes it impossible to create multithreaded programs,
   dnl because libtool also reorders the -lc to come before the -pthread, and
-  dnl this disables pthread_create() 
<http://docs.hp.com/en/1896/pthreads.html>.
+  dnl this disables pthread_create <http://docs.hp.com/en/1896/pthreads.html>.
   case "$host_os" in
     hpux*) LTLIBC="" ;;
     *)     LTLIBC="-lc" ;;
diff --git a/m4/isnan.m4 b/m4/isnan.m4
index de692e6..a05f470 100644
--- a/m4/isnan.m4
+++ b/m4/isnan.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl Check how to get or define isnan() without linking with libm.
+dnl Check how to get or define isnan without linking with libm.
 
 AC_DEFUN([gl_FUNC_ISNAN_NO_LIBM],
 [
diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index 388e6c0..0a62bd0 100644
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl Check how to get or define isnanf() without linking with libm.
+dnl Check how to get or define isnanf without linking with libm.
 
 AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM],
 [
@@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM],
   fi
 ])
 
-dnl Test whether isnanf() can be used without libm.
+dnl Test whether isnanf can be used without libm.
 AC_DEFUN([gl_HAVE_ISNANF_NO_LIBM],
 [
   AC_CACHE_CHECK([whether isnan(float) can be used without linking with libm],
@@ -44,7 +44,7 @@ AC_DEFUN([gl_HAVE_ISNANF_NO_LIBM],
     ])
 ])
 
-dnl Test whether isnanf() recognizes a NaN (this fails on IRIX 6.5) and rejects
+dnl Test whether isnanf recognizes a NaN (this fails on IRIX 6.5) and rejects
 dnl Infinity (this fails on Solaris 2.5.1).
 AC_DEFUN([gl_ISNANF_WORKS],
 [
diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index a02ded7..e3d356c 100644
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_ISNANL_NO_LIBM],
   fi
 ])
 
-dnl Test whether isnanl() can be used without libm.
+dnl Test whether isnanl can be used without libm.
 AC_DEFUN([gl_HAVE_ISNANL_NO_LIBM],
 [
   AC_CACHE_CHECK([whether isnan(long double) can be used without linking with 
libm],
@@ -75,7 +75,7 @@ AC_DEFUN([gl_HAVE_ISNANL_NO_LIBM],
     ])
 ])
 
-dnl Test whether isnanl() can be used with libm.
+dnl Test whether isnanl can be used with libm.
 AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM],
 [
   AC_CACHE_CHECK([whether isnan(long double) can be used with libm],
@@ -96,7 +96,7 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM],
     ])
 ])
 
-dnl Test whether isnanl() recognizes all numbers which are neither finite nor
+dnl Test whether isnanl recognizes all numbers which are neither finite nor
 dnl infinite. This test fails e.g. on NetBSD/i386 and on glibc/ia64.
 AC_DEFUN([gl_FUNC_ISNANL_WORKS],
 [
diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4
index 804f1b8..3d265e1 100644
--- a/m4/ldexpl.m4
+++ b/m4/ldexpl.m4
@@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_LDEXPL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   LDEXPL_LIBM=
-  AC_CACHE_CHECK([whether ldexpl() can be used without linking with libm],
+  AC_CACHE_CHECK([whether ldexpl can be used without linking with libm],
     [gl_cv_func_ldexpl_no_libm],
     [
       AC_TRY_LINK([#include <math.h>
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_LDEXPL],
         [gl_cv_func_ldexpl_no_libm=no])
     ])
   if test $gl_cv_func_ldexpl_no_libm = no; then
-    AC_CACHE_CHECK([whether ldexpl() can be used with libm],
+    AC_CACHE_CHECK([whether ldexpl can be used with libm],
       [gl_cv_func_ldexpl_in_libm],
       [
         save_LIBS="$LIBS"
@@ -49,9 +49,9 @@ AC_DEFUN([gl_FUNC_LDEXPL],
   fi
   if test $gl_func_ldexpl = yes; then
     AC_DEFINE([HAVE_LDEXPL], 1,
-      [Define if the ldexpl() function is available.])
+      [Define if the ldexpl function is available.])
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>.
+    dnl MacOS X 10.3 has ldexpl in libc but doesn't declare it in <math.h>.
     AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include <math.h>])
   else
     HAVE_DECL_LDEXPL=0
@@ -60,7 +60,7 @@ AC_DEFUN([gl_FUNC_LDEXPL],
   AC_SUBST([LDEXPL_LIBM])
 ])
 
-dnl Test whether ldexpl() works on finite numbers (this fails on AIX 5.1).
+dnl Test whether ldexpl works on finite numbers (this fails on AIX 5.1).
 AC_DEFUN([gl_FUNC_LDEXPL_WORKS],
 [
   AC_REQUIRE([AC_PROG_CC])
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 1130ebe..a018118 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -52,7 +52,7 @@ int main () {
 #endif
 #ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
+     locale_charset function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
@@ -140,7 +140,7 @@ int main () {
 # endif
 # ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
+     locale_charset function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 # endif
diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4
index 6bb7847..17a6ff5 100644
--- a/m4/locale-tr.m4
+++ b/m4/locale-tr.m4
@@ -38,7 +38,7 @@ int main () {
 #endif
 #ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
+     locale_charset function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4
index 5e7c004..a02ec54 100644
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@@ -55,7 +55,7 @@ int main ()
 #endif
 #ifdef __CYGWIN__
   /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
+     locale_charset function relies on the encoding suffix.  Note that
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
@@ -92,7 +92,7 @@ changequote([,])dnl
           fi
         fi
       else
-        # If there was a link error, due to mblen(), the system is so old that
+        # If there was a link error, due to mblen, the system is so old that
         # it certainly doesn't have a chinese locale.
         gt_cv_locale_zh_CN=none
       fi
diff --git a/m4/lock.m4 b/m4/lock.m4
index 9111933..e9e2111 100644
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -48,8 +48,8 @@ AC_HELP_STRING([--disable-threads], [build without 
multithread safety]),
     [gl_use_threads=$enableval],
     [case "$host_os" in
        dnl Disable multithreading by default on OSF/1, because it interferes
-       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
-       dnl process gets an endless segmentation fault inside execvp().
+       dnl with fork/exec: When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp.
        osf*) gl_use_threads=no ;;
        *)    gl_use_threads=yes ;;
      esac
@@ -118,13 +118,13 @@ AC_DEFUN([gl_LOCK_BODY],
           AC_CHECK_LIB(pthread, pthread_kill,
             [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
-             # Therefore pthread_in_use() needs to actually try to create a
+             # Therefore pthread_in_use needs to actually try to create a
              # thread: pthread_create from libc will fail, whereas
              # pthread_create will actually create a thread.
              case "$host_os" in
                solaris* | hpux*)
                  AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
-                   [Define if the pthread_in_use() detection is hard.])
+                   [Define if the pthread_in_use detection is hard.])
              esac
             ])
         else
diff --git a/m4/malloca.m4 b/m4/malloca.m4
index 2841ae8..5a663d1 100644
--- a/m4/malloca.m4
+++ b/m4/malloca.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_MALLOCA],
 [
-  dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
+  dnl Use the autoconf tests for alloca, but not the AC_SUBSTed variables
   dnl @ALLOCA@ and @address@hidden
   dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
   AC_REQUIRE([gl_EEMALLOC])
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 241865f..e8445fd 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -13,7 +13,7 @@ AC_DEFUN([gl_MBSWIDTH],
   AC_CHECK_FUNCS_ONCE([isascii mbsinit])
   gl_FUNC_MBRTOWC
 
-  dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth()
+  dnl UnixWare 7.1.1 <wchar.h> has a declaration of a function mbswidth
   dnl that clashes with ours.
   AC_CACHE_CHECK([whether mbswidth is declared in <wchar.h>],
     ac_cv_have_decl_mbswidth,
@@ -36,7 +36,7 @@ AC_DEFUN([gl_MBSWIDTH],
     ac_val=0
   fi
   AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val,
-    [Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 
0 otherwise.])
+    [Define to 1 if you have a declaration of mbswidth in <wchar.h>, and to 0 
otherwise.])
 
   AC_TYPE_MBSTATE_T
 ])
diff --git a/m4/memmem.m4 b/m4/memmem.m4
index e6a3da1..95e1e3e 100644
--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_MEMMEM],
 [
-  dnl Persuade glibc <string.h> to declare memmem().
+  dnl Persuade glibc <string.h> to declare memmem.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index d1a12eb..557094a 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
-  dnl Persuade glibc <string.h> to declare mempcpy().
+  dnl Persuade glibc <string.h> to declare mempcpy.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'.
+  dnl The mempcpy declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index 8070d5f..e5f3fa3 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_MEMRCHR],
 [
-  dnl Persuade glibc <string.h> to declare memrchr().
+  dnl Persuade glibc <string.h> to declare memrchr.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 13fbd3c..ef0b5a4 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  # Check for mmap()
+  # Check for mmap.
   AC_FUNC_MMAP
 
   # Try to allow MAP_ANONYMOUS.
@@ -35,13 +35,13 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
 #endif
 ],
         [AC_DEFINE(MAP_ANONYMOUS, MAP_ANON,
-          [Define to a substitute value for mmap()'s MAP_ANONYMOUS flag.])
+          [Define to a substitute value for mmap's MAP_ANONYMOUS flag.])
          gl_have_mmap_anonymous=yes])
     fi
     AC_MSG_RESULT($gl_have_mmap_anonymous)
     if test $gl_have_mmap_anonymous = yes; then
       AC_DEFINE(HAVE_MAP_ANONYMOUS, 1,
-        [Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after 
including
+        [Define to 1 if mmap's MAP_ANONYMOUS flag is available after including
          config.h and <sys/mman.h>.])
     fi
   fi
diff --git a/m4/poll.m4 b/m4/poll.m4
index bb610da..eec621f 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_POLL],
     gl_cv_func_poll=no
   else
     AC_CHECK_FUNC(poll,
-      [# Check whether poll() works on special files (like /dev/null) and
+      [# Check whether 'poll' works on special files (like /dev/null) and
        # and ttys (like /dev/tty). On MacOS X 10.4.0 and AIX 5.3, it doesn't.
        AC_TRY_RUN([
 #include <fcntl.h>
@@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_POLL],
          }],
          [gl_cv_func_poll=yes],
          [gl_cv_func_poll=no],
-         [# When cross-compiling, assume that poll() works everywhere except on
+         [# When cross-compiling, assume that 'poll' works everywhere except on
           # MacOS X or AIX, regardless of its version.
           AC_EGREP_CPP([MacOSX], [
 #if (defined(__APPLE__) && defined(__MACH__)) || defined(_AIX)
diff --git a/m4/printf-frexp.m4 b/m4/printf-frexp.m4
index d94e1ad..abc1918 100644
--- a/m4/printf-frexp.m4
+++ b/m4/printf-frexp.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl Check how to define printf_frexp() without linking with libm.
+dnl Check how to define printf_frexp without linking with libm.
 
 AC_DEFUN([gl_FUNC_PRINTF_FREXP],
 [
diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4
index 669cc26..f22cddd 100644
--- a/m4/printf-frexpl.m4
+++ b/m4/printf-frexpl.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl Check how to define printf_frexpl() without linking with libm.
+dnl Check how to define printf_frexpl without linking with libm.
 
 AC_DEFUN([gl_FUNC_PRINTF_FREXPL],
 [
@@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL],
     AC_DEFINE([HAVE_FREXPL_IN_LIBC], 1,
       [Define if the frexpl function is available in libc.])
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+    dnl MacOS X 10.3 has frexpl in libc but doesn't declare it in <math.h>.
     AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
   fi
 
@@ -56,7 +56,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL],
         AC_DEFINE([HAVE_LDEXPL_IN_LIBC], 1,
           [Define if the ldexpl function is available in libc.])
         dnl Also check whether it's declared.
-        dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in 
<math.h>.
+        dnl MacOS X 10.3 has ldexpl in libc but doesn't declare it in <math.h>.
         AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include <math.h>])
         ;;
     esac
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index 14ba612..db0a186 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -5,13 +5,13 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl Test whether the printf function supports POSIX/XSI format strings with
 dnl positions.
 
 AC_DEFUN([gt_PRINTF_POSIX],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+  AC_CACHE_CHECK([whether printf supports POSIX/XSI format strings],
     gt_cv_func_printf_posix,
     [
       AC_TRY_RUN([
@@ -38,7 +38,7 @@ int main ()
   case $gt_cv_func_printf_posix in
     *yes)
       AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-        [Define if your printf() function supports format strings with 
positions.])
+        [Define if your printf function supports format strings with 
positions.])
       ;;
   esac
 ])
diff --git a/m4/printf.m4 b/m4/printf.m4
index 37bf905..d5ca840 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -231,7 +231,7 @@ AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE],
   dnl that he wishes a safe handling of non-IEEE-754 'long double' values.
   if test -n "$gl_printf_safe"; then
     AC_DEFINE([CHECK_PRINTF_SAFE], 1,
-      [Define if you wish *printf() functions that have a safe handling of
+      [Define if you wish *printf functions that have a safe handling of
        non-IEEE-754 'long double' values.])
   fi
   case "$gl_cv_func_printf_long_double" in
@@ -789,7 +789,7 @@ int main()
   int ret;
   nocrash_init ();
   /* Some printf implementations allocate temporary space with malloc.  */
-  /* On BSD systems, malloc() is limited by RLIMIT_DATA.  */
+  /* On BSD systems, malloc is limited by RLIMIT_DATA.  */
 #ifdef RLIMIT_DATA
   if (getrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
@@ -799,7 +799,7 @@ int main()
   if (setrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
 #endif
-  /* On Linux systems, malloc() is limited by RLIMIT_AS.  */
+  /* On Linux systems, malloc is limited by RLIMIT_AS.  */
 #ifdef RLIMIT_AS
   if (getrlimit (RLIMIT_AS, &limit) < 0)
     return 77;
diff --git a/m4/round.m4 b/m4/round.m4
index a887127..7a58c1f 100644
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -7,15 +7,15 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_ROUND],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare round().
+  dnl Persuade glibc <math.h> to declare 'round'.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_DECLS([round], , , [#include <math.h>])
   if test "$ac_cv_have_decl_round" = yes; then
     gl_CHECK_MATH_LIB([ROUND_LIBM], [x = round (x);])
   fi
   if test "$ac_cv_have_decl_round" = yes && test "$ROUND_LIBM" != missing; then
-    dnl Test whether round() produces correct results. On NetBSD 3.0, for
-    dnl x = 1/2 - 2^-54, the system's round() returns a wrong result.
+    dnl Test whether 'round' produces correct results. On NetBSD 3.0, for
+    dnl x = 1/2 - 2^-54, the system's 'round' returns a wrong result.
     AC_REQUIRE([AC_PROG_CC])
     AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
     AC_CACHE_CHECK([whether round works], [gl_cv_func_round_works],
diff --git a/m4/roundf.m4 b/m4/roundf.m4
index 650311e..09e4b18 100644
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_ROUNDF],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare roundf().
+  dnl Persuade glibc <math.h> to declare roundf.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_DECLS([roundf], , , [#include <math.h>])
   if test "$ac_cv_have_decl_roundf" = yes; then
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_ROUNDF],
       gl_FUNC_CEILF_LIBS
       if test "$FLOORF_LIBM" != '?' && test "$CEILF_LIBM" != '?'; then
         AC_DEFINE([HAVE_FLOORF_AND_CEILF], 1,
-          [Define if the both the floorf() and ceilf() functions exist.])
+          [Define if the both the floorf and ceilf functions exist.])
         ROUNDF_LIBM="$FLOORF_LIBM $CEILF_LIBM"
       else
         ROUNDF_LIBM=
diff --git a/m4/roundl.m4 b/m4/roundl.m4
index de9f63a..e71ba11 100644
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_ROUNDL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare roundl().
+  dnl Persuade glibc <math.h> to declare roundl.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_DECLS([roundl], , , [#include <math.h>])
   if test "$ac_cv_have_decl_roundl" = yes; then
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_ROUNDL],
       gl_FUNC_CEILL_LIBS
       if test "$FLOORL_LIBM" != '?' && test "$CEILL_LIBM" != '?'; then
         AC_DEFINE([HAVE_FLOORL_AND_CEILL], 1,
-          [Define if the both the floorl() and ceill() functions exist.])
+          [Define if the both the floorl and ceill functions exist.])
         ROUNDL_LIBM="$FLOORL_LIBM $CEILL_LIBM"
       else
         ROUNDL_LIBM=
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index d6901de..48e9e43 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -27,7 +27,7 @@ AC_DEFUN([gl_FUNC_UNSETENV],
     AC_LIBOBJ([unsetenv])
     gl_PREREQ_UNSETENV
   else
-    AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret,
+    AC_CACHE_CHECK([for unsetenv return type], gt_cv_func_unsetenv_ret,
       [AC_TRY_COMPILE([#include <stdlib.h>
 extern
 #ifdef __cplusplus
@@ -40,7 +40,7 @@ int unsetenv();
 #endif
 ], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
     if test $gt_cv_func_unsetenv_ret = 'void'; then
-      AC_DEFINE(VOID_UNSETENV, 1, [Define if unsetenv() returns void, not 
int.])
+      AC_DEFINE(VOID_UNSETENV, 1, [Define if unsetenv returns void, not int.])
     fi
   fi
 ])
diff --git a/m4/signbit.m4 b/m4/signbit.m4
index 689b929..45d1831 100644
--- a/m4/signbit.m4
+++ b/m4/signbit.m4
@@ -66,10 +66,10 @@ int main ()
     gl_DOUBLE_SIGN_LOCATION
     gl_LONG_DOUBLE_SIGN_LOCATION
     if test "$gl_cv_cc_float_signbit" = unknown; then
-      dnl Test whether copysignf() is declared.
+      dnl Test whether copysignf is declared.
       AC_CHECK_DECLS([copysignf], , , [#include <math.h>])
       if test "$ac_cv_have_decl_copysignf" = yes; then
-        dnl Test whether copysignf() can be used without libm.
+        dnl Test whether copysignf can be used without libm.
         AC_CACHE_CHECK([whether copysignf can be used without linking with 
libm],
           [gl_cv_func_copysignf_no_libm],
           [
@@ -86,10 +86,10 @@ int main ()
       fi
     fi
     if test "$gl_cv_cc_double_signbit" = unknown; then
-      dnl Test whether copysign() is declared.
+      dnl Test whether copysign is declared.
       AC_CHECK_DECLS([copysign], , , [#include <math.h>])
       if test "$ac_cv_have_decl_copysign" = yes; then
-        dnl Test whether copysign() can be used without libm.
+        dnl Test whether copysign can be used without libm.
         AC_CACHE_CHECK([whether copysign can be used without linking with 
libm],
           [gl_cv_func_copysign_no_libm],
           [
@@ -106,10 +106,10 @@ int main ()
       fi
     fi
     if test "$gl_cv_cc_long_double_signbit" = unknown; then
-      dnl Test whether copysignl() is declared.
+      dnl Test whether copysignl is declared.
       AC_CHECK_DECLS([copysignl], , , [#include <math.h>])
       if test "$ac_cv_have_decl_copysignl" = yes; then
-        dnl Test whether copysignl() can be used without libm.
+        dnl Test whether copysignl can be used without libm.
         AC_CACHE_CHECK([whether copysignl can be used without linking with 
libm],
           [gl_cv_func_copysignl_no_libm],
           [
diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index c38f40e..fb980f5 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STPCPY],
 [
-  dnl Persuade glibc <string.h> to declare stpcpy().
+  dnl Persuade glibc <string.h> to declare stpcpy.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'.
+  dnl The stpcpy declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index 1269359..586ce0f 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -6,17 +6,17 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STPNCPY],
 [
-  dnl Persuade glibc <string.h> to declare stpncpy().
+  dnl Persuade glibc <string.h> to declare stpncpy.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl The stpncpy() declaration in lib/string.in.h uses 'restrict'.
+  dnl The stpncpy declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
 
-  dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function
+  dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy function
   dnl declared in <string.h>. Its side effects are the same as those
-  dnl of strncpy():
+  dnl of strncpy:
   dnl      stpncpy (dest, src, n)
   dnl overwrites dest[0..n-1], min(strlen(src),n) bytes coming from src,
   dnl and the remaining bytes being NULs.  However, the return value is
@@ -33,13 +33,13 @@ extern char *stpncpy (char *dest, const char *src, size_t 
n);
 int main () {
   const char *src = "Hello";
   char dest[10];
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+1 here.  */
+  /* AIX 4.3.3 and AIX 5.1 stpncpy returns dest+1 here.  */
   strcpy (dest, "\377\377\377\377\377\377");
   if (stpncpy (dest, src, 2) != dest + 2) exit(1);
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+4 here.  */
+  /* AIX 4.3.3 and AIX 5.1 stpncpy returns dest+4 here.  */
   strcpy (dest, "\377\377\377\377\377\377");
   if (stpncpy (dest, src, 5) != dest + 5) exit(1);
-  /* AIX 4.3.3 and AIX 5.1 stpncpy() returns dest+6 here.  */
+  /* AIX 4.3.3 and AIX 5.1 stpncpy returns dest+6 here.  */
   strcpy (dest, "\377\377\377\377\377\377");
   if (stpncpy (dest, src, 7) != dest + 5) exit(1);
   exit(0);
@@ -54,7 +54,7 @@ int main () {
 
   if test $gl_cv_func_stpncpy = yes; then
     AC_DEFINE(HAVE_STPNCPY, 1,
-      [Define if you have the stpncpy() function and it works.])
+      [Define if you have the stpncpy function and it works.])
   else
     HAVE_STPNCPY=0
     AC_LIBOBJ([stpncpy])
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 7c1273a..41ee1e7 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRCHRNUL],
 [
-  dnl Persuade glibc <string.h> to declare strchrnul().
+  dnl Persuade glibc <string.h> to declare strchrnul.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index f7934ef..dd611b8 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRNDUP],
 [
-  dnl Persuade glibc <string.h> to declare strndup().
+  dnl Persuade glibc <string.h> to declare strndup.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
@@ -41,7 +41,7 @@ AC_DEFUN([gl_FUNC_STRNDUP],
           [gl_cv_func_strndup=no])])])
   if test $gl_cv_func_strndup = yes; then
     AC_DEFINE([HAVE_STRNDUP], 1,
-      [Define if you have the strndup() function and it works.])
+      [Define if you have the strndup function and it works.])
   else
     HAVE_STRNDUP=0
     AC_LIBOBJ([strndup])
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index d8307ed..19a866c 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRNLEN],
 [
-  dnl Persuade glibc <string.h> to declare strnlen().
+  dnl Persuade glibc <string.h> to declare strnlen.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/strsep.m4 b/m4/strsep.m4
index 1231dcb..ed06dad 100644
--- a/m4/strsep.m4
+++ b/m4/strsep.m4
@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRSEP],
 [
-  dnl Persuade glibc <string.h> to declare strsep().
+  dnl Persuade glibc <string.h> to declare strsep.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  dnl The strsep() declaration in lib/string.in.h uses 'restrict'.
+  dnl The strsep declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 1de2f2f..2a06785 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -16,5 +16,5 @@ AC_DEFUN([gl_FUNC_STRTOD],
 ])
 
 # Prerequisites of lib/strtod.c.
-# The need for pow() is already handled by AC_FUNC_STRTOD.
+# The need for pow is already handled by AC_FUNC_STRTOD.
 AC_DEFUN([gl_PREREQ_STRTOD], [:])
diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 930fed7..a6453bb 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRTOK_R],
 [
-  dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'.
+  dnl The strtok_r declaration in lib/string.in.h uses 'restrict'.
   AC_REQUIRE([AC_C_RESTRICT])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4
index 5f01ba9..8523f80 100644
--- a/m4/strverscmp.m4
+++ b/m4/strverscmp.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 AC_DEFUN([gl_FUNC_STRVERSCMP],
 [
-  dnl Persuade glibc <string.h> to declare strverscmp().
+  dnl Persuade glibc <string.h> to declare strverscmp.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REPLACE_FUNCS(strverscmp)
diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index 5dc24b2..2bc9e7c 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -1,4 +1,4 @@
-# Check whether to use a replacement tmpfile() function.
+# Check whether to use a replacement tmpfile function.
 
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
diff --git a/m4/trunc.m4 b/m4/trunc.m4
index feb9d27..5fa0ff4 100644
--- a/m4/trunc.m4
+++ b/m4/trunc.m4
@@ -7,12 +7,12 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_TRUNC],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare trunc().
+  dnl Persuade glibc <math.h> to declare trunc.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether trunc() is declared.
+  dnl Test whether trunc is declared.
   AC_CHECK_DECLS([trunc], , , [#include <math.h>])
   if test "$ac_cv_have_decl_trunc" = yes; then
-    dnl Test whether trunc() can be used without libm.
+    dnl Test whether trunc can be used without libm.
     TRUNC_LIBM=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
diff --git a/m4/truncf.m4 b/m4/truncf.m4
index 7de15fe..ed94ba5 100644
--- a/m4/truncf.m4
+++ b/m4/truncf.m4
@@ -7,12 +7,12 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_TRUNCF],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare truncf().
+  dnl Persuade glibc <math.h> to declare truncf.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether truncf() is declared.
+  dnl Test whether truncf is declared.
   AC_CHECK_DECLS([truncf], , , [#include <math.h>])
   if test "$ac_cv_have_decl_truncf" = yes; then
-    dnl Test whether truncf() can be used without libm.
+    dnl Test whether truncf can be used without libm.
     TRUNCF_LIBM=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
diff --git a/m4/truncl.m4 b/m4/truncl.m4
index aabd27f..bfb3c2d 100644
--- a/m4/truncl.m4
+++ b/m4/truncl.m4
@@ -7,12 +7,12 @@ dnl with or without modifications, as long as this notice is 
preserved.
 AC_DEFUN([gl_FUNC_TRUNCL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
-  dnl Persuade glibc <math.h> to declare truncl().
+  dnl Persuade glibc <math.h> to declare truncl.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  dnl Test whether truncl() is declared.
+  dnl Test whether truncl is declared.
   AC_CHECK_DECLS([truncl], , , [#include <math.h>])
   if test "$ac_cv_have_decl_truncl" = yes; then
-    dnl Test whether truncl() can be used without libm.
+    dnl Test whether truncl can be used without libm.
     TRUNCL_LIBM=?
     AC_TRY_LINK([
        #ifndef __NO_MATH_INLINES
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index 20b2da2..be9de5b 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
      but it is not safe for multithreaded apps.])
 
   dnl Persuade glibc and Solaris <stdio.h> to declare
-  dnl fgets_unlocked(), fputs_unlocked() etc.
+  dnl fgets_unlocked, fputs_unlocked etc.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS_ONCE([clearerr_unlocked])
diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index 074b03c..1007f47 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -30,7 +30,7 @@ AC_DEFUN([gl_REPLACE_VASPRINTF],
 # Prerequisites of the vasprintf portion of lib/stdio.h.
 AC_DEFUN([gl_PREREQ_VASPRINTF_H],
 [
-  dnl Persuade glibc <stdio.h> to declare asprintf() and vasprintf().
+  dnl Persuade glibc <stdio.h> to declare asprintf and vasprintf.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
 
diff --git a/m4/vsnprintf-posix.m4 b/m4/vsnprintf-posix.m4
index 8004f65..7a8d7e6 100644
--- a/m4/vsnprintf-posix.m4
+++ b/m4/vsnprintf-posix.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_POSIX],
   gl_cv_func_vsnprintf_posix=no
   AC_CHECK_FUNCS([vsnprintf])
   if test $ac_cv_func_vsnprintf = yes; then
-    dnl Assume that if vsnprintf() exists, snprintf() also exists.
+    dnl Assume that if vsnprintf exists, snprintf also exists.
     gl_SNPRINTF_TRUNCATION_C99
     gl_SNPRINTF_RETVAL_C99
     gl_SNPRINTF_DIRECTIVE_N
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index 04a9fc2..77be4a0 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
 
-  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  dnl Persuade glibc <wchar.h> to declare wcwidth.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gt_TYPE_WCHAR_T])
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 248b486..ed32464 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -1,6 +1,6 @@
 Description:
 Memory allocation on the stack, as an optional optimization.
-It allows using the alloca() macro if and only if the autoconf tests define
+It allows using the alloca macro if and only if the autoconf tests define
 HAVE_ALLOCA.
 
 Files:
diff --git a/modules/atexit b/modules/atexit
index adce14d..be58e1c 100644
--- a/modules/atexit
+++ b/modules/atexit
@@ -1,5 +1,5 @@
 Description:
-atexit() function: register a function to be called at program termination.
+atexit function: register a function to be called at program termination.
 
 Files:
 lib/atexit.c
diff --git a/modules/bcopy b/modules/bcopy
index be04d29..71d3f31 100644
--- a/modules/bcopy
+++ b/modules/bcopy
@@ -1,5 +1,5 @@
 Description:
-Old BSD bcopy() function: copy memory area.
+Old BSD bcopy function: copy memory area.
 
 Files:
 lib/bcopy.c
diff --git a/modules/calloc b/modules/calloc
index 52c9594..de1fe24 100644
--- a/modules/calloc
+++ b/modules/calloc
@@ -1,5 +1,5 @@
 Description:
-calloc() function that is glibc compatible.
+calloc function that is glibc compatible.
 
 Files:
 lib/calloc.c
diff --git a/modules/calloc-posix b/modules/calloc-posix
index f93b90e..e302c90 100644
--- a/modules/calloc-posix
+++ b/modules/calloc-posix
@@ -1,5 +1,5 @@
 Description:
-calloc() function: allocate memory with indefinite extent.
+calloc function: allocate memory with indefinite extent.
 
 Files:
 lib/calloc.c
diff --git a/modules/ceil b/modules/ceil
index 5c16309..14e4eb2 100644
--- a/modules/ceil
+++ b/modules/ceil
@@ -1,5 +1,5 @@
 Description:
-ceil() function: round towards positive infinity.
+ceil function: round towards positive infinity.
 
 Files:
 m4/ceil.m4
diff --git a/modules/ceilf b/modules/ceilf
index 3c0082c..06c835e 100644
--- a/modules/ceilf
+++ b/modules/ceilf
@@ -1,5 +1,5 @@
 Description:
-ceilf() function: round towards positive infinity.
+ceilf function: round towards positive infinity.
 
 Files:
 lib/ceilf.c
diff --git a/modules/ceill b/modules/ceill
index a2365c2..96e7213 100644
--- a/modules/ceill
+++ b/modules/ceill
@@ -1,5 +1,5 @@
 Description:
-ceill() function: round towards positive infinity.
+ceill function: round towards positive infinity.
 
 Files:
 lib/ceill.c
diff --git a/modules/chown b/modules/chown
index 9e479a5..421c577 100644
--- a/modules/chown
+++ b/modules/chown
@@ -1,5 +1,5 @@
 Description:
-chown() function: change ownership of a file, following symlinks.
+chown function: change ownership of a file, following symlinks.
 
 Files:
 lib/chown.c
diff --git a/modules/dup2 b/modules/dup2
index b188644..e72c3fd 100644
--- a/modules/dup2
+++ b/modules/dup2
@@ -1,5 +1,5 @@
 Description:
-dup2() function: duplicate an open file descriptor.
+dup2 function: duplicate an open file descriptor.
 
 Files:
 lib/dup2.c
diff --git a/modules/error b/modules/error
index 1b58cda..7b57a86 100644
--- a/modules/error
+++ b/modules/error
@@ -1,5 +1,5 @@
 Description:
-error() and error_at_line() functions: Error reporting.
+error and error_at_line functions: Error reporting.
 
 Notice:
 If you are using GNU gettext version 0.16.1 or older, add the following options
diff --git a/modules/euidaccess b/modules/euidaccess
index d1bd3e1..03d143a 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -1,5 +1,5 @@
 Description:
-euidaccess() function: check effective user's permissions for a file.
+euidaccess function: check effective user's permissions for a file.
 
 Files:
 lib/euidaccess.h
diff --git a/modules/exit b/modules/exit
index 4de69b7..a58975c 100644
--- a/modules/exit
+++ b/modules/exit
@@ -1,5 +1,5 @@
 Description:
-exit() function: program termination.
+exit function: program termination.
 
 Files:
 
diff --git a/modules/fbufmode b/modules/fbufmode
index 2d054b4..d870bc5 100644
--- a/modules/fbufmode
+++ b/modules/fbufmode
@@ -1,5 +1,5 @@
 Description:
-fbufmode() function: Determine the buffering mode of a FILE stream.
+fbufmode function: Determine the buffering mode of a FILE stream.
 
 Files:
 lib/fbufmode.h
diff --git a/modules/fchdir b/modules/fchdir
index 5bfaacf..ceca497 100644
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -1,5 +1,5 @@
 Description:
-fchdir() function: change current directory, given an open file descriptor.
+fchdir function: change current directory, given an open file descriptor.
 
 Files:
 lib/fchdir.c
diff --git a/modules/floor b/modules/floor
index f0eaef8..cef3406 100644
--- a/modules/floor
+++ b/modules/floor
@@ -1,5 +1,5 @@
 Description:
-floor() function: round towards negative infinity.
+floor function: round towards negative infinity.
 
 Files:
 m4/floor.m4
diff --git a/modules/floorf b/modules/floorf
index 47b9d5c..eaa3d36 100644
--- a/modules/floorf
+++ b/modules/floorf
@@ -1,5 +1,5 @@
 Description:
-floorf() function: round towards negative infinity.
+floorf function: round towards negative infinity.
 
 Files:
 lib/floorf.c
diff --git a/modules/floorl b/modules/floorl
index 66c1362..bd01fbc 100644
--- a/modules/floorl
+++ b/modules/floorl
@@ -1,5 +1,5 @@
 Description:
-floorl() function: round towards negative infinity.
+floorl function: round towards negative infinity.
 
 Files:
 lib/floorl.c
diff --git a/modules/fnmatch b/modules/fnmatch
index 82048e3..3aa9bef 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -1,5 +1,5 @@
 Description:
-GNU fnmatch() implementation.
+GNU fnmatch implementation.
 
 Files:
 lib/fnmatch.in.h
diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu
index 3328d23..c404fd6 100644
--- a/modules/fnmatch-gnu
+++ b/modules/fnmatch-gnu
@@ -1,5 +1,5 @@
 Description:
-fnmatch() function: wildcard matching, with GNU extensions.
+fnmatch function: wildcard matching, with GNU extensions.
 
 Files:
 
diff --git a/modules/fnmatch-posix b/modules/fnmatch-posix
index bd4c6f5..af1ba9f 100644
--- a/modules/fnmatch-posix
+++ b/modules/fnmatch-posix
@@ -1,5 +1,5 @@
 Description:
-fnmatch() function: wildcard matching.
+fnmatch function: wildcard matching.
 
 Files:
 
diff --git a/modules/fopen b/modules/fopen
index 434cf17..d00535f 100644
--- a/modules/fopen
+++ b/modules/fopen
@@ -1,5 +1,5 @@
 Description:
-fopen() function: open a stream to a file.
+fopen function: open a stream to a file.
 
 Files:
 lib/fopen.c
diff --git a/modules/fprintf-posix b/modules/fprintf-posix
index 44588a9..dc3d892 100644
--- a/modules/fprintf-posix
+++ b/modules/fprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible fprintf() function: print formatted output to a stream
+POSIX compatible fprintf function: print formatted output to a stream
 
 Files:
 lib/fprintf.c
diff --git a/modules/fpurge b/modules/fpurge
index af470e1..a12d467 100644
--- a/modules/fpurge
+++ b/modules/fpurge
@@ -1,5 +1,5 @@
 Description:
-fpurge() function: Flush buffers.
+fpurge function: Flush buffers.
 
 Files:
 lib/fpurge.h
diff --git a/modules/freadable b/modules/freadable
index 3b273bd..e85f640 100644
--- a/modules/freadable
+++ b/modules/freadable
@@ -1,5 +1,5 @@
 Description:
-freadable() function: Determine whether a FILE stream supports reading.
+freadable function: Determine whether a FILE stream supports reading.
 
 Files:
 lib/freadable.h
diff --git a/modules/freadahead b/modules/freadahead
index 824759b..847cb8c 100644
--- a/modules/freadahead
+++ b/modules/freadahead
@@ -1,5 +1,5 @@
 Description:
-freadahead() function: Determine the number of bytes waiting in the input
+freadahead function: Determine the number of bytes waiting in the input
 buffer of a stream.
 
 Files:
diff --git a/modules/freading b/modules/freading
index 339050d..fd5fea1 100644
--- a/modules/freading
+++ b/modules/freading
@@ -1,5 +1,5 @@
 Description:
-freading() function: Determine whether a FILE stream is currently doing 
reading.
+freading function: Determine whether a FILE stream is currently doing reading.
 
 Files:
 lib/freading.h
diff --git a/modules/freopen b/modules/freopen
index 5c556e4..0205d38 100644
--- a/modules/freopen
+++ b/modules/freopen
@@ -1,5 +1,5 @@
 Description:
-freopen() function: open a stream to a file.
+freopen function: open a stream to a file.
 
 Files:
 lib/freopen.c
diff --git a/modules/frexp b/modules/frexp
index 92c635b..b0613d5 100644
--- a/modules/frexp
+++ b/modules/frexp
@@ -1,5 +1,5 @@
 Description:
-frexp() function: split a double into its constituents.
+frexp function: split a double into its constituents.
 
 Files:
 lib/frexp.c
diff --git a/modules/frexp-nolibm b/modules/frexp-nolibm
index 8026d76..044fb47 100644
--- a/modules/frexp-nolibm
+++ b/modules/frexp-nolibm
@@ -1,5 +1,5 @@
 Description:
-frexp() function: split a double into its constituents, without requiring libm.
+frexp function: split a double into its constituents, without requiring libm.
 
 Files:
 lib/frexp.c
diff --git a/modules/frexpl b/modules/frexpl
index 185d54d..b61adc3 100644
--- a/modules/frexpl
+++ b/modules/frexpl
@@ -1,5 +1,5 @@
 Description:
-frexpl() function: split a 'long double' into its constituents.
+frexpl function: split a 'long double' into its constituents.
 
 Files:
 lib/frexpl.c
diff --git a/modules/frexpl-nolibm b/modules/frexpl-nolibm
index 80ce8fb..b78f137 100644
--- a/modules/frexpl-nolibm
+++ b/modules/frexpl-nolibm
@@ -1,5 +1,5 @@
 Description:
-frexpl() function: split a 'long double' into its constituents, without
+frexpl function: split a 'long double' into its constituents, without
 requiring libm.
 
 Files:
diff --git a/modules/fseek b/modules/fseek
index 07f948e..bd21de6 100644
--- a/modules/fseek
+++ b/modules/fseek
@@ -1,5 +1,5 @@
 Description:
-fseek() function: Reposition a FILE stream.
+fseek function: Reposition a FILE stream.
 
 Files:
 lib/fseek.c
diff --git a/modules/fseeko b/modules/fseeko
index eb10901..d9f4368 100644
--- a/modules/fseeko
+++ b/modules/fseeko
@@ -1,5 +1,5 @@
 Description:
-fseeko() function: Reposition a FILE stream.
+fseeko function: Reposition a FILE stream.
 
 Files:
 lib/fseeko.c
diff --git a/modules/ftell b/modules/ftell
index 1dd2348..7b7734c 100644
--- a/modules/ftell
+++ b/modules/ftell
@@ -1,5 +1,5 @@
 Description:
-ftell() function: Retrieve the position of a FILE stream.
+ftell function: Retrieve the position of a FILE stream.
 
 Files:
 lib/ftell.c
diff --git a/modules/ftello b/modules/ftello
index d7ea365..a27d675 100644
--- a/modules/ftello
+++ b/modules/ftello
@@ -1,5 +1,5 @@
 Description:
-ftello() function: Retrieve the position of a FILE stream.
+ftello function: Retrieve the position of a FILE stream.
 
 Files:
 lib/ftello.c
diff --git a/modules/ftruncate b/modules/ftruncate
index a90be6c..19ee669 100644
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -1,5 +1,5 @@
 Description:
-ftruncate() function: truncate an open file to a specified length.
+ftruncate function: truncate an open file to a specified length.
 
 Files:
 lib/ftruncate.c
diff --git a/modules/full-read b/modules/full-read
index c12ba97..f762f30 100644
--- a/modules/full-read
+++ b/modules/full-read
@@ -1,5 +1,5 @@
 Description:
-An interface to read() that reads all it is asked to read.
+An interface to the 'read' function that reads all it is asked to read.
 
 Files:
 lib/full-read.h
diff --git a/modules/full-write b/modules/full-write
index cc8f8b2..11ff68b 100644
--- a/modules/full-write
+++ b/modules/full-write
@@ -1,5 +1,5 @@
 Description:
-An interface to write() that writes all it is asked to write.
+An interface to the 'write' function that writes all it is asked to write.
 
 Files:
 lib/full-write.h
diff --git a/modules/fwritable b/modules/fwritable
index 43bd66b..e414f69 100644
--- a/modules/fwritable
+++ b/modules/fwritable
@@ -1,5 +1,5 @@
 Description:
-fwritable() function: Determine whether a FILE stream supports writing.
+fwritable function: Determine whether a FILE stream supports writing.
 
 Files:
 lib/fwritable.h
diff --git a/modules/fwriting b/modules/fwriting
index 11afb43..935ec0c 100644
--- a/modules/fwriting
+++ b/modules/fwriting
@@ -1,5 +1,5 @@
 Description:
-fwriting() function: Determine whether a FILE stream is currently doing 
writing.
+fwriting function: Determine whether a FILE stream is currently doing writing.
 
 Files:
 lib/fwriting.h
diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index b996465..7839979 100644
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -1,5 +1,5 @@
 Description:
-getaddrinfo() function: Get address information.
+getaddrinfo function: Get address information.
 
 Files:
 lib/getaddrinfo.h
diff --git a/modules/getdomainname b/modules/getdomainname
index b69a1f2..6150a6f 100644
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -1,5 +1,5 @@
 Description:
-getdomainname() function: Return machine's NIS domain name.
+getdomainname function: Return machine's NIS domain name.
 
 Files:
 lib/getdomainname.h
diff --git a/modules/getgroups b/modules/getgroups
index 16604f8..90c9de2 100644
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -1,5 +1,5 @@
 Description:
-getgroups() function: return the supplementary group IDs of the current 
process.
+getgroups function: return the supplementary group IDs of the current process.
 
 Files:
 lib/getgroups.c
diff --git a/modules/gethostname b/modules/gethostname
index 7c13807..5ef7d97 100644
--- a/modules/gethostname
+++ b/modules/gethostname
@@ -1,5 +1,5 @@
 Description:
-gethostname() function: Return machine's hostname.
+gethostname function: Return machine's hostname.
 
 Files:
 lib/gethostname.c
diff --git a/modules/getlogin_r b/modules/getlogin_r
index 35b655e..7fa262d 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -1,5 +1,5 @@
 Description:
-getlogin_r() function: Get user name to a buffer allocated by the caller.
+getlogin_r function: Get user name to a buffer allocated by the caller.
 
 Files:
 lib/getlogin_r.c
diff --git a/modules/getpagesize b/modules/getpagesize
index 91113b9..4456dfc 100644
--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -1,5 +1,5 @@
 Description:
-getpagesize() function: Return memory page size.
+getpagesize function: Return memory page size.
 
 Files:
 m4/getpagesize.m4
diff --git a/modules/getpass b/modules/getpass
index 3220219..dfd4205 100644
--- a/modules/getpass
+++ b/modules/getpass
@@ -1,5 +1,5 @@
 Description:
-getpass() function: read a password from /dev/tty.
+getpass function: read a password from /dev/tty.
 
 Files:
 lib/getpass.h
diff --git a/modules/getpass-gnu b/modules/getpass-gnu
index af493f9..06b6175 100644
--- a/modules/getpass-gnu
+++ b/modules/getpass-gnu
@@ -1,5 +1,5 @@
 Description:
-getpass() function: read a password of arbitrary length from /dev/tty.
+getpass function: read a password of arbitrary length from /dev/tty.
 
 Files:
 lib/getpass.h
diff --git a/modules/gettimeofday b/modules/gettimeofday
index 0913cf1..c721afd 100644
--- a/modules/gettimeofday
+++ b/modules/gettimeofday
@@ -1,5 +1,5 @@
 Description:
-gettimeofday() function: return current time.
+gettimeofday function: return current time.
 
 Files:
 lib/gettimeofday.c
diff --git a/modules/glob b/modules/glob
index dcdf752..5141f37 100644
--- a/modules/glob
+++ b/modules/glob
@@ -1,5 +1,5 @@
 Description:
-glob() function: Search for files and directories with paths matching a
+glob function: Search for files and directories with paths matching a
 pattern, with GNU extensions.
 
 Files:
diff --git a/modules/imaxabs b/modules/imaxabs
index 481486d..1625768 100644
--- a/modules/imaxabs
+++ b/modules/imaxabs
@@ -1,5 +1,5 @@
 Description:
-imaxabs() function: absolute value of 'intmax_t'.
+imaxabs function: absolute value of 'intmax_t'.
 
 Files:
 lib/imaxabs.c
diff --git a/modules/imaxdiv b/modules/imaxdiv
index 7eacbc7..5438ecd 100644
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -1,5 +1,5 @@
 Description:
-imaxdiv() function: division of 'intmax_t'.
+imaxdiv function: division of 'intmax_t'.
 
 Files:
 lib/imaxdiv.c
diff --git a/modules/isnan-nolibm b/modules/isnan-nolibm
index 101dd94..f526024 100644
--- a/modules/isnan-nolibm
+++ b/modules/isnan-nolibm
@@ -1,5 +1,5 @@
 Description:
-isnan() function: test for NaN, without requiring libm.
+isnan function: test for NaN, without requiring libm.
 
 Files:
 lib/isnan.h
diff --git a/modules/isnanf-nolibm b/modules/isnanf-nolibm
index 3f90629..841a223 100644
--- a/modules/isnanf-nolibm
+++ b/modules/isnanf-nolibm
@@ -1,5 +1,5 @@
 Description:
-isnanf() function: test for NaN, without requiring libm.
+isnanf function: test for NaN, without requiring libm.
 
 Files:
 lib/isnanf.h
diff --git a/modules/isnanl b/modules/isnanl
index 026981f..10cf6c0 100644
--- a/modules/isnanl
+++ b/modules/isnanl
@@ -1,5 +1,5 @@
 Description:
-isnanl() function: test for NaN.
+isnanl function: test for NaN.
 
 Files:
 lib/isnanl.h
diff --git a/modules/isnanl-nolibm b/modules/isnanl-nolibm
index 9250fef..02e303e 100644
--- a/modules/isnanl-nolibm
+++ b/modules/isnanl-nolibm
@@ -1,5 +1,5 @@
 Description:
-isnanl() function: test for NaN, without requiring libm.
+isnanl function: test for NaN, without requiring libm.
 
 Files:
 lib/isnanl-nolibm.h
diff --git a/modules/lchown b/modules/lchown
index e011e2b..9666448 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -1,5 +1,5 @@
 Description:
-lchown() function: change ownership of a file, without following symlinks.
+lchown function: change ownership of a file, without following symlinks.
 
 Files:
 lib/lchown.c
diff --git a/modules/ldexpl b/modules/ldexpl
index 7dd82cc..3cc33ac 100644
--- a/modules/ldexpl
+++ b/modules/ldexpl
@@ -1,5 +1,5 @@
 Description:
-ldexpl() function: multiply a 'long double' by a power of 2.
+ldexpl function: multiply a 'long double' by a power of 2.
 
 Files:
 lib/ldexpl.c
diff --git a/modules/lseek b/modules/lseek
index 33de968..1c7a9ce 100644
--- a/modules/lseek
+++ b/modules/lseek
@@ -1,5 +1,5 @@
 Description:
-lseek() function: Reposition a file descriptor.
+lseek function: Reposition a file descriptor.
 
 Files:
 lib/lseek.c
diff --git a/modules/lstat b/modules/lstat
index f2055f9..858ea12 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -1,5 +1,5 @@
 Description:
-lstat() function: return information about a file or symbolic link.
+lstat function: return information about a file or symbolic link.
 
 Files:
 lib/lstat.c
diff --git a/modules/malloc b/modules/malloc
index cc78668..cabedd4 100644
--- a/modules/malloc
+++ b/modules/malloc
@@ -1,5 +1,5 @@
 Description:
-malloc() function that is glibc compatible.
+malloc function that is glibc compatible.
 
 Files:
 lib/malloc.c
diff --git a/modules/malloc-posix b/modules/malloc-posix
index 0b0edd6..99770a1 100644
--- a/modules/malloc-posix
+++ b/modules/malloc-posix
@@ -1,5 +1,5 @@
 Description:
-malloc() function: allocate memory with indefinite extent.
+malloc function: allocate memory with indefinite extent.
 
 Files:
 lib/malloc.c
diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index e89948e..95ea76a 100644
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -1,5 +1,5 @@
 Description:
-mbscasecmp() function: case-insensitive string comparison.
+mbscasecmp function: case-insensitive string comparison.
 
 Files:
 lib/mbscasecmp.c
diff --git a/modules/mbscasestr b/modules/mbscasestr
index a745352..faeaa15 100644
--- a/modules/mbscasestr
+++ b/modules/mbscasestr
@@ -1,5 +1,5 @@
 Description:
-mbscasestr() function: case-insensitive search for a substring in a string.
+mbscasestr function: case-insensitive search for a substring in a string.
 
 Files:
 lib/mbscasestr.c
diff --git a/modules/mbschr b/modules/mbschr
index 1407eea..634da6c 100644
--- a/modules/mbschr
+++ b/modules/mbschr
@@ -1,5 +1,5 @@
 Description:
-mbschr() function: search a string for a character.
+mbschr function: search a string for a character.
 
 Files:
 lib/mbschr.c
diff --git a/modules/mbscspn b/modules/mbscspn
index c24e5cc..b00cf01 100644
--- a/modules/mbscspn
+++ b/modules/mbscspn
@@ -1,5 +1,5 @@
 Description:
-mbscspn() function: search a string for any of a set of characters.
+mbscspn function: search a string for any of a set of characters.
 
 Files:
 lib/mbscspn.c
diff --git a/modules/mbslen b/modules/mbslen
index 47d7ab5..82f28f2 100644
--- a/modules/mbslen
+++ b/modules/mbslen
@@ -1,5 +1,5 @@
 Description:
-mbslen() function: Determine the number of multibyte characters in a string.
+mbslen function: Determine the number of multibyte characters in a string.
 
 Files:
 lib/mbslen.c
diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp
index 05aac0d..7f60f22 100644
--- a/modules/mbsncasecmp
+++ b/modules/mbsncasecmp
@@ -1,5 +1,5 @@
 Description:
-mbsncasecmp() function: case-insensitive string prefix comparison.
+mbsncasecmp function: case-insensitive string prefix comparison.
 
 Files:
 lib/mbsncasecmp.c
diff --git a/modules/mbsnlen b/modules/mbsnlen
index 59f0f94..53daa30 100644
--- a/modules/mbsnlen
+++ b/modules/mbsnlen
@@ -1,5 +1,5 @@
 Description:
-mbsnlen() function: Determine the number of multibyte characters in a string.
+mbsnlen function: Determine the number of multibyte characters in a string.
 
 Files:
 lib/mbsnlen.c
diff --git a/modules/mbspbrk b/modules/mbspbrk
index 79c9afd..a0e2843 100644
--- a/modules/mbspbrk
+++ b/modules/mbspbrk
@@ -1,5 +1,5 @@
 Description:
-mbspbrk() function: search a string for any of a set of characters.
+mbspbrk function: search a string for any of a set of characters.
 
 Files:
 lib/mbspbrk.c
diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp
index e84a48e..8017c61 100644
--- a/modules/mbspcasecmp
+++ b/modules/mbspcasecmp
@@ -1,5 +1,5 @@
 Description:
-mbspcasecmp() function: case-insensitive string prefix comparison.
+mbspcasecmp function: case-insensitive string prefix comparison.
 
 Files:
 lib/mbspcasecmp.c
@@ -25,4 +25,3 @@ LGPL
 
 Maintainer:
 Bruno Haible
-
diff --git a/modules/mbsrchr b/modules/mbsrchr
index 2ff7b38..8df157f 100644
--- a/modules/mbsrchr
+++ b/modules/mbsrchr
@@ -1,5 +1,5 @@
 Description:
-mbsrchr() function: search a string for a character, from the end.
+mbsrchr function: search a string for a character, from the end.
 
 Files:
 lib/mbsrchr.c
diff --git a/modules/mbssep b/modules/mbssep
index 2e50c98..dc6c2ab 100644
--- a/modules/mbssep
+++ b/modules/mbssep
@@ -1,5 +1,5 @@
 Description:
-mbssep() function: split string into tokens, thread safe.
+mbssep function: split string into tokens, thread safe.
 
 Files:
 lib/mbssep.c
diff --git a/modules/mbsspn b/modules/mbsspn
index 7d6ee60..1142c41 100644
--- a/modules/mbsspn
+++ b/modules/mbsspn
@@ -1,5 +1,5 @@
 Description:
-mbsspn() function: search a string for any outside a set of characters.
+mbsspn function: search a string for any outside a set of characters.
 
 Files:
 lib/mbsspn.c
diff --git a/modules/mbsstr b/modules/mbsstr
index 2502e60..189e163 100644
--- a/modules/mbsstr
+++ b/modules/mbsstr
@@ -1,5 +1,5 @@
 Description:
-mbsstr() function: search for a substring in a string.
+mbsstr function: search for a substring in a string.
 
 Files:
 lib/mbsstr.c
diff --git a/modules/mbstok_r b/modules/mbstok_r
index 2aab084..362e8d7 100644
--- a/modules/mbstok_r
+++ b/modules/mbstok_r
@@ -1,5 +1,5 @@
 Description:
-mbstok_r() function: split string into tokens, thread safe.
+mbstok_r function: split string into tokens, thread safe.
 
 Files:
 lib/mbstok_r.c
diff --git a/modules/memchr b/modules/memchr
index 3b18a1c..902c563 100644
--- a/modules/memchr
+++ b/modules/memchr
@@ -1,5 +1,5 @@
 Description:
-memchr() function: scan memory for a byte.
+memchr function: scan memory for a byte.
 
 Files:
 lib/memchr.c
diff --git a/modules/memcmp b/modules/memcmp
index fc85d85..aa59c64 100644
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -1,5 +1,5 @@
 Description:
-memcmp() function: compare memory areas.
+memcmp function: compare memory areas.
 
 Files:
 lib/memcmp.c
diff --git a/modules/memcpy b/modules/memcpy
index d160dd2..ba2b30f 100644
--- a/modules/memcpy
+++ b/modules/memcpy
@@ -1,5 +1,5 @@
 Description:
-memcpy() function: copy memory area.
+memcpy function: copy memory area.
 
 Files:
 lib/memcpy.c
diff --git a/modules/memmem b/modules/memmem
index c51ee30..72746e8 100644
--- a/modules/memmem
+++ b/modules/memmem
@@ -1,5 +1,5 @@
 Description:
-memmem() function: locate first substring in a buffer.
+memmem function: locate first substring in a buffer.
 
 Files:
 lib/memmem.c
diff --git a/modules/memmove b/modules/memmove
index 6588c43..59e71e0 100644
--- a/modules/memmove
+++ b/modules/memmove
@@ -1,5 +1,5 @@
 Description:
-memmove() function: copy memory area.
+memmove function: copy memory area.
 
 Files:
 lib/memmove.c
diff --git a/modules/mempcpy b/modules/mempcpy
index 5fd8bdc..ee66f56 100644
--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -1,5 +1,5 @@
 Description:
-mempcpy() function: copy memory area, return point after last written byte.
+mempcpy function: copy memory area, return point after last written byte.
 
 Files:
 lib/mempcpy.c
diff --git a/modules/memrchr b/modules/memrchr
index 3a6e982..75d401b 100644
--- a/modules/memrchr
+++ b/modules/memrchr
@@ -1,5 +1,5 @@
 Description:
-memrchr() function: scan memory for a byte, from the right end.
+memrchr function: scan memory for a byte, from the right end.
 
 Files:
 lib/memrchr.c
diff --git a/modules/memset b/modules/memset
index 89dfa2c..e067c11 100644
--- a/modules/memset
+++ b/modules/memset
@@ -1,5 +1,5 @@
 Description:
-memset() function: fill memory with a constant byte.
+memset function: fill memory with a constant byte.
 
 Files:
 lib/memset.c
diff --git a/modules/memxor b/modules/memxor
index dea7eed..d13ec8f 100644
--- a/modules/memxor
+++ b/modules/memxor
@@ -1,5 +1,5 @@
 Description:
-memxor() function: binary exclusive or operation on two memory blocks
+memxor function: binary exclusive or operation on two memory blocks
 
 Files:
 lib/memxor.h
diff --git a/modules/mkdir b/modules/mkdir
index ed4ee10..81a0add 100644
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -1,5 +1,5 @@
 Description:
-mkdir() function: create a directory.
+mkdir function: create a directory.
 
 Files:
 lib/mkdir.c
diff --git a/modules/mkdtemp b/modules/mkdtemp
index d023f38..4f1c553 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -1,5 +1,5 @@
 Description:
-mkdtemp() function: create a private temporary directory.
+mkdtemp function: create a private temporary directory.
 
 Files:
 lib/mkdtemp.c
diff --git a/modules/mkstemp b/modules/mkstemp
index 2e6dcf7..3002fee 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -1,5 +1,5 @@
 Description:
-mkstemp() function: create a private temporary file.
+mkstemp function: create a private temporary file.
 
 Files:
 lib/mkstemp.c
diff --git a/modules/mktime b/modules/mktime
index 4846774..ed0e0a8 100644
--- a/modules/mktime
+++ b/modules/mktime
@@ -1,5 +1,5 @@
 Description:
-mktime() function: convert broken-down time to linear time.
+mktime function: convert broken-down time to linear time.
 
 Files:
 lib/mktime.c
diff --git a/modules/nanosleep b/modules/nanosleep
index 3035a13..eb42e85 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -1,5 +1,5 @@
 Description:
-nanosleep() function: pause execution for a specified time.
+nanosleep function: pause execution for a specified time.
 
 Files:
 lib/nanosleep.c
diff --git a/modules/open b/modules/open
index f792adf..ca07d8b 100644
--- a/modules/open
+++ b/modules/open
@@ -1,5 +1,5 @@
 Description:
-open() function: open a descriptor to a file.
+open function: open a descriptor to a file.
 
 Files:
 lib/open.c
diff --git a/modules/poll b/modules/poll
index dba1337..bfec360 100644
--- a/modules/poll
+++ b/modules/poll
@@ -1,5 +1,5 @@
 Description:
-poll() function: wait for some event on a set of file descriptors.
+poll function: wait for some event on a set of file descriptors.
 
 Files:
 lib/poll.c
diff --git a/modules/printf-frexp b/modules/printf-frexp
index b4dc4f6..ad46c7e 100644
--- a/modules/printf-frexp
+++ b/modules/printf-frexp
@@ -1,5 +1,5 @@
 Description:
-printf_frexp() function: split a double into fraction and mantissa, for
+printf_frexp function: split a double into fraction and mantissa, for
 hexadecimal printf, without requiring libm.
 
 Files:
diff --git a/modules/printf-frexpl b/modules/printf-frexpl
index c23550e..af3cdc2 100644
--- a/modules/printf-frexpl
+++ b/modules/printf-frexpl
@@ -1,5 +1,5 @@
 Description:
-printf_frexpl() function: split a long double into fraction and mantissa,
+printf_frexpl function: split a long double into fraction and mantissa,
 for hexadecimal printf, without requiring libm.
 
 Files:
diff --git a/modules/printf-posix b/modules/printf-posix
index b690c72..828095d 100644
--- a/modules/printf-posix
+++ b/modules/printf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible printf() function: print formatted output to standard output
+POSIX compatible printf function: print formatted output to standard output
 
 Files:
 lib/printf.c
diff --git a/modules/printf-safe b/modules/printf-safe
index 8e93366..d5467bd 100644
--- a/modules/printf-safe
+++ b/modules/printf-safe
@@ -1,5 +1,5 @@
 Description:
-Ensures that the *printf() functions provided by the *printf-posix modules
+Ensures that the *printf functions provided by the *printf-posix modules
 recognize non-IEEE-754 values of 'long double' arguments and display them as
 NaN (rather than producing undefined behavior).
 
diff --git a/modules/putenv b/modules/putenv
index 06a0710..b0fb692 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -1,5 +1,5 @@
 Description:
-putenv() function: change or add an environment variable.
+putenv function: change or add an environment variable.
 
 Files:
 lib/putenv.c
diff --git a/modules/read-file b/modules/read-file
index e302940..1c1846c 100644
--- a/modules/read-file
+++ b/modules/read-file
@@ -1,5 +1,5 @@
 Description:
-read_file() function: read the contents of a file into a string
+read_file function: read the contents of a file into a string
 
 Files:
 lib/read-file.h
diff --git a/modules/readlink b/modules/readlink
index 92cc986..4903885 100644
--- a/modules/readlink
+++ b/modules/readlink
@@ -1,5 +1,5 @@
 Description:
-readlink() function: read the value of a symbolic link.
+readlink function: read the value of a symbolic link.
 
 Files:
 lib/readlink.c
diff --git a/modules/realloc b/modules/realloc
index 4596b4c..98c8b6b 100644
--- a/modules/realloc
+++ b/modules/realloc
@@ -1,5 +1,5 @@
 Description:
-realloc() function that is glibc compatible.
+realloc function that is glibc compatible.
 
 Files:
 lib/realloc.c
diff --git a/modules/realloc-posix b/modules/realloc-posix
index 5876584..21c549a 100644
--- a/modules/realloc-posix
+++ b/modules/realloc-posix
@@ -1,5 +1,5 @@
 Description:
-realloc() function: allocate memory with indefinite extent.
+realloc function: allocate memory with indefinite extent.
 
 Files:
 lib/realloc.c
diff --git a/modules/rename b/modules/rename
index 9eaea93..aaf11c6 100644
--- a/modules/rename
+++ b/modules/rename
@@ -1,5 +1,5 @@
 Description:
-rename() function: change the name or location of a file.
+rename function: change the name or location of a file.
 
 Files:
 lib/rename.c
diff --git a/modules/rename-dest-slash b/modules/rename-dest-slash
index d45fe5b..39eb293 100644
--- a/modules/rename-dest-slash
+++ b/modules/rename-dest-slash
@@ -1,5 +1,5 @@
 Description:
-rename() function: change the name or location of a file.
+rename function: change the name or location of a file.
 
 Files:
 lib/rename-dest-slash.c
diff --git a/modules/rmdir b/modules/rmdir
index 0367381..6ccaed0 100644
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -1,5 +1,5 @@
 Description:
-rmdir() function: delete a directory.
+rmdir function: delete a directory.
 
 Files:
 lib/rmdir.c
diff --git a/modules/round b/modules/round
index c4acba1..5bc9047 100644
--- a/modules/round
+++ b/modules/round
@@ -1,5 +1,5 @@
 Description:
-round() function: round toward nearest, breaking ties away from zero.
+round function: round toward nearest, breaking ties away from zero.
 
 Files:
 lib/round.c
diff --git a/modules/roundf b/modules/roundf
index d77b2a1..3debd70 100644
--- a/modules/roundf
+++ b/modules/roundf
@@ -1,5 +1,5 @@
 Description:
-roundf() function: round toward nearest, breaking ties away from zero.
+roundf function: round toward nearest, breaking ties away from zero.
 
 Files:
 lib/round.c
diff --git a/modules/roundl b/modules/roundl
index 9eb9f1d..b7770bb 100644
--- a/modules/roundl
+++ b/modules/roundl
@@ -1,5 +1,5 @@
 Description:
-roundl() function: round toward nearest, breaking ties away from zero.
+roundl function: round toward nearest, breaking ties away from zero.
 
 Files:
 lib/round.c
diff --git a/modules/safe-read b/modules/safe-read
index e8f8d23..a306def 100644
--- a/modules/safe-read
+++ b/modules/safe-read
@@ -1,5 +1,5 @@
 Description:
-An interface to read() that retries after interrupts.
+An interface to the 'read' function that retries after interrupts.
 
 Files:
 lib/safe-read.h
diff --git a/modules/safe-write b/modules/safe-write
index 3853553..e60538a 100644
--- a/modules/safe-write
+++ b/modules/safe-write
@@ -1,5 +1,5 @@
 Description:
-An interface to write() that retries after interrupts.
+An interface to the 'write' function that retries after interrupts.
 
 Files:
 lib/safe-write.h
diff --git a/modules/setenv b/modules/setenv
index 9aaf726..088cd4e 100644
--- a/modules/setenv
+++ b/modules/setenv
@@ -1,6 +1,6 @@
 Description:
-setenv() function: set an environment variable.
-unsetenv() function: remove an environment variable.
+setenv function: set an environment variable.
+unsetenv function: remove an environment variable.
 
 Files:
 lib/setenv.h
diff --git a/modules/signbit b/modules/signbit
index 57ba154..db7e277 100644
--- a/modules/signbit
+++ b/modules/signbit
@@ -1,5 +1,5 @@
 Description:
-signbit() macro: Determine the sign bit of a floating-point number.
+signbit macro: Determine the sign bit of a floating-point number.
 
 Files:
 lib/signbitf.c
diff --git a/modules/sleep b/modules/sleep
index 13c20f0..373aaaa 100644
--- a/modules/sleep
+++ b/modules/sleep
@@ -1,5 +1,5 @@
 Description:
-sleep() function: pause execution of the current thread.
+sleep function: pause execution of the current thread.
 
 Files:
 lib/sleep.c
diff --git a/modules/snprintf b/modules/snprintf
index 91c41c5..c005e49 100644
--- a/modules/snprintf
+++ b/modules/snprintf
@@ -1,5 +1,5 @@
 Description:
-snprintf() function: print formatted output to a fixed length string
+snprintf function: print formatted output to a fixed length string
 
 Files:
 lib/snprintf.c
diff --git a/modules/snprintf-posix b/modules/snprintf-posix
index 679569f..9bc576c 100644
--- a/modules/snprintf-posix
+++ b/modules/snprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible snprintf() function: print formatted output to a fixed length
+POSIX compatible snprintf function: print formatted output to a fixed length
 string
 
 Files:
diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index 4aaa2d4..9110f30 100644
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible sprintf() function: print formatted output to a string
+POSIX compatible sprintf function: print formatted output to a string
 
 Files:
 lib/sprintf.c
diff --git a/modules/stpcpy b/modules/stpcpy
index 0853971..b047f76 100644
--- a/modules/stpcpy
+++ b/modules/stpcpy
@@ -1,5 +1,5 @@
 Description:
-stpcpy() function: copy a string, returning a pointer to its end.
+stpcpy function: copy a string, returning a pointer to its end.
 
 Files:
 lib/stpcpy.c
diff --git a/modules/stpncpy b/modules/stpncpy
index 48eedf7..d349070 100644
--- a/modules/stpncpy
+++ b/modules/stpncpy
@@ -1,5 +1,5 @@
 Description:
-stpncpy() function: copy a size-bounded string, returning a pointer to its end.
+stpncpy function: copy a size-bounded string, returning a pointer to its end.
 
 Files:
 lib/stpncpy.c
diff --git a/modules/strcasestr b/modules/strcasestr
index a18015a..b878a29 100644
--- a/modules/strcasestr
+++ b/modules/strcasestr
@@ -1,5 +1,5 @@
 Description:
-strcasestr() function: case-insensitive search for a substring in a string.
+strcasestr function: case-insensitive search for a substring in a string.
 
 Files:
 lib/strcasestr.c
diff --git a/modules/strchrnul b/modules/strchrnul
index 806aebb..c73844c 100644
--- a/modules/strchrnul
+++ b/modules/strchrnul
@@ -1,5 +1,5 @@
 Description:
-strchrnul(): Find the first occurrence of C in S or the final NUL byte.
+strchrnul function: Find the first occurrence of C in S or the final NUL byte.
 
 Files:
 lib/strchrnul.c
diff --git a/modules/strcspn b/modules/strcspn
index a80c852..55e45af 100644
--- a/modules/strcspn
+++ b/modules/strcspn
@@ -1,5 +1,5 @@
 Description:
-strcspn() function: search a string for any of a set of characters.
+strcspn function: search a string for any of a set of characters.
 
 Files:
 lib/strcspn.c
diff --git a/modules/strdup b/modules/strdup
index ac5c5f4..2a5fffc 100644
--- a/modules/strdup
+++ b/modules/strdup
@@ -1,5 +1,5 @@
 Description:
-strdup() function: duplicate a string.
+strdup function: duplicate a string.
 
 Files:
 lib/strdup.c
diff --git a/modules/strerror b/modules/strerror
index 2e914b3..6dbb766 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -1,5 +1,5 @@
 Description:
-strerror() function: return string describing error code.
+strerror function: return string describing error code.
 
 Files:
 lib/strerror.c
diff --git a/modules/strftime b/modules/strftime
index e414737..17e4ad4 100644
--- a/modules/strftime
+++ b/modules/strftime
@@ -1,5 +1,5 @@
 Description:
-nstrftime() function: convert date and time to string, with GNU extensions.
+nstrftime function: convert date and time to string, with GNU extensions.
 
 Files:
 lib/strftime.h
diff --git a/modules/strndup b/modules/strndup
index 80f143b..ed7dfdb 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -1,5 +1,5 @@
 Description:
-strndup() function: duplicate a size-bounded string.
+strndup function: duplicate a size-bounded string.
 
 Files:
 lib/strndup.c
diff --git a/modules/strnlen b/modules/strnlen
index 627e694..211244f 100644
--- a/modules/strnlen
+++ b/modules/strnlen
@@ -1,5 +1,5 @@
 Description:
-strnlen() function: determine the length of a size-bounded string.
+strnlen function: determine the length of a size-bounded string.
 
 Files:
 lib/strnlen.c
diff --git a/modules/strpbrk b/modules/strpbrk
index 914eef9..4562cd7 100644
--- a/modules/strpbrk
+++ b/modules/strpbrk
@@ -1,5 +1,5 @@
 Description:
-strpbrk() function: search a string for any of a set of characters.
+strpbrk function: search a string for any of a set of characters.
 
 Files:
 lib/strpbrk.c
diff --git a/modules/strsep b/modules/strsep
index 10ca817..c383234 100644
--- a/modules/strsep
+++ b/modules/strsep
@@ -1,5 +1,5 @@
 Description:
-strsep() function: extract token from string.
+strsep function: extract token from string.
 
 Files:
 lib/strsep.c
diff --git a/modules/strtod b/modules/strtod
index 4098b13..8d31dba 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -1,5 +1,5 @@
 Description:
-strtod() function: convert string to 'double'.
+strtod function: convert string to 'double'.
 
 Files:
 lib/strtod.c
diff --git a/modules/strtoimax b/modules/strtoimax
index 9f82af4..7ba2b3d 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -1,5 +1,5 @@
 Description:
-strtoimax() function: convert string to 'intmax_t'.
+strtoimax function: convert string to 'intmax_t'.
 
 Files:
 lib/strtoimax.c
diff --git a/modules/strtok_r b/modules/strtok_r
index cfcd014..d0e20b7 100644
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -1,5 +1,5 @@
 Description:
-strtok_r() function: split string into tokens, thread safe.
+strtok_r function: split string into tokens, thread safe.
 
 Files:
 lib/strtok_r.c
diff --git a/modules/strtol b/modules/strtol
index 8a313a4..c8139a6 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -1,5 +1,5 @@
 Description:
-strtol() function: convert string to 'long'.
+strtol function: convert string to 'long'.
 
 Files:
 lib/strtol.c
diff --git a/modules/strtoll b/modules/strtoll
index a25ebfa..ce3ca33 100644
--- a/modules/strtoll
+++ b/modules/strtoll
@@ -1,5 +1,5 @@
 Description:
-strtoll() function: convert string to 'long long'.
+strtoll function: convert string to 'long long'.
 
 Files:
 lib/strtoll.c
diff --git a/modules/strtoul b/modules/strtoul
index 8cb6d66..e989047 100644
--- a/modules/strtoul
+++ b/modules/strtoul
@@ -1,5 +1,5 @@
 Description:
-strtoul() function: convert string to 'unsigned long'.
+strtoul function: convert string to 'unsigned long'.
 
 Files:
 lib/strtoul.c
diff --git a/modules/strtoull b/modules/strtoull
index 9cf4d7f..17cdbfe 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -1,5 +1,5 @@
 Description:
-strtoull() function: convert string to 'unsigned long long'.
+strtoull function: convert string to 'unsigned long long'.
 
 Files:
 lib/strtoull.c
diff --git a/modules/strtoumax b/modules/strtoumax
index e886285..f4a0004 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -1,5 +1,5 @@
 Description:
-strtoumax() function: convert string to 'uintmax_t'.
+strtoumax function: convert string to 'uintmax_t'.
 
 Files:
 lib/strtoumax.c
diff --git a/modules/tempname b/modules/tempname
index af689de..3d10342 100644
--- a/modules/tempname
+++ b/modules/tempname
@@ -1,5 +1,5 @@
 Description:
-gen_tempname() function: create a private temporary file or directory.
+gen_tempname function: create a private temporary file or directory.
 
 Files:
 lib/tempname.c
diff --git a/modules/tmpfile b/modules/tmpfile
index bc7c42c..0fc76f3 100644
--- a/modules/tmpfile
+++ b/modules/tmpfile
@@ -1,5 +1,5 @@
 Description:
-tmpfile() function: create a temporary file.
+tmpfile function: create a temporary file.
 
 Files:
 lib/tmpfile.c
diff --git a/modules/trim b/modules/trim
index 70286f8..a69f235 100644
--- a/modules/trim
+++ b/modules/trim
@@ -1,5 +1,5 @@
 Description:
-trim() removes leading and/or trailing whitespaces
+Remove leading and/or trailing whitespace.
 
 Files:
 lib/trim.h
diff --git a/modules/trunc b/modules/trunc
index 1c6f706..85c2712 100644
--- a/modules/trunc
+++ b/modules/trunc
@@ -1,5 +1,5 @@
 Description:
-trunc() function: round towards zero.
+trunc function: round towards zero.
 
 Files:
 lib/trunc.c
diff --git a/modules/truncf b/modules/truncf
index 6c4c46f..9356bff 100644
--- a/modules/truncf
+++ b/modules/truncf
@@ -1,5 +1,5 @@
 Description:
-truncf() function: round towards zero.
+truncf function: round towards zero.
 
 Files:
 lib/truncf.c
diff --git a/modules/truncl b/modules/truncl
index d3d8884..1d96617 100644
--- a/modules/truncl
+++ b/modules/truncl
@@ -1,5 +1,5 @@
 Description:
-truncl() function: round towards zero.
+truncl function: round towards zero.
 
 Files:
 lib/truncl.c
diff --git a/modules/unictype/ctype-alnum b/modules/unictype/ctype-alnum
index fd7f52b..eea6d85 100644
--- a/modules/unictype/ctype-alnum
+++ b/modules/unictype/ctype-alnum
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isalnum() and <wctype.h> iswalnum().
+Generalization of <ctype.h> isalnum and <wctype.h> iswalnum.
 
 Files:
 lib/unictype/ctype_alnum.c
diff --git a/modules/unictype/ctype-alpha b/modules/unictype/ctype-alpha
index e0f474d..61ce98f 100644
--- a/modules/unictype/ctype-alpha
+++ b/modules/unictype/ctype-alpha
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isalpha() and <wctype.h> iswalpha().
+Generalization of <ctype.h> isalpha and <wctype.h> iswalpha.
 
 Files:
 lib/unictype/ctype_alpha.c
diff --git a/modules/unictype/ctype-blank b/modules/unictype/ctype-blank
index 72845ad..29ad7b0 100644
--- a/modules/unictype/ctype-blank
+++ b/modules/unictype/ctype-blank
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isblank() and <wctype.h> iswblank().
+Generalization of <ctype.h> isblank and <wctype.h> iswblank.
 
 Files:
 lib/unictype/ctype_blank.c
diff --git a/modules/unictype/ctype-cntrl b/modules/unictype/ctype-cntrl
index 7de3e05..cddc3e0 100644
--- a/modules/unictype/ctype-cntrl
+++ b/modules/unictype/ctype-cntrl
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> iscntrl() and <wctype.h> iswcntrl().
+Generalization of <ctype.h> iscntrl and <wctype.h> iswcntrl.
 
 Files:
 lib/unictype/ctype_cntrl.c
diff --git a/modules/unictype/ctype-digit b/modules/unictype/ctype-digit
index 5181492..e7ba8f4 100644
--- a/modules/unictype/ctype-digit
+++ b/modules/unictype/ctype-digit
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isdigit() and <wctype.h> iswdigit().
+Generalization of <ctype.h> isdigit and <wctype.h> iswdigit.
 
 Files:
 lib/unictype/ctype_digit.c
diff --git a/modules/unictype/ctype-graph b/modules/unictype/ctype-graph
index 895970b..abfeb2b 100644
--- a/modules/unictype/ctype-graph
+++ b/modules/unictype/ctype-graph
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isgraph() and <wctype.h> iswgraph().
+Generalization of <ctype.h> isgraph and <wctype.h> iswgraph.
 
 Files:
 lib/unictype/ctype_graph.c
diff --git a/modules/unictype/ctype-lower b/modules/unictype/ctype-lower
index 126feb8..c238de7 100644
--- a/modules/unictype/ctype-lower
+++ b/modules/unictype/ctype-lower
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> islower() and <wctype.h> iswlower().
+Generalization of <ctype.h> islower and <wctype.h> iswlower.
 
 Files:
 lib/unictype/ctype_lower.c
diff --git a/modules/unictype/ctype-print b/modules/unictype/ctype-print
index b4e6f4f..0b19f24 100644
--- a/modules/unictype/ctype-print
+++ b/modules/unictype/ctype-print
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isprint() and <wctype.h> iswprint().
+Generalization of <ctype.h> isprint and <wctype.h> iswprint.
 
 Files:
 lib/unictype/ctype_print.c
diff --git a/modules/unictype/ctype-punct b/modules/unictype/ctype-punct
index f4216a1..f16cfe6 100644
--- a/modules/unictype/ctype-punct
+++ b/modules/unictype/ctype-punct
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> ispunct() and <wctype.h> iswpunct().
+Generalization of <ctype.h> ispunct and <wctype.h> iswpunct.
 
 Files:
 lib/unictype/ctype_punct.c
diff --git a/modules/unictype/ctype-space b/modules/unictype/ctype-space
index cc1ca30..d0a7ed5 100644
--- a/modules/unictype/ctype-space
+++ b/modules/unictype/ctype-space
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isspace() and <wctype.h> iswspace().
+Generalization of <ctype.h> isspace and <wctype.h> iswspace.
 
 Files:
 lib/unictype/ctype_space.c
diff --git a/modules/unictype/ctype-upper b/modules/unictype/ctype-upper
index 37d4767..b812107 100644
--- a/modules/unictype/ctype-upper
+++ b/modules/unictype/ctype-upper
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isupper() and <wctype.h> iswupper().
+Generalization of <ctype.h> isupper and <wctype.h> iswupper.
 
 Files:
 lib/unictype/ctype_upper.c
diff --git a/modules/unictype/ctype-xdigit b/modules/unictype/ctype-xdigit
index 483e2b8..5138dcf 100644
--- a/modules/unictype/ctype-xdigit
+++ b/modules/unictype/ctype-xdigit
@@ -1,5 +1,5 @@
 Description:
-Generalization of <ctype.h> isxdigit() and <wctype.h> iswxdigit().
+Generalization of <ctype.h> isxdigit and <wctype.h> iswxdigit.
 
 Files:
 lib/unictype/ctype_xdigit.c
diff --git a/modules/utime b/modules/utime
index dc5dd59..c847725 100644
--- a/modules/utime
+++ b/modules/utime
@@ -1,5 +1,5 @@
 Description:
-utime() function: change access and/or modification times of a file.
+utime function: change access and/or modification times of a file.
 
 Files:
 lib/utime.c
diff --git a/modules/verror b/modules/verror
index 5c43dfe..c843198 100644
--- a/modules/verror
+++ b/modules/verror
@@ -1,5 +1,5 @@
 Description:
-verror() and verror_at_line() functions: Error reporting with va_list.
+verror and verror_at_line functions: Error reporting with va_list.
 
 Notice:
 If you are using GNU gettext version 0.16.1 or older, add the following options
diff --git a/modules/vfprintf-posix b/modules/vfprintf-posix
index 52ab7ee..2a03517 100644
--- a/modules/vfprintf-posix
+++ b/modules/vfprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible vfprintf() function: print formatted output to a stream
+POSIX compatible vfprintf function: print formatted output to a stream
 
 Files:
 lib/vfprintf.c
diff --git a/modules/vprintf-posix b/modules/vprintf-posix
index 2007000..aa4febf 100644
--- a/modules/vprintf-posix
+++ b/modules/vprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible vprintf() function: print formatted output to standard output
+POSIX compatible vprintf function: print formatted output to standard output
 
 Files:
 lib/vprintf.c
diff --git a/modules/vsnprintf b/modules/vsnprintf
index 06e2c7e..710dbf1 100644
--- a/modules/vsnprintf
+++ b/modules/vsnprintf
@@ -1,5 +1,5 @@
 Description:
-vsnprintf() function: print formatted output from an stdarg argument list
+vsnprintf function: print formatted output from an stdarg argument list
 to a fixed length string
 
 Files:
diff --git a/modules/vsnprintf-posix b/modules/vsnprintf-posix
index dbe6402..620914b 100644
--- a/modules/vsnprintf-posix
+++ b/modules/vsnprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible vsnprintf() function: print formatted output to a fixed length
+POSIX compatible vsnprintf function: print formatted output to a fixed length
 string
 
 Files:
diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index 0dc7ea2..423c7f5 100644
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -1,5 +1,5 @@
 Description:
-POSIX compatible vsprintf() function: print formatted output to a string
+POSIX compatible vsprintf function: print formatted output to a string
 
 Files:
 lib/vsprintf.c
diff --git a/modules/xsetenv b/modules/xsetenv
index ea313e7..086cd6c 100644
--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -1,6 +1,6 @@
 Description:
-xsetenv() function: set an environment variable, with out-of-memory checking.
-unsetenv() function: remove an environment variable.
+xsetenv function: set an environment variable, with out-of-memory checking.
+unsetenv function: remove an environment variable.
 
 Files:
 lib/xsetenv.h
diff --git a/tests/test-atexit.sh b/tests/test-atexit.sh
index 49c7729..52d9eb5 100755
--- a/tests/test-atexit.sh
+++ b/tests/test-atexit.sh
@@ -4,7 +4,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-atexit.tmp"
-# Check that an atexit handler is called when main() returns normally.
+# Check that an atexit handler is called when 'main' returns normally.
 echo > t-atexit.tmp
 ./test-atexit${EXEEXT}
 if test -f t-atexit.tmp; then
diff --git a/tests/test-c-strcasecmp.c b/tests/test-c-strcasecmp.c
index 962a474..63489e3 100644
--- a/tests/test-c-strcasecmp.c
+++ b/tests/test-c-strcasecmp.c
@@ -56,14 +56,14 @@ main (int argc, char *argv[])
   ASSERT (c_strcasecmp ("para", "paragraph") < 0);
   ASSERT (c_strcasecmp ("paragraph", "para") > 0);
 
-  /* The following tests shows how c_strcasecmp() is different from
-     strcasecmp().  */
+  /* The following tests shows how c_strcasecmp is different from
+     strcasecmp.  */
 
   ASSERT (c_strcasecmp ("\311mile", "\351mile") < 0);
   ASSERT (c_strcasecmp ("\351mile", "\311mile") > 0);
 
-  /* The following tests shows how c_strcasecmp() is different from
-     mbscasecmp().  */
+  /* The following tests shows how c_strcasecmp is different from
+     mbscasecmp.  */
 
   ASSERT (c_strcasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R") > 0); /* 
özgür */
   ASSERT (c_strcasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r") < 0); /* 
özgür */
diff --git a/tests/test-c-strncasecmp.c b/tests/test-c-strncasecmp.c
index 84c48d4..97d70c3 100644
--- a/tests/test-c-strncasecmp.c
+++ b/tests/test-c-strncasecmp.c
@@ -70,14 +70,14 @@ main (int argc, char *argv[])
   ASSERT (c_strncasecmp ("paragraph", "para", 5) > 0);
   ASSERT (c_strncasecmp ("paragraph", "para", 4) == 0);
 
-  /* The following tests shows how c_strncasecmp() is different from
-     strncasecmp().  */
+  /* The following tests shows how c_strncasecmp is different from
+     strncasecmp.  */
 
   ASSERT (c_strncasecmp ("\311mily", "\351mile", 4) < 0);
   ASSERT (c_strncasecmp ("\351mile", "\311mily", 4) > 0);
 
-  /* The following tests shows how c_strncasecmp() is different from
-     mbsncasecmp().  */
+  /* The following tests shows how c_strncasecmp is different from
+     mbsncasecmp.  */
 
   ASSERT (c_strncasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R", 99) > 
0); /* özgür */
   ASSERT (c_strncasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r", 99) < 
0); /* özgür */
diff --git a/tests/test-closein.c b/tests/test-closein.c
index cf7b30a..c8065d5 100644
--- a/tests/test-closein.c
+++ b/tests/test-closein.c
@@ -30,7 +30,7 @@
 char *program_name;
 
 /* With no arguments, do nothing.  With arguments, attempt to consume
-   first 6 bytes of stdin.  In either case, let exit() take care of
+   first 6 bytes of stdin.  In either case, let 'exit' take care of
    closing std streams and changing exit status if ferror(stdin).  */
 int
 main (int argc, char **argv)
diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c
index 4fe8e75..4d3ee02 100644
--- a/tests/test-fbufmode.c
+++ b/tests/test-fbufmode.c
@@ -1,4 +1,4 @@
-/* Test of fbufmode() function.
+/* Test of fbufmode function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fflush.c b/tests/test-fflush.c
index 6f369f0..5716042 100644
--- a/tests/test-fflush.c
+++ b/tests/test-fflush.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible fflush() function.
+/* Test of POSIX compatible fflush function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fprintf-posix.c b/tests/test-fprintf-posix.c
index 1b4cf6c..790b4d0 100644
--- a/tests/test-fprintf-posix.c
+++ b/tests/test-fprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible fprintf() function.
+/* Test of POSIX compatible fprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fprintf-posix.h b/tests/test-fprintf-posix.h
index fc44351..9b58d60 100644
--- a/tests/test-fprintf-posix.h
+++ b/tests/test-fprintf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsprintf() and sprintf() functions.
+/* Test of POSIX compatible vsprintf and sprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fprintf-posix2.c b/tests/test-fprintf-posix2.c
index 6d6dc08..ebdb262 100644
--- a/tests/test-fprintf-posix2.c
+++ b/tests/test-fprintf-posix2.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible fprintf() function.
+/* Test of POSIX compatible fprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
   int ret;
 
   /* Some printf implementations allocate temporary space with malloc.  */
-  /* On BSD systems, malloc() is limited by RLIMIT_DATA.  */
+  /* On BSD systems, malloc is limited by RLIMIT_DATA.  */
 #ifdef RLIMIT_DATA
   if (getrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
   if (setrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
 #endif
-  /* On Linux systems, malloc() is limited by RLIMIT_AS.  */
+  /* On Linux systems, malloc is limited by RLIMIT_AS.  */
 #ifdef RLIMIT_AS
   if (getrlimit (RLIMIT_AS, &limit) < 0)
     return 77;
diff --git a/tests/test-fpurge.c b/tests/test-fpurge.c
index d6ed418..4bfec29 100644
--- a/tests/test-fpurge.c
+++ b/tests/test-fpurge.c
@@ -1,4 +1,4 @@
-/* Test of fpurge() function.
+/* Test of fpurge function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-freadable.c b/tests/test-freadable.c
index f9d1399..2f8c80d 100644
--- a/tests/test-freadable.c
+++ b/tests/test-freadable.c
@@ -1,4 +1,4 @@
-/* Test of freadable() function.
+/* Test of freadable function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-freadahead.c b/tests/test-freadahead.c
index d4b098a..4145229 100644
--- a/tests/test-freadahead.c
+++ b/tests/test-freadahead.c
@@ -1,4 +1,4 @@
-/* Test of freadahead() function.
+/* Test of freadahead function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-freading.c b/tests/test-freading.c
index d429a7c..3893c03 100644
--- a/tests/test-freading.c
+++ b/tests/test-freading.c
@@ -1,4 +1,4 @@
-/* Test of freading() function.
+/* Test of freading function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -97,7 +97,7 @@ main ()
     goto skip;
   ASSERT (freading (fp));
   /* This fseek call is necessary when switching from reading to writing.
-     See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
+     See the description of fopen, ISO C 99 7.19.5.3.(6).  */
   if (fseek (fp, 0, SEEK_CUR) != 0)
     goto skip;
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
@@ -137,7 +137,7 @@ main ()
     goto skip;
   ASSERT (freading (fp));
   /* This fseek call is necessary when switching from reading to writing.
-     See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
+     See the description of fopen, ISO C 99 7.19.5.3.(6).  */
   if (fseek (fp, 0, SEEK_CUR) != 0)
     goto skip;
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
diff --git a/tests/test-fseek.c b/tests/test-fseek.c
index 0c7db95..d2c76e6 100644
--- a/tests/test-fseek.c
+++ b/tests/test-fseek.c
@@ -1,4 +1,4 @@
-/* Test of fseek() function.
+/* Test of fseek function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c
index 25289ce..ba069fa 100644
--- a/tests/test-fseeko.c
+++ b/tests/test-fseeko.c
@@ -1,4 +1,4 @@
-/* Test of fseeko() function.
+/* Test of fseeko function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fseterr.c b/tests/test-fseterr.c
index 475979b..f280bc8 100644
--- a/tests/test-fseterr.c
+++ b/tests/test-fseterr.c
@@ -30,12 +30,12 @@ main ()
   if (ferror (stdout))
     abort ();
 
-  /* Verify that fseterr() works.  */
+  /* Verify that fseterr works.  */
   fseterr (stdout);
   if (!ferror (stdout))
     abort ();
 
-  /* Verify fseterr's effect can be undone by clearerr().  */
+  /* Verify fseterr's effect can be undone by clearerr.  */
   clearerr (stdout);
   if (ferror (stdout))
     abort ();
diff --git a/tests/test-ftell.c b/tests/test-ftell.c
index 05e393d..1099c0c 100644
--- a/tests/test-ftell.c
+++ b/tests/test-ftell.c
@@ -1,4 +1,4 @@
-/* Test of ftell() function.
+/* Test of ftell function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-ftello.c b/tests/test-ftello.c
index 0357282..85eb375 100644
--- a/tests/test-ftello.c
+++ b/tests/test-ftello.c
@@ -1,4 +1,4 @@
-/* Test of ftello() function.
+/* Test of ftello function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fwritable.c b/tests/test-fwritable.c
index a128f13..7b2dd0e 100644
--- a/tests/test-fwritable.c
+++ b/tests/test-fwritable.c
@@ -1,4 +1,4 @@
-/* Test of fwritable() function.
+/* Test of fwritable function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-fwriting.c b/tests/test-fwriting.c
index 77ac97a..185a582 100644
--- a/tests/test-fwriting.c
+++ b/tests/test-fwriting.c
@@ -1,4 +1,4 @@
-/* Test of fwriting() function.
+/* Test of fwriting function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -97,7 +97,7 @@ main ()
     goto skip;
   ASSERT (!fwriting (fp));
   /* This fseek call is necessary when switching from reading to writing.
-     See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
+     See the description of fopen, ISO C 99 7.19.5.3.(6).  */
   if (fseek (fp, 0, SEEK_CUR) != 0)
     goto skip;
   ASSERT (!fwriting (fp));
@@ -137,7 +137,7 @@ main ()
     goto skip;
   ASSERT (!fwriting (fp));
   /* This fseek call is necessary when switching from reading to writing.
-     See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
+     See the description of fopen, ISO C 99 7.19.5.3.(6).  */
   if (fseek (fp, 0, SEEK_CUR) != 0)
     goto skip;
   ASSERT (!fwriting (fp));
diff --git a/tests/test-getdelim.c b/tests/test-getdelim.c
index aca6d60..e587617 100644
--- a/tests/test-getdelim.c
+++ b/tests/test-getdelim.c
@@ -1,4 +1,4 @@
-/* Test of getdelim() function.
+/* Test of getdelim function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-getline.c b/tests/test-getline.c
index cdfefd9..5d1a944 100644
--- a/tests/test-getline.c
+++ b/tests/test-getline.c
@@ -1,4 +1,4 @@
-/* Test of getline() function.
+/* Test of getline function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-iconv-utf.c b/tests/test-iconv-utf.c
index 0465b35..61e7e6a 100644
--- a/tests/test-iconv-utf.c
+++ b/tests/test-iconv-utf.c
@@ -42,7 +42,7 @@ int
 main ()
 {
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encoding UTF-8.  */
+  /* Assume that iconv supports at least the encoding UTF-8.  */
 
   /* The text is "Japanese (日本語) [\U0001D50D\U0001D51E\U0001D52D]".  */
 
diff --git a/tests/test-iconv.c b/tests/test-iconv.c
index e7db790..0640be2 100644
--- a/tests/test-iconv.c
+++ b/tests/test-iconv.c
@@ -42,7 +42,7 @@ int
 main ()
 {
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      and UTF-8.  */
   iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
   iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c
index acdb456..44b0601 100644
--- a/tests/test-isfinite.c
+++ b/tests/test-isfinite.c
@@ -1,4 +1,4 @@
-/* Test of isfinite() substitute.
+/* Test of isfinite substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-isnan.c b/tests/test-isnan.c
index 3541af4..669b4c2 100644
--- a/tests/test-isnan.c
+++ b/tests/test-isnan.c
@@ -1,4 +1,4 @@
-/* Test of isnan() substitute.
+/* Test of isnan substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-isnanf.c b/tests/test-isnanf.c
index c433089..0967915 100644
--- a/tests/test-isnanf.c
+++ b/tests/test-isnanf.c
@@ -1,4 +1,4 @@
-/* Test of isnanf() substitute.
+/* Test of isnanf substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-isnanl-nolibm.c b/tests/test-isnanl-nolibm.c
index 70c984d..c3c0ab0 100644
--- a/tests/test-isnanl-nolibm.c
+++ b/tests/test-isnanl-nolibm.c
@@ -1,4 +1,4 @@
-/* Test of isnanl() substitute.
+/* Test of isnanl substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-isnanl.c b/tests/test-isnanl.c
index 0a7f496..dd33284 100644
--- a/tests/test-isnanl.c
+++ b/tests/test-isnanl.c
@@ -1,4 +1,4 @@
-/* Test of isnanl() substitute.
+/* Test of isnanl substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h
index 657948c..eecf7a5 100644
--- a/tests/test-isnanl.h
+++ b/tests/test-isnanl.h
@@ -1,4 +1,4 @@
-/* Test of isnanl() substitute.
+/* Test of isnanl substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-lock.c b/tests/test-lock.c
index 2d10833..fe6e4aa 100644
--- a/tests/test-lock.c
+++ b/tests/test-lock.c
@@ -46,7 +46,7 @@
 #define DO_TEST_RECURSIVE_LOCK 1
 #define DO_TEST_ONCE 1
 
-/* Whether to help the scheduler through explicit yield().
+/* Whether to help the scheduler through explicit yield.
    Uncomment this to see if the operating system has a fair scheduler.  */
 #define EXPLICIT_YIELD 1
 
diff --git a/tests/test-lseek.c b/tests/test-lseek.c
index 01703bf..d602044 100644
--- a/tests/test-lseek.c
+++ b/tests/test-lseek.c
@@ -1,4 +1,4 @@
-/* Test of lseek() function.
+/* Test of lseek function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-mbscasecmp.c b/tests/test-mbscasecmp.c
index 9332fba..cd967cb 100644
--- a/tests/test-mbscasecmp.c
+++ b/tests/test-mbscasecmp.c
@@ -52,8 +52,8 @@ main ()
   ASSERT (mbscasecmp ("para", "paragraph") < 0);
   ASSERT (mbscasecmp ("paragraph", "para") > 0);
 
-  /* The following tests shows how mbscasecmp() is different from
-     strcasecmp().  */
+  /* The following tests shows how mbscasecmp is different from
+     strcasecmp.  */
 
   ASSERT (mbscasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R") == 0); /* 
özgür */
   ASSERT (mbscasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r") == 0); /* 
özgür */
diff --git a/tests/test-mbscasestr3.c b/tests/test-mbscasestr3.c
index a64b1f7..134217d 100644
--- a/tests/test-mbscasestr3.c
+++ b/tests/test-mbscasestr3.c
@@ -62,8 +62,8 @@ main ()
     ASSERT (result == input + 3);
   }
 
-  /* The following tests show how mbscasestr() is different from
-     strcasestr().  */
+  /* The following tests show how mbscasestr is different from
+     strcasestr.  */
 
   {
     const char input[] = "\313\320\320\320"; /* "诵行" */
diff --git a/tests/test-mbscasestr4.c b/tests/test-mbscasestr4.c
index 781dec7..a14c3c3 100644
--- a/tests/test-mbscasestr4.c
+++ b/tests/test-mbscasestr4.c
@@ -47,8 +47,8 @@ main ()
     ASSERT (mbscasestr (input, "Needle") == input + 5);
   }
 
-  /* The following tests show how mbscasestr() is different from
-     strcasestr().  */
+  /* The following tests show how mbscasestr is different from
+     strcasestr.  */
 
   {
     const char input[] = "s\303\266zc\303\274k"; /* sözcük */
diff --git a/tests/test-mbschr.c b/tests/test-mbschr.c
index dd2e70b..6a70e47 100644
--- a/tests/test-mbschr.c
+++ b/tests/test-mbschr.c
@@ -62,7 +62,7 @@ main ()
     ASSERT (result == input + 3);
   }
 
-  /* This test shows how mbschr() is different from strchr().  */
+  /* This test shows how mbschr is different from strchr().  */
   {
     const char input[] = "\203\062\332\066123\324\313\320\320\241\243"; /* 
"씋123运行。" */
     const char *result = mbschr (input, '2');
diff --git a/tests/test-mbscspn.c b/tests/test-mbscspn.c
index f42555b..1bf52be 100644
--- a/tests/test-mbscspn.c
+++ b/tests/test-mbscspn.c
@@ -50,7 +50,7 @@ main ()
     ASSERT (mbscspn (input, "iI") == 15);
   }
 
-  /* The following tests shows how mbscspn() is different from strcspn().  */
+  /* The following tests shows how mbscspn is different from strcspn.  */
 
   {
     const char input[] = "B\303\266se B\303\274bchen"; /* "Böse Bübchen" */
diff --git a/tests/test-mbsncasecmp.c b/tests/test-mbsncasecmp.c
index e902262..ce973c6 100644
--- a/tests/test-mbsncasecmp.c
+++ b/tests/test-mbsncasecmp.c
@@ -66,8 +66,8 @@ main ()
   ASSERT (mbsncasecmp ("paragraph", "para", 5) > 0);
   ASSERT (mbsncasecmp ("paragraph", "para", 4) == 0);
 
-  /* The following tests shows how mbsncasecmp() is different from
-     strncasecmp().  */
+  /* The following tests shows how mbsncasecmp is different from
+     strncasecmp.  */
 
   ASSERT (mbsncasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R", 99) == 
0); /* özgür */
   ASSERT (mbsncasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r", 99) == 
0); /* özgür */
diff --git a/tests/test-mbspbrk.c b/tests/test-mbspbrk.c
index 14a8b82..8938734 100644
--- a/tests/test-mbspbrk.c
+++ b/tests/test-mbspbrk.c
@@ -50,7 +50,7 @@ main ()
     ASSERT (mbspbrk (input, "iI") == NULL);
   }
 
-  /* The following tests shows how mbspbrk() is different from strpbrk().  */
+  /* The following tests shows how mbspbrk is different from strpbrk.  */
 
   {
     const char input[] = "B\303\266se B\303\274bchen"; /* "Böse Bübchen" */
diff --git a/tests/test-mbspcasecmp.c b/tests/test-mbspcasecmp.c
index 4c8f1fa..370c629 100644
--- a/tests/test-mbspcasecmp.c
+++ b/tests/test-mbspcasecmp.c
@@ -72,8 +72,8 @@ main ()
     ASSERT (mbspcasecmp (string, "para") == string + 4);
   }
 
-  /* The following tests shows how mbspcasecmp() is different from
-     strncasecmp().  */
+  /* The following tests shows how mbspcasecmp is different from
+     strncasecmp.  */
 
   {
     const char string[] = "\303\266zg\303\274rt\303\274k"; /* özgürtük */
diff --git a/tests/test-mbsrchr.c b/tests/test-mbsrchr.c
index 0b85f3d..da9ce15 100644
--- a/tests/test-mbsrchr.c
+++ b/tests/test-mbsrchr.c
@@ -62,7 +62,7 @@ main ()
     ASSERT (result == input + 3);
   }
 
-  /* This test shows how mbschr() is different from strchr().  */
+  /* This test shows how mbschr is different from strchr().  */
   {
     const char input[] = 
"\203\062\332\066123\324\313\203\062\332\066\320\320\241\243"; /* "씋123运씋行。" */
     const char *result = mbsrchr (input, '2');
diff --git a/tests/test-mbsspn.c b/tests/test-mbsspn.c
index 18a98dc..36f02f2 100644
--- a/tests/test-mbsspn.c
+++ b/tests/test-mbsspn.c
@@ -48,7 +48,7 @@ main ()
   ASSERT (mbsspn ("  xy", "aei ou") == 2);
   ASSERT (mbsspn ("eau", "aeiou") == 3);
 
-  /* The following tests shows how mbsspn() is different from strspn().  */
+  /* The following tests shows how mbsspn is different from strspn.  */
 
   {
     const char input[] = "\303\266\303\274"; /* "öü" */
diff --git a/tests/test-mbsstr3.c b/tests/test-mbsstr3.c
index 6c3b535..3b387f0 100644
--- a/tests/test-mbsstr3.c
+++ b/tests/test-mbsstr3.c
@@ -62,7 +62,7 @@ main ()
     ASSERT (result == input + 3);
   }
 
-  /* The following tests show how mbsstr() is different from strstr().  */
+  /* The following tests show how mbsstr is different from strstr.  */
 
   {
     const char input[] = "\313\320\320\320"; /* "诵行" */
diff --git a/tests/test-printf-posix.c b/tests/test-printf-posix.c
index 1fbde21..90679ca 100644
--- a/tests/test-printf-posix.c
+++ b/tests/test-printf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible printf() function.
+/* Test of POSIX compatible printf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-printf-posix.h b/tests/test-printf-posix.h
index 37caf86..9bac3bc 100644
--- a/tests/test-printf-posix.h
+++ b/tests/test-printf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsprintf() and sprintf() functions.
+/* Test of POSIX compatible vsprintf and sprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-printf-posix2.c b/tests/test-printf-posix2.c
index b6e4fcc..ec10512 100644
--- a/tests/test-printf-posix2.c
+++ b/tests/test-printf-posix2.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible printf() function.
+/* Test of POSIX compatible printf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
   int ret;
 
   /* Some printf implementations allocate temporary space with malloc.  */
-  /* On BSD systems, malloc() is limited by RLIMIT_DATA.  */
+  /* On BSD systems, malloc is limited by RLIMIT_DATA.  */
 #ifdef RLIMIT_DATA
   if (getrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
   if (setrlimit (RLIMIT_DATA, &limit) < 0)
     return 77;
 #endif
-  /* On Linux systems, malloc() is limited by RLIMIT_AS.  */
+  /* On Linux systems, malloc is limited by RLIMIT_AS.  */
 #ifdef RLIMIT_AS
   if (getrlimit (RLIMIT_AS, &limit) < 0)
     return 77;
diff --git a/tests/test-signbit.c b/tests/test-signbit.c
index 9cc65e3..f0c2e5f 100644
--- a/tests/test-signbit.c
+++ b/tests/test-signbit.c
@@ -1,4 +1,4 @@
-/* Test of signbit() substitute.
+/* Test of signbit substitute.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-sleep.c b/tests/test-sleep.c
index 4fbd9cc..0f581a5 100644
--- a/tests/test-sleep.c
+++ b/tests/test-sleep.c
@@ -1,4 +1,4 @@
-/* Test of sleep() function.
+/* Test of sleep function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,4 +43,3 @@ main()
 
   return 0;
 }
-
diff --git a/tests/test-snprintf-posix.c b/tests/test-snprintf-posix.c
index 1d132dc..f81298e 100644
--- a/tests/test-snprintf-posix.c
+++ b/tests/test-snprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible snprintf() function.
+/* Test of POSIX compatible snprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-snprintf-posix.h b/tests/test-snprintf-posix.h
index 6698cd8..af6bb15 100644
--- a/tests/test-snprintf-posix.h
+++ b/tests/test-snprintf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsnprintf() and snprintf() functions.
+/* Test of POSIX compatible vsnprintf and snprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -81,7 +81,7 @@ strisnan (const char *string, size_t start_index, size_t 
end_index, int uppercas
     }
   return 0;
 }
-         
+
 static void
 test_function (int (*my_snprintf) (char *, size_t, const char *, ...))
 {
diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c
index eaac532..a8373a1 100644
--- a/tests/test-snprintf.c
+++ b/tests/test-snprintf.c
@@ -1,4 +1,4 @@
-/* Test of snprintf() function.
+/* Test of snprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-sprintf-posix.c b/tests/test-sprintf-posix.c
index 58319b9..4538f23 100644
--- a/tests/test-sprintf-posix.c
+++ b/tests/test-sprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible sprintf() function.
+/* Test of POSIX compatible sprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h
index 7f9ca5c..ff16a47 100644
--- a/tests/test-sprintf-posix.h
+++ b/tests/test-sprintf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsprintf() and sprintf() functions.
+/* Test of POSIX compatible vsprintf and sprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-stpncpy.c b/tests/test-stpncpy.c
index c890379..bae6fd4 100644
--- a/tests/test-stpncpy.c
+++ b/tests/test-stpncpy.c
@@ -1,4 +1,4 @@
-/* Test the system defined function stpncpy().
+/* Test the system defined function stpncpy.
    Copyright (C) 2003 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c
index ceaab79..ad275af 100644
--- a/tests/test-strcasestr.c
+++ b/tests/test-strcasestr.c
@@ -110,7 +110,7 @@ main ()
   }
 
   /* Check that the asymptotic worst-case complexity is not quadratic.  */
-#if !HAVE_STRCASESTR /* The system's strcasestr() function fails this test.  */
+#if !HAVE_STRCASESTR /* The system's strcasestr function fails this test.  */
   {
     size_t m = 1000000;
     char *haystack = (char *) malloc (2 * m + 2);
diff --git a/tests/test-strerror.c b/tests/test-strerror.c
index 036ce45..73f6042 100644
--- a/tests/test-strerror.c
+++ b/tests/test-strerror.c
@@ -1,4 +1,4 @@
-/* Test of strerror() function.
+/* Test of strerror function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/tests/test-striconv.c b/tests/test-striconv.c
index 5c97c4a..7621155 100644
--- a/tests/test-striconv.c
+++ b/tests/test-striconv.c
@@ -44,7 +44,7 @@ int
 main ()
 {
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      and UTF-8.  */
   iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
   iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
@@ -52,7 +52,7 @@ main ()
   ASSERT (cd_88591_to_utf8 != (iconv_t)(-1));
   ASSERT (cd_utf8_to_88591 != (iconv_t)(-1));
 
-  /* ------------------------- Test mem_cd_iconv() ------------------------- */
+  /* ------------------------- Test mem_cd_iconv ------------------------- */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
   {
@@ -106,7 +106,7 @@ main ()
       free (result);
   }
 
-  /* ------------------------- Test str_cd_iconv() ------------------------- */
+  /* ------------------------- Test str_cd_iconv ------------------------- */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
   {
@@ -147,7 +147,7 @@ main ()
   iconv_close (cd_88591_to_utf8);
   iconv_close (cd_utf8_to_88591);
 
-  /* -------------------------- Test str_iconv() -------------------------- */
+  /* -------------------------- Test str_iconv -------------------------- */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
   {
diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c
index 72e31b9..3148404 100644
--- a/tests/test-striconveh.c
+++ b/tests/test-striconveh.c
@@ -62,7 +62,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
   iconv_t cd_88591_to_88592 = iconv_open ("ISO-8859-2", "ISO-8859-1");
   iconv_t cd_88592_to_88591 = iconv_open ("ISO-8859-1", "ISO-8859-2");
@@ -76,7 +76,7 @@ main ()
   ASSERT (cd_88592_to_utf8 != (iconv_t)(-1));
   ASSERT (cd_utf8_to_88592 != (iconv_t)(-1));
 
-  /* ------------------------ Test mem_cd_iconveh() ------------------------ */
+  /* ------------------------ Test mem_cd_iconveh ------------------------ */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -335,7 +335,7 @@ main ()
        }
     }
 
-  /* ------------------------ Test str_cd_iconveh() ------------------------ */
+  /* ------------------------ Test str_cd_iconveh ------------------------ */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -471,7 +471,7 @@ main ()
   iconv_close (cd_88592_to_utf8);
   iconv_close (cd_utf8_to_88592);
 
-  /* ------------------------- Test mem_iconveh() ------------------------- */
+  /* ------------------------- Test mem_iconveh ------------------------- */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -724,7 +724,7 @@ main ()
        }
     }
 
-  /* ------------------------- Test str_iconveh() ------------------------- */
+  /* ------------------------- Test str_iconveh ------------------------- */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index 488eec0..284c023 100644
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -62,10 +62,10 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
-  /* ------------------------- Test mem_iconveha() ------------------------- */
+  /* ------------------------- Test mem_iconveha ------------------------- */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -318,7 +318,7 @@ main ()
        }
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__ || defined __sun)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -445,7 +445,7 @@ main ()
     }
 # endif
 
-  /* ------------------------- Test str_iconveha() ------------------------- */
+  /* ------------------------- Test str_iconveha ------------------------- */
 
   /* Test conversion from ISO-8859-2 to ISO-8859-1 with no errors.  */
   for (h = 0; h < SIZEOF (handlers); h++)
@@ -554,7 +554,7 @@ main ()
       free (result);
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__ || defined __sun)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/test-tls.c b/tests/test-tls.c
index 8910775..34cd13c 100644
--- a/tests/test-tls.c
+++ b/tests/test-tls.c
@@ -33,7 +33,7 @@
 # define TEST_WIN32_THREADS 1
 #endif
 
-/* Whether to help the scheduler through explicit yield().
+/* Whether to help the scheduler through explicit yield.
    Uncomment this to see if the operating system has a fair scheduler.  */
 #define EXPLICIT_YIELD 1
 
@@ -189,7 +189,7 @@ static inline void * gl_thread_self (void)
 static inline void
 perhaps_yield (void)
 {
-  /* Call yield () only with a certain probability, otherwise with GNU Pth
+  /* yield() only with a certain probability, otherwise with GNU Pth
      the sequence of thread activations is too predictable.  */
   if ((((unsigned int) rand () >> 3) % 4) == 0)
     yield ();
diff --git a/tests/test-tsearch.c b/tests/test-tsearch.c
index b6a22fa..39e9cf4 100644
--- a/tests/test-tsearch.c
+++ b/tests/test-tsearch.c
@@ -26,10 +26,10 @@
 
 #define SEED 0
 #if HAVE_TSEARCH
-/* The system's tsearch() is not expected to keep the tree balanced.  */
+/* The system's tsearch is not expected to keep the tree balanced.  */
 # define BALANCED 0
 #else
-/* The gnulib replacement tsearch() should keep the tree balanced.  */
+/* The gnulib replacement tsearch should keep the tree balanced.  */
 # define BALANCED 1
 #endif
 #define PASSES 100
diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c
index 8ee6301..5e7f95d 100644
--- a/tests/test-vasnprintf-posix.c
+++ b/tests/test-vasnprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vasnprintf() and asnprintf() functions.
+/* Test of POSIX compatible vasnprintf and asnprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -105,7 +105,7 @@ strisnan (const char *string, size_t start_index, size_t 
end_index, int uppercas
     }
   return 0;
 }
-         
+
 static void
 test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
 {
diff --git a/tests/test-vasnprintf-posix2.c b/tests/test-vasnprintf-posix2.c
index 167095a..8b03809 100644
--- a/tests/test-vasnprintf-posix2.c
+++ b/tests/test-vasnprintf-posix2.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vasnprintf() and asnprintf() functions.
+/* Test of POSIX compatible vasnprintf and asnprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c
index 72f1f95..3df60e6 100644
--- a/tests/test-vasnprintf.c
+++ b/tests/test-vasnprintf.c
@@ -1,4 +1,4 @@
-/* Test of vasnprintf() and asnprintf() functions.
+/* Test of vasnprintf and asnprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vasprintf-posix.c b/tests/test-vasprintf-posix.c
index 37a6db6..ffdbe27 100644
--- a/tests/test-vasprintf-posix.c
+++ b/tests/test-vasprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vasprintf() and asprintf() functions.
+/* Test of POSIX compatible vasprintf and asprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -105,7 +105,7 @@ strisnan (const char *string, size_t start_index, size_t 
end_index, int uppercas
     }
   return 0;
 }
-         
+
 static void
 test_function (int (*my_asprintf) (char **, const char *, ...))
 {
diff --git a/tests/test-vasprintf.c b/tests/test-vasprintf.c
index fc950a1..a872e03 100644
--- a/tests/test-vasprintf.c
+++ b/tests/test-vasprintf.c
@@ -1,4 +1,4 @@
-/* Test of vasprintf() and asprintf() functions.
+/* Test of vasprintf and asprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vfprintf-posix.c b/tests/test-vfprintf-posix.c
index 2af148d..ebaecd5 100644
--- a/tests/test-vfprintf-posix.c
+++ b/tests/test-vfprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vfprintf() function.
+/* Test of POSIX compatible vfprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vprintf-posix.c b/tests/test-vprintf-posix.c
index 78a2506..cc6af26 100644
--- a/tests/test-vprintf-posix.c
+++ b/tests/test-vprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vfprintf() function.
+/* Test of POSIX compatible vfprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vsnprintf-posix.c b/tests/test-vsnprintf-posix.c
index 110cf69..77ba279 100644
--- a/tests/test-vsnprintf-posix.c
+++ b/tests/test-vsnprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsnprintf() function.
+/* Test of POSIX compatible vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c
index e549f66..45c9c8c 100644
--- a/tests/test-vsnprintf.c
+++ b/tests/test-vsnprintf.c
@@ -1,4 +1,4 @@
-/* Test of vsnprintf() function.
+/* Test of vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-vsprintf-posix.c b/tests/test-vsprintf-posix.c
index 6c59c64..fbc1b0a 100644
--- a/tests/test-vsprintf-posix.c
+++ b/tests/test-vsprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vsprintf() function.
+/* Test of POSIX compatible vsprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c
index 0c3c004..1db6f01 100644
--- a/tests/test-wcwidth.c
+++ b/tests/test-wcwidth.c
@@ -1,4 +1,4 @@
-/* Test of wcwidth() function.
+/* Test of wcwidth function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-xfprintf-posix.c b/tests/test-xfprintf-posix.c
index ce69b0b..a6920bf 100644
--- a/tests/test-xfprintf-posix.c
+++ b/tests/test-xfprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of error-checking xfprintf() function with POSIX compatible formatting.
+/* Test of error-checking xfprintf function with POSIX compatible formatting.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-xprintf-posix.c b/tests/test-xprintf-posix.c
index a935e32..66b95b7 100644
--- a/tests/test-xprintf-posix.c
+++ b/tests/test-xprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of error-checking xprintf() function with POSIX compatible formatting.
+/* Test of error-checking xprintf function with POSIX compatible formatting.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index ab72a7a..bad2ebb 100644
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -1,4 +1,4 @@
-/* Test of xvasprintf() and xasprintf() functions.
+/* Test of xvasprintf and xasprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniconv/test-u16-conv-from-enc.c 
b/tests/uniconv/test-u16-conv-from-enc.c
index 11f43ee..0d06778 100644
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -59,7 +59,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-16 with no errors.  */
@@ -129,7 +129,7 @@ main ()
        }
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u16-conv-to-enc.c 
b/tests/uniconv/test-u16-conv-to-enc.c
index 135d033..d98f6fd 100644
--- a/tests/uniconv/test-u16-conv-to-enc.c
+++ b/tests/uniconv/test-u16-conv-to-enc.c
@@ -58,7 +58,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-16 to ISO-8859-1 with no errors.  */
diff --git a/tests/uniconv/test-u16-strconv-from-enc.c 
b/tests/uniconv/test-u16-strconv-from-enc.c
index 340f3ad..fe6e9a5 100644
--- a/tests/uniconv/test-u16-strconv-from-enc.c
+++ b/tests/uniconv/test-u16-strconv-from-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+   Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-16 with no errors.  */
@@ -81,7 +81,7 @@ main ()
       free (result);
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u16-strconv-to-enc.c 
b/tests/uniconv/test-u16-strconv-to-enc.c
index 5633347..131cd48 100644
--- a/tests/uniconv/test-u16-strconv-to-enc.c
+++ b/tests/uniconv/test-u16-strconv-to-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-16 to ISO-8859-1 with no errors.  */
diff --git a/tests/uniconv/test-u32-conv-from-enc.c 
b/tests/uniconv/test-u32-conv-from-enc.c
index 0502666..d649b75 100644
--- a/tests/uniconv/test-u32-conv-from-enc.c
+++ b/tests/uniconv/test-u32-conv-from-enc.c
@@ -59,7 +59,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-16 with no errors.  */
@@ -129,7 +129,7 @@ main ()
        }
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u32-conv-to-enc.c 
b/tests/uniconv/test-u32-conv-to-enc.c
index 73ec138..4e2d911 100644
--- a/tests/uniconv/test-u32-conv-to-enc.c
+++ b/tests/uniconv/test-u32-conv-to-enc.c
@@ -58,7 +58,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-32 to ISO-8859-1 with no errors.  */
diff --git a/tests/uniconv/test-u32-strconv-from-enc.c 
b/tests/uniconv/test-u32-strconv-from-enc.c
index a2f1ac7..3a0fe28 100644
--- a/tests/uniconv/test-u32-strconv-from-enc.c
+++ b/tests/uniconv/test-u32-strconv-from-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-16 with no errors.  */
@@ -81,7 +81,7 @@ main ()
       free (result);
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u32-strconv-to-enc.c 
b/tests/uniconv/test-u32-strconv-to-enc.c
index a623081..c6c42b0 100644
--- a/tests/uniconv/test-u32-strconv-to-enc.c
+++ b/tests/uniconv/test-u32-strconv-to-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-32 to ISO-8859-1 with no errors.  */
diff --git a/tests/uniconv/test-u8-conv-from-enc.c 
b/tests/uniconv/test-u8-conv-from-enc.c
index 45acd8a..5115d9d 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -59,7 +59,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
@@ -124,7 +124,7 @@ main ()
        }
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u8-conv-to-enc.c 
b/tests/uniconv/test-u8-conv-to-enc.c
index b4157b2..deb34d5 100644
--- a/tests/uniconv/test-u8-conv-to-enc.c
+++ b/tests/uniconv/test-u8-conv-to-enc.c
@@ -60,7 +60,7 @@ main ()
   size_t i;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-8 to ISO-8859-1 with no errors.  */
diff --git a/tests/uniconv/test-u8-strconv-from-enc.c 
b/tests/uniconv/test-u8-strconv-from-enc.c
index 74c3869..2b55f9b 100644
--- a/tests/uniconv/test-u8-strconv-from-enc.c
+++ b/tests/uniconv/test-u8-strconv-from-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
@@ -72,7 +72,7 @@ main ()
       free (result);
     }
 
-  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+  /* autodetect_jp is only supported when iconv support ISO-2022-JP-2.  */
 # if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined 
__hpux || defined __osf__)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
diff --git a/tests/uniconv/test-u8-strconv-to-enc.c 
b/tests/uniconv/test-u8-strconv-to-enc.c
index cb13aaf..d283d86 100644
--- a/tests/uniconv/test-u8-strconv-to-enc.c
+++ b/tests/uniconv/test-u8-strconv-to-enc.c
@@ -45,7 +45,7 @@ main ()
   size_t h;
 
 #if HAVE_ICONV
-  /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
+  /* Assume that iconv supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from UTF-8 to ISO-8859-1 with no errors.  */
diff --git a/tests/unistdio/test-u16-asnprintf1.c 
b/tests/unistdio/test-u16-asnprintf1.c
index 112b005..6af5d67 100644
--- a/tests/unistdio/test-u16-asnprintf1.c
+++ b/tests/unistdio/test-u16-asnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u16_asnprintf() function.
+/* Test of u16_asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-asnprintf1.h 
b/tests/unistdio/test-u16-asnprintf1.h
index 34d4f82..cdb620f 100644
--- a/tests/unistdio/test-u16-asnprintf1.h
+++ b/tests/unistdio/test-u16-asnprintf1.h
@@ -1,4 +1,4 @@
-/* Test of u16_[v]asnprintf() function.
+/* Test of u16_[v]asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-printf1.h 
b/tests/unistdio/test-u16-printf1.h
index 199ece9..624beb9 100644
--- a/tests/unistdio/test-u16-printf1.h
+++ b/tests/unistdio/test-u16-printf1.h
@@ -1,4 +1,4 @@
-/* Test of u16_v[a]s[n]printf() function.
+/* Test of u16_v[a]s[n]printf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vasnprintf1.c 
b/tests/unistdio/test-u16-vasnprintf1.c
index d73fa4d..3ee77ae 100644
--- a/tests/unistdio/test-u16-vasnprintf1.c
+++ b/tests/unistdio/test-u16-vasnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u16_vasnprintf() function.
+/* Test of u16_vasnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vasnprintf2.c 
b/tests/unistdio/test-u16-vasnprintf2.c
index 58cee35..e1ec49f 100644
--- a/tests/unistdio/test-u16-vasnprintf2.c
+++ b/tests/unistdio/test-u16-vasnprintf2.c
@@ -1,4 +1,4 @@
-/* Test of u16_vasnprintf() function in an ISO-8859-1 locale.
+/* Test of u16_vasnprintf function in an ISO-8859-1 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vasnprintf3.c 
b/tests/unistdio/test-u16-vasnprintf3.c
index c832c31..cf760d0 100644
--- a/tests/unistdio/test-u16-vasnprintf3.c
+++ b/tests/unistdio/test-u16-vasnprintf3.c
@@ -1,4 +1,4 @@
-/* Test of u16_vasnprintf() function in an UTF-8 locale.
+/* Test of u16_vasnprintf function in an UTF-8 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vasprintf1.c 
b/tests/unistdio/test-u16-vasprintf1.c
index 064719f..172a2d2 100644
--- a/tests/unistdio/test-u16-vasprintf1.c
+++ b/tests/unistdio/test-u16-vasprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u16_vasprintf() function.
+/* Test of u16_vasprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vsnprintf1.c 
b/tests/unistdio/test-u16-vsnprintf1.c
index 1dcfaab..d62d135 100644
--- a/tests/unistdio/test-u16-vsnprintf1.c
+++ b/tests/unistdio/test-u16-vsnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u16_vsnprintf() function.
+/* Test of u16_vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u16-vsprintf1.c 
b/tests/unistdio/test-u16-vsprintf1.c
index 7e305dd..99ecb35 100644
--- a/tests/unistdio/test-u16-vsprintf1.c
+++ b/tests/unistdio/test-u16-vsprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u16_vsprintf() function.
+/* Test of u16_vsprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-asnprintf1.c 
b/tests/unistdio/test-u32-asnprintf1.c
index 352485f..7c1f0d7 100644
--- a/tests/unistdio/test-u32-asnprintf1.c
+++ b/tests/unistdio/test-u32-asnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u32_asnprintf() function.
+/* Test of u32_asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-asnprintf1.h 
b/tests/unistdio/test-u32-asnprintf1.h
index dfaed98..cec4416 100644
--- a/tests/unistdio/test-u32-asnprintf1.h
+++ b/tests/unistdio/test-u32-asnprintf1.h
@@ -1,4 +1,4 @@
-/* Test of u32_[v]asnprintf() function.
+/* Test of u32_[v]asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-printf1.h 
b/tests/unistdio/test-u32-printf1.h
index 240232f..34d91e6 100644
--- a/tests/unistdio/test-u32-printf1.h
+++ b/tests/unistdio/test-u32-printf1.h
@@ -1,4 +1,4 @@
-/* Test of u32_v[a]s[n]printf() function.
+/* Test of u32_v[a]s[n]printf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vasnprintf1.c 
b/tests/unistdio/test-u32-vasnprintf1.c
index 7b8e6f6..d25984e 100644
--- a/tests/unistdio/test-u32-vasnprintf1.c
+++ b/tests/unistdio/test-u32-vasnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u32_vasnprintf() function.
+/* Test of u32_vasnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vasnprintf2.c 
b/tests/unistdio/test-u32-vasnprintf2.c
index 1e95222..8f15943 100644
--- a/tests/unistdio/test-u32-vasnprintf2.c
+++ b/tests/unistdio/test-u32-vasnprintf2.c
@@ -1,4 +1,4 @@
-/* Test of u32_vasnprintf() function in an ISO-8859-1 locale.
+/* Test of u32_vasnprintf function in an ISO-8859-1 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vasnprintf3.c 
b/tests/unistdio/test-u32-vasnprintf3.c
index 8f55a45..6d8397c 100644
--- a/tests/unistdio/test-u32-vasnprintf3.c
+++ b/tests/unistdio/test-u32-vasnprintf3.c
@@ -1,4 +1,4 @@
-/* Test of u32_vasnprintf() function in an UTF-8 locale.
+/* Test of u32_vasnprintf function in an UTF-8 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vasprintf1.c 
b/tests/unistdio/test-u32-vasprintf1.c
index 25430a3..0700238 100644
--- a/tests/unistdio/test-u32-vasprintf1.c
+++ b/tests/unistdio/test-u32-vasprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u32_vasprintf() function.
+/* Test of u32_vasprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vsnprintf1.c 
b/tests/unistdio/test-u32-vsnprintf1.c
index 2d1d171..22059cd 100644
--- a/tests/unistdio/test-u32-vsnprintf1.c
+++ b/tests/unistdio/test-u32-vsnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u32_vsnprintf() function.
+/* Test of u32_vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u32-vsprintf1.c 
b/tests/unistdio/test-u32-vsprintf1.c
index bde63bd..7b05a30 100644
--- a/tests/unistdio/test-u32-vsprintf1.c
+++ b/tests/unistdio/test-u32-vsprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u32_vsprintf() function.
+/* Test of u32_vsprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-asnprintf1.c 
b/tests/unistdio/test-u8-asnprintf1.c
index 5b9eed1..79d30ee 100644
--- a/tests/unistdio/test-u8-asnprintf1.c
+++ b/tests/unistdio/test-u8-asnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u8_asnprintf() function.
+/* Test of u8_asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-asnprintf1.h 
b/tests/unistdio/test-u8-asnprintf1.h
index 063f145..9b24c6e 100644
--- a/tests/unistdio/test-u8-asnprintf1.h
+++ b/tests/unistdio/test-u8-asnprintf1.h
@@ -1,4 +1,4 @@
-/* Test of u8_[v]asnprintf() function.
+/* Test of u8_[v]asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-printf1.h b/tests/unistdio/test-u8-printf1.h
index 4ac6573..3038aec 100644
--- a/tests/unistdio/test-u8-printf1.h
+++ b/tests/unistdio/test-u8-printf1.h
@@ -1,4 +1,4 @@
-/* Test of u8_v[a]s[n]printf() function.
+/* Test of u8_v[a]s[n]printf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vasnprintf1.c 
b/tests/unistdio/test-u8-vasnprintf1.c
index db9af14..566f815 100644
--- a/tests/unistdio/test-u8-vasnprintf1.c
+++ b/tests/unistdio/test-u8-vasnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u8_vasnprintf() function.
+/* Test of u8_vasnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vasnprintf2.c 
b/tests/unistdio/test-u8-vasnprintf2.c
index f7f8f8a..6f0b990 100644
--- a/tests/unistdio/test-u8-vasnprintf2.c
+++ b/tests/unistdio/test-u8-vasnprintf2.c
@@ -1,4 +1,4 @@
-/* Test of u8_vasnprintf() function in an ISO-8859-1 locale.
+/* Test of u8_vasnprintf function in an ISO-8859-1 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vasnprintf3.c 
b/tests/unistdio/test-u8-vasnprintf3.c
index 417650d..0869127 100644
--- a/tests/unistdio/test-u8-vasnprintf3.c
+++ b/tests/unistdio/test-u8-vasnprintf3.c
@@ -1,4 +1,4 @@
-/* Test of u8_vasnprintf() function in an UTF-8 locale.
+/* Test of u8_vasnprintf function in an UTF-8 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vasprintf1.c 
b/tests/unistdio/test-u8-vasprintf1.c
index b78f47c..843efb3 100644
--- a/tests/unistdio/test-u8-vasprintf1.c
+++ b/tests/unistdio/test-u8-vasprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u8_vasprintf() function.
+/* Test of u8_vasprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vsnprintf1.c 
b/tests/unistdio/test-u8-vsnprintf1.c
index 2ee51a7..a908b5b 100644
--- a/tests/unistdio/test-u8-vsnprintf1.c
+++ b/tests/unistdio/test-u8-vsnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u8_vsnprintf() function.
+/* Test of u8_vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-u8-vsprintf1.c 
b/tests/unistdio/test-u8-vsprintf1.c
index 81c7fb5..3fb2c9f 100644
--- a/tests/unistdio/test-u8-vsprintf1.c
+++ b/tests/unistdio/test-u8-vsprintf1.c
@@ -1,4 +1,4 @@
-/* Test of u8_vsprintf() function.
+/* Test of u8_vsprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-asnprintf1.c 
b/tests/unistdio/test-ulc-asnprintf1.c
index 7926171..e0f39e6 100644
--- a/tests/unistdio/test-ulc-asnprintf1.c
+++ b/tests/unistdio/test-ulc-asnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of ulc_asnprintf() function.
+/* Test of ulc_asnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-asnprintf1.h 
b/tests/unistdio/test-ulc-asnprintf1.h
index 285a406..3bc3c66 100644
--- a/tests/unistdio/test-ulc-asnprintf1.h
+++ b/tests/unistdio/test-ulc-asnprintf1.h
@@ -1,4 +1,4 @@
-/* Test of ulc_[v]asnprintf() functions.
+/* Test of ulc_[v]asnprintf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-printf1.h 
b/tests/unistdio/test-ulc-printf1.h
index 77516d6..c22b555 100644
--- a/tests/unistdio/test-ulc-printf1.h
+++ b/tests/unistdio/test-ulc-printf1.h
@@ -1,4 +1,4 @@
-/* Test of ulc_v[a]s[n]printf() functions.
+/* Test of ulc_v[a]s[n]printf functions.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vasnprintf1.c 
b/tests/unistdio/test-ulc-vasnprintf1.c
index 014d979..d4e1a5d 100644
--- a/tests/unistdio/test-ulc-vasnprintf1.c
+++ b/tests/unistdio/test-ulc-vasnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vasnprintf() function.
+/* Test of ulc_vasnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vasnprintf2.c 
b/tests/unistdio/test-ulc-vasnprintf2.c
index 8c9684d..8db2439 100644
--- a/tests/unistdio/test-ulc-vasnprintf2.c
+++ b/tests/unistdio/test-ulc-vasnprintf2.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vasnprintf() function in an ISO-8859-1 locale.
+/* Test of ulc_vasnprintf function in an ISO-8859-1 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vasnprintf3.c 
b/tests/unistdio/test-ulc-vasnprintf3.c
index 3eb69d0..cacccb9 100644
--- a/tests/unistdio/test-ulc-vasnprintf3.c
+++ b/tests/unistdio/test-ulc-vasnprintf3.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vasnprintf() function in an UTF-8 locale.
+/* Test of ulc_vasnprintf function in an UTF-8 locale.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vasprintf1.c 
b/tests/unistdio/test-ulc-vasprintf1.c
index 27a1f46..a1e18c2 100644
--- a/tests/unistdio/test-ulc-vasprintf1.c
+++ b/tests/unistdio/test-ulc-vasprintf1.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vasprintf() function.
+/* Test of ulc_vasprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vsnprintf1.c 
b/tests/unistdio/test-ulc-vsnprintf1.c
index c243ff4..a50f8a7 100644
--- a/tests/unistdio/test-ulc-vsnprintf1.c
+++ b/tests/unistdio/test-ulc-vsnprintf1.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vsnprintf() function.
+/* Test of ulc_vsnprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/unistdio/test-ulc-vsprintf1.c 
b/tests/unistdio/test-ulc-vsprintf1.c
index 96b88ec..fdb5e73 100644
--- a/tests/unistdio/test-ulc-vsprintf1.c
+++ b/tests/unistdio/test-ulc-vsprintf1.c
@@ -1,4 +1,4 @@
-/* Test of ulc_vsprintf() function.
+/* Test of ulc_vsprintf function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u16-strwidth.c 
b/tests/uniwidth/test-u16-strwidth.c
index 79351f6..23a7356 100644
--- a/tests/uniwidth/test-u16-strwidth.c
+++ b/tests/uniwidth/test-u16-strwidth.c
@@ -1,4 +1,4 @@
-/* Test of u16_strwidth() function.
+/* Test of u16_strwidth function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c
index 51e4155..ca7e431 100644
--- a/tests/uniwidth/test-u16-width.c
+++ b/tests/uniwidth/test-u16-width.c
@@ -1,4 +1,4 @@
-/* Test of u16_width() function.
+/* Test of u16_width function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u32-strwidth.c 
b/tests/uniwidth/test-u32-strwidth.c
index f34debf..5072031 100644
--- a/tests/uniwidth/test-u32-strwidth.c
+++ b/tests/uniwidth/test-u32-strwidth.c
@@ -1,4 +1,4 @@
-/* Test of u32_strwidth() function.
+/* Test of u32_strwidth function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c
index c160312..df10f73 100644
--- a/tests/uniwidth/test-u32-width.c
+++ b/tests/uniwidth/test-u32-width.c
@@ -1,4 +1,4 @@
-/* Test of u32_width() function.
+/* Test of u32_width function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u8-strwidth.c 
b/tests/uniwidth/test-u8-strwidth.c
index 99f4800..a4dce00 100644
--- a/tests/uniwidth/test-u8-strwidth.c
+++ b/tests/uniwidth/test-u8-strwidth.c
@@ -1,4 +1,4 @@
-/* Test of u8_strwidth() function.
+/* Test of u8_strwidth function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c
index 28ef448..1fbdcf3 100644
--- a/tests/uniwidth/test-u8-width.c
+++ b/tests/uniwidth/test-u8-width.c
@@ -1,4 +1,4 @@
-/* Test of u8_width() function.
+/* Test of u8_width function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c
index 7e889d9..2b82f74 100644
--- a/tests/uniwidth/test-uc_width.c
+++ b/tests/uniwidth/test-uc_width.c
@@ -1,4 +1,4 @@
-/* Test of uc_width() function.
+/* Test of uc_width function.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify




reply via email to

[Prev in Thread] Current Thread [Next in Thread]