gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_

There are more contexts where __attribute__((__unused__)) is
useful than just parameter lists.  Also, naming the macro
_GL_UNUSED fits with the recent addition of _GL_ARG_NONNULL.
Preserve the name _UNUSED_PARAMETER_ for backwards-compatible
use in external projects.

* m4/gnulib-common.m4 (gl_COMMON): Create a more-appropriately
named alias for __attribute__((__unused__)).
* lib/chown.c: Update client.
* lib/fchmodat.c: Likewise.
* lib/fts.c: Likewise.
* lib/getdate.y: Likewise.
* lib/getgroups.c: Likewise.
* lib/getopt.c: Likewise.
* lib/getugroups.c: Likewise.
* lib/mkdir.c: Likewise.
* lib/mkfifo.c: Likewise.
* lib/mkfifoat.c: Likewise.
* lib/mknod.c: Likewise.
* lib/mknodat.c: Likewise.
* lib/readlink.c: Likewise.
* lib/se-context.in.h: Likewise.
* lib/se-selinux.in.h: Likewise.
* lib/sockets.c: Likewise.
* lib/symlink.c: Likewise.
* lib/symlinkat.c: Likewise.
* lib/unicodeio.c: Likewise.
* lib/unistr.h: Likewise.
* tests/test-areadlink.c: Likewise.
* tests/test-areadlinkat.c: Likewise.
* tests/test-filenamecat.c: Likewise.
* tests/test-fseeko.c: Likewise.
* tests/test-ftello.c: Likewise.
* tests/test-getdate.c: Likewise.
* tests/test-getgroups.c: Likewise.
* tests/test-gethostname.c: Likewise.
* tests/test-quotearg.c: Likewise.
* tests/test-version-etc.c: Likewise.
* tests/test-xalloc-die.c: Likewise.
* tests/test-xfprintf-posix.c: Likewise.
* tests/test-xprintf-posix.c: Likewise.
* tests/test-xvasprintf.c: Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 28f92b027ebaab01cd35e2ef45b92b91cdc9a69d..7e1dd76351e0685fbdbd72453d3d24b3d29538d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
 2009-12-23  Eric Blake  <ebb9@byu.net>
 
+       gnulib-common: prefer _GL_UNUSED over _UNUSED_PARAMETER_
+       * m4/gnulib-common.m4 (gl_COMMON): Create a more-appropriately
+       named alias for __attribute__((__unused__)).
+       * lib/chown.c: Update client.
+       * lib/fchmodat.c: Likewise.
+       * lib/fts.c: Likewise.
+       * lib/getdate.y: Likewise.
+       * lib/getgroups.c: Likewise.
+       * lib/getopt.c: Likewise.
+       * lib/getugroups.c: Likewise.
+       * lib/mkdir.c: Likewise.
+       * lib/mkfifo.c: Likewise.
+       * lib/mkfifoat.c: Likewise.
+       * lib/mknod.c: Likewise.
+       * lib/mknodat.c: Likewise.
+       * lib/readlink.c: Likewise.
+       * lib/se-context.in.h: Likewise.
+       * lib/se-selinux.in.h: Likewise.
+       * lib/sockets.c: Likewise.
+       * lib/symlink.c: Likewise.
+       * lib/symlinkat.c: Likewise.
+       * lib/unicodeio.c: Likewise.
+       * lib/unistr.h: Likewise.
+       * tests/test-areadlink.c: Likewise.
+       * tests/test-areadlinkat.c: Likewise.
+       * tests/test-filenamecat.c: Likewise.
+       * tests/test-fseeko.c: Likewise.
+       * tests/test-ftello.c: Likewise.
+       * tests/test-getdate.c: Likewise.
+       * tests/test-getgroups.c: Likewise.
+       * tests/test-gethostname.c: Likewise.
+       * tests/test-quotearg.c: Likewise.
+       * tests/test-version-etc.c: Likewise.
+       * tests/test-xalloc-die.c: Likewise.
+       * tests/test-xfprintf-posix.c: Likewise.
+       * tests/test-xprintf-posix.c: Likewise.
+       * tests/test-xvasprintf.c: Likewise.
+
        tests: avoid compiler warnings
        * tests/test-fcntl.c (main): Delete unused parameters.
        * tests/test-freopen-safer.c (main): Likewise.

diff --git a/lib/chown.c b/lib/chown.c
index 66bb0c8fe1a5a46de5795314c0106bceb28e34d9..a19cd34ce48fc6704f49279bd7990fdd8b48bfd7 100644 (file)
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -33,8 +33,8 @@
 
 /* Simple stub that always fails with ENOSYS, for mingw.  */
 int
-chown (const char *file _UNUSED_PARAMETER_, uid_t uid _UNUSED_PARAMETER_,
-       gid_t gid _UNUSED_PARAMETER_)
+chown (const char *file _GL_UNUSED, uid_t uid _GL_UNUSED,
+       gid_t gid _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/fchmodat.c b/lib/fchmodat.c
index 62a5d05663ecd06352b202f00997965e71090316..fa1ec473113728e77227e4a919beab0ef70c21f0 100644 (file)
--- a/lib/fchmodat.c
+++ b/lib/fchmodat.c
@@ -28,7 +28,7 @@
 # undef lchmod
 # define lchmod lchmod_rpl
 static int
-lchmod (char const *f _UNUSED_PARAMETER_, mode_t m _UNUSED_PARAMETER_)
+lchmod (char const *f _GL_UNUSED, mode_t m _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/fts.c b/lib/fts.c
index 9329ef6c6567f93726bcee34ac6df429426ee02f..8e6e728902a5c0904f656e1a9c63003f8a6a6959 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -712,9 +712,9 @@ leaf_optimization_applies (int dir_fd)
 
 #else
 static bool
-dirent_inode_sort_may_be_useful (int dir_fd _UNUSED_PARAMETER_) { return true; }
+dirent_inode_sort_may_be_useful (int dir_fd _GL_UNUSED) { return true; }
 static bool
-leaf_optimization_applies (int dir_fd _UNUSED_PARAMETER_) { return false; }
+leaf_optimization_applies (int dir_fd _GL_UNUSED) { return false; }
 #endif
 
 #if GNULIB_FTS
@@ -1064,7 +1064,7 @@ check_for_dir:
  */
 /* ARGSUSED */
 int
-fts_set(FTS *sp _UNUSED_PARAMETER_, FTSENT *p, int instr)
+fts_set(FTS *sp _GL_UNUSED, FTSENT *p, int instr)
 {
         if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
             instr != FTS_NOINSTR && instr != FTS_SKIP) {

diff --git a/lib/getdate.y b/lib/getdate.y
index e61ffdfafcac417ef4a3544f3f684ed5ef027d04..57aee96fa2fab3034ab396cace6c226d78c7cd16 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -1145,8 +1145,8 @@ yylex (YYSTYPE *lvalp, parser_control *pc)
 
 /* Do nothing if the parser reports an error.  */
 static int
-yyerror (parser_control const *pc _UNUSED_PARAMETER_,
-         char const *s _UNUSED_PARAMETER_)
+yyerror (parser_control const *pc _GL_UNUSED,
+         char const *s _GL_UNUSED)
 {
   return 0;
 }

diff --git a/lib/getgroups.c b/lib/getgroups.c
index e2bb68eff290529db5e987abe80574b2912c870f..3e7eaad02dd595550eca226faf0dc893ef0bc46e 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -31,7 +31,7 @@
 /* Provide a stub that fails with ENOSYS, since there is no group
    information available on mingw.  */
 int
-getgroups (int n _UNUSED_PARAMETER_, GETGROUPS_T *groups _UNUSED_PARAMETER_)
+getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/getopt.c b/lib/getopt.c
index 5e9a4a50e4d12cb244a1b8a534f77f1891764c1f..f2a109f09e9f02bb1c1e2517f1d98e1937388425 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -226,8 +226,8 @@ exchange (char **argv, struct _getopt_data *d)
 /* Initialize the internal data when the first call is made.  */
 
 static const char *
-_getopt_initialize (int argc _UNUSED_PARAMETER_,
-                    char **argv _UNUSED_PARAMETER_, const char *optstring,
+_getopt_initialize (int argc _GL_UNUSED,
+                    char **argv _GL_UNUSED, const char *optstring,
                     struct _getopt_data *d, int posixly_correct)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0

diff --git a/lib/getugroups.c b/lib/getugroups.c
index b17563e89af8acd812c277a88f616485b3f6955e..50e1f4dca2aa4e698beb4e0f379d9838a84148e1 100644 (file)
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -33,10 +33,10 @@
    can do is fail with ENOSYS.  */
 
 int
-getugroups (int maxcount _UNUSED_PARAMETER_,
-            gid_t *grouplist _UNUSED_PARAMETER_,
-            char const *username _UNUSED_PARAMETER_,
-            gid_t gid _UNUSED_PARAMETER_)
+getugroups (int maxcount _GL_UNUSED,
+            gid_t *grouplist _GL_UNUSED,
+            char const *username _GL_UNUSED,
+            gid_t gid _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/mkdir.c b/lib/mkdir.c
index e6dbc78e0988fbe517cf4001eafb29e37af67420..34cab6c9a6b7aebb7e1b6fcaea9b57460f60a42b 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -40,7 +40,7 @@
    alias mkdir), only in the nonstandard io.h.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # define mkdir(name,mode) _mkdir (name)
-# define maybe_unused _UNUSED_PARAMETER_
+# define maybe_unused _GL_UNUSED
 #else
 # define maybe_unused /* empty */
 #endif

diff --git a/lib/mkfifo.c b/lib/mkfifo.c
index 3c29e8f6b6c545f02d852ce5fe71ecabd875f96b..5ea8c17d976af99934a24e8c8cc36fea5c256067 100644 (file)
--- a/lib/mkfifo.c
+++ b/lib/mkfifo.c
@@ -27,7 +27,7 @@
 /* Mingw lacks mkfifo; always fail with ENOSYS.  */
 
 int
-mkfifo (char const *name _UNUSED_PARAMETER_, mode_t mode _UNUSED_PARAMETER_)
+mkfifo (char const *name _GL_UNUSED, mode_t mode _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/mkfifoat.c b/lib/mkfifoat.c
index 89002f2bf5b0bab24c505f219c2ba64ffd5f9f1d..bef176680c9da434d93fa6e16173d0541e8a6a7e 100644 (file)
--- a/lib/mkfifoat.c
+++ b/lib/mkfifoat.c
@@ -27,8 +27,8 @@
 /* Mingw lacks mkfifo, so this wrapper is trivial.  */
 
 int
-mkfifoat (int fd _UNUSED_PARAMETER_, char const *path _UNUSED_PARAMETER_,
-          mode_t mode _UNUSED_PARAMETER_)
+mkfifoat (int fd _GL_UNUSED, char const *path _GL_UNUSED,
+          mode_t mode _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/mknod.c b/lib/mknod.c
index 662f5f88e1d71e18041691354d63c41e6a5fad0f..0918be79153c03b27e8a489f0403093c2916f873 100644 (file)
--- a/lib/mknod.c
+++ b/lib/mknod.c
@@ -27,8 +27,8 @@
 /* Mingw lacks mknod; always fail with ENOSYS.  */
 
 int
-mknod (char const *name _UNUSED_PARAMETER_, mode_t mode _UNUSED_PARAMETER_,
-       dev_t dev _UNUSED_PARAMETER_)
+mknod (char const *name _GL_UNUSED, mode_t mode _GL_UNUSED,
+       dev_t dev _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/mknodat.c b/lib/mknodat.c
index b5126bf8b7e2dde12221a50063303c5189f8f3fc..a2eae72ddad53223526b1a6543502838422a4256 100644 (file)
--- a/lib/mknodat.c
+++ b/lib/mknodat.c
@@ -27,8 +27,8 @@
 /* Mingw lacks mknod, so this wrapper is trivial.  */
 
 int
-mknodat (int fd _UNUSED_PARAMETER_, char const *path _UNUSED_PARAMETER_,
-         mode_t mode _UNUSED_PARAMETER_, dev_t dev _UNUSED_PARAMETER_)
+mknodat (int fd _GL_UNUSED, char const *path _GL_UNUSED,
+         mode_t mode _GL_UNUSED, dev_t dev _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/readlink.c b/lib/readlink.c
index 0c6f09a1bd2524f3c0d4d85cfde6521cfe9dedab..41c81f91c71b33ba0dfc9ce587159330b8a506f2 100644 (file)
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -29,8 +29,8 @@
    such as DJGPP 2.03 and mingw32.  */
 
 ssize_t
-readlink (const char *name, char *buf _UNUSED_PARAMETER_,
-          size_t bufsize _UNUSED_PARAMETER_)
+readlink (const char *name, char *buf _GL_UNUSED,
+          size_t bufsize _GL_UNUSED)
 {
   struct stat statbuf;
 

diff --git a/lib/se-context.in.h b/lib/se-context.in.h
index 2c36cc20a0516af1eeb5c025abeb6be4dc0b37cc..d69e809777bf32014117564feb540eef03360399 100644 (file)
--- a/lib/se-context.in.h
+++ b/lib/se-context.in.h
@@ -4,23 +4,23 @@
 # include <errno.h>
 
 typedef int context_t;
-static inline context_t context_new (char const *s _UNUSED_PARAMETER_)
+static inline context_t context_new (char const *s _GL_UNUSED)
   { errno = ENOTSUP; return 0; }
-static inline char *context_str (context_t con _UNUSED_PARAMETER_)
+static inline char *context_str (context_t con _GL_UNUSED)
   { errno = ENOTSUP; return (void *) 0; }
-static inline void context_free (context_t c _UNUSED_PARAMETER_) {}
+static inline void context_free (context_t c _GL_UNUSED) {}
 
-static inline int context_user_set (context_t sc _UNUSED_PARAMETER_,
-                                    char const *s _UNUSED_PARAMETER_)
+static inline int context_user_set (context_t sc _GL_UNUSED,
+                                    char const *s _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int context_role_set (context_t sc _UNUSED_PARAMETER_,
-                                    char const *s _UNUSED_PARAMETER_)
+static inline int context_role_set (context_t sc _GL_UNUSED,
+                                    char const *s _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int context_range_set (context_t sc _UNUSED_PARAMETER_,
-                                     char const *s _UNUSED_PARAMETER_)
+static inline int context_range_set (context_t sc _GL_UNUSED,
+                                     char const *s _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int context_type_set (context_t sc _UNUSED_PARAMETER_,
-                                    char const *s _UNUSED_PARAMETER_)
+static inline int context_type_set (context_t sc _GL_UNUSED,
+                                    char const *s _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 
 #endif

diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h
index 3d243aef66ad1e6d545016f4b6b3c4ff95f9f82c..228054d9abdba5a6b457c9389ce9b8c84480ef8e 100644 (file)
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -18,55 +18,55 @@ typedef unsigned short security_class_t;
 #  define security_context_t char*
 #  define is_selinux_enabled() 0
 
-static inline int getcon (security_context_t *con _UNUSED_PARAMETER_)
+static inline int getcon (security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline void freecon (security_context_t con _UNUSED_PARAMETER_) {}
+static inline void freecon (security_context_t con _GL_UNUSED) {}
 
 
-static inline int getfscreatecon (security_context_t *con _UNUSED_PARAMETER_)
+static inline int getfscreatecon (security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int setfscreatecon (security_context_t con _UNUSED_PARAMETER_)
+static inline int setfscreatecon (security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int matchpathcon (char const *file _UNUSED_PARAMETER_,
-                                mode_t m _UNUSED_PARAMETER_,
-                                security_context_t *con _UNUSED_PARAMETER_)
+static inline int matchpathcon (char const *file _GL_UNUSED,
+                                mode_t m _GL_UNUSED,
+                                security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int getfilecon (char const *file _UNUSED_PARAMETER_,
-                              security_context_t *con _UNUSED_PARAMETER_)
+static inline int getfilecon (char const *file _GL_UNUSED,
+                              security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int lgetfilecon (char const *file _UNUSED_PARAMETER_,
-                               security_context_t *con _UNUSED_PARAMETER_)
+static inline int lgetfilecon (char const *file _GL_UNUSED,
+                               security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 static inline int fgetfilecon (int fd,
-                               security_context_t *con _UNUSED_PARAMETER_)
+                               security_context_t *con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int setfilecon (char const *file _UNUSED_PARAMETER_,
-                              security_context_t con _UNUSED_PARAMETER_)
+static inline int setfilecon (char const *file _GL_UNUSED,
+                              security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int lsetfilecon (char const *file _UNUSED_PARAMETER_,
-                               security_context_t con _UNUSED_PARAMETER_)
+static inline int lsetfilecon (char const *file _GL_UNUSED,
+                               security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int fsetfilecon (int fd _UNUSED_PARAMETER_,
-                               security_context_t con _UNUSED_PARAMETER_)
+static inline int fsetfilecon (int fd _GL_UNUSED,
+                               security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 
 static inline int security_check_context
-    (security_context_t con _UNUSED_PARAMETER_)
+    (security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 static inline int security_check_context_raw
-    (security_context_t con _UNUSED_PARAMETER_)
+    (security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
-static inline int setexeccon (security_context_t con _UNUSED_PARAMETER_)
+static inline int setexeccon (security_context_t con _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 static inline int security_compute_create
-    (security_context_t scon _UNUSED_PARAMETER_,
-     security_context_t tcon _UNUSED_PARAMETER_,
-     security_class_t tclass _UNUSED_PARAMETER_,
-     security_context_t *newcon _UNUSED_PARAMETER_)
+    (security_context_t scon _GL_UNUSED,
+     security_context_t tcon _GL_UNUSED,
+     security_class_t tclass _GL_UNUSED,
+     security_context_t *newcon _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 static inline int matchpathcon_init_prefix
-    (char const *path _UNUSED_PARAMETER_,
-     char const *prefix _UNUSED_PARAMETER_)
+    (char const *path _GL_UNUSED,
+     char const *prefix _GL_UNUSED)
   { errno = ENOTSUP; return -1; }
 
 # endif

diff --git a/lib/sockets.c b/lib/sockets.c
index b49e5806208643d4064a2b50bb1f195f1421c712..3be3279d75b60eacfa6909213ec869b3a1c78b67 100644 (file)
--- a/lib/sockets.c
+++ b/lib/sockets.c
@@ -74,7 +74,7 @@ static int initialized_sockets_version /* = 0 */;
 #endif /* WINDOWS_SOCKETS */
 
 int
-gl_sockets_startup (int version _UNUSED_PARAMETER_)
+gl_sockets_startup (int version _GL_UNUSED)
 {
 #if WINDOWS_SOCKETS
   if (version > initialized_sockets_version)

diff --git a/lib/symlink.c b/lib/symlink.c
index 1e6cbedc312dbf463241f63c86ae576fb46a5876..d005dbd7666cd41b10e8ce25c9e71ca7da4becc5 100644 (file)
--- a/lib/symlink.c
+++ b/lib/symlink.c
@@ -47,8 +47,8 @@ rpl_symlink (char const *contents, char const *name)
 
 /* The system does not support symlinks.  */
 int
-symlink (char const *contents _UNUSED_PARAMETER_,
-         char const *name _UNUSED_PARAMETER_)
+symlink (char const *contents _GL_UNUSED,
+         char const *name _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/symlinkat.c b/lib/symlinkat.c
index cb525104897f2600ee207459c98c5d337c9f2bb1..721d1c5aa65f6850378e45661284422cc15a4b7f 100644 (file)
--- a/lib/symlinkat.c
+++ b/lib/symlinkat.c
@@ -27,8 +27,8 @@
 # include <errno.h>
 
 int
-symlinkat (char const *path1 _UNUSED_PARAMETER_, int fd _UNUSED_PARAMETER_,
-           char const *path2 _UNUSED_PARAMETER_)
+symlinkat (char const *path1 _GL_UNUSED, int fd _GL_UNUSED,
+           char const *path2 _GL_UNUSED)
 {
   errno = ENOSYS;
   return -1;

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 79cfbacaad7842c80ad00bb03d09ba3ed22888dc..177e75c5722450af30d5f7b58ba1bda932015b7a 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -174,7 +174,7 @@ fwrite_success_callback (const char *buf, size_t buflen, void *callback_arg)
 /* Simple failure callback that displays an error and exits.  */
 static long
 exit_failure_callback (unsigned int code, const char *msg,
-                       void *callback_arg _UNUSED_PARAMETER_)
+                       void *callback_arg _GL_UNUSED)
 {
   if (msg == NULL)
     error (1, 0, _("cannot convert U+%04X to local character set"), code);
@@ -188,7 +188,7 @@ exit_failure_callback (unsigned int code, const char *msg,
    ASCII, using the same notation as ISO C99 strings.  */
 static long
 fallback_failure_callback (unsigned int code,
-                           const char *msg _UNUSED_PARAMETER_,
+                           const char *msg _GL_UNUSED,
                            void *callback_arg)
 {
   FILE *stream = (FILE *) callback_arg;

diff --git a/lib/unistr.h b/lib/unistr.h
index 35cd2dab456dde5e5aa40badd90fe1e0ead821cf..96c5357f7b1131957f1c7b7de7e60ceea4212849 100644 (file)
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -183,7 +183,7 @@ extern int
        u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
 # else
 static inline int
-u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n _UNUSED_PARAMETER_)
+u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n _GL_UNUSED)
 {
   uint32_t c = *s;
 
@@ -253,7 +253,7 @@ extern int
        u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
 # else
 static inline int
-u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n _UNUSED_PARAMETER_)
+u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n _GL_UNUSED)
 {
   uint32_t c = *s;
 

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 75da53db07497f559d38863b16fac648a97ff01c..63c6300a2255e178088140a85d59867f90f5020d 100644 (file)
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -23,14 +23,17 @@ AC_DEFUN([gl_COMMON_BODY], [
 # define __GNUC_STDC_INLINE__ 1
 #endif])
   AH_VERBATIM([unused_parameter],
-[/* Define as a marker that can be attached to function parameter declarations
-   for parameters that are not used.  This helps to reduce warnings, such as
-   from GCC -Wunused-parameter.  */
+[/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
 #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
+# define _GL_UNUSED __attribute__ ((__unused__))
 #else
-# define _UNUSED_PARAMETER_
+# define _GL_UNUSED
 #endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
 ])
 ])
 

diff --git a/tests/test-areadlink.c b/tests/test-areadlink.c
index aa297cedc4dff5a90b4cfd563f887652ee918271..9a3692714acec34d9cb822367db709318251a0cc 100644 (file)
--- a/tests/test-areadlink.c
+++ b/tests/test-areadlink.c
@@ -47,7 +47,7 @@
 
 /* Wrapper for testing areadlink.  */
 static char *
-do_areadlink (char const *name, size_t ignored _UNUSED_PARAMETER_)
+do_areadlink (char const *name, size_t ignored _GL_UNUSED)
 {
   return areadlink (name);
 }

diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c
index e567b3718757cabb7a17492e8d5784ecdace4395..f5deb7073dbf99bd94f679882a8a1481433e38bd 100644 (file)
--- a/tests/test-areadlinkat.c
+++ b/tests/test-areadlinkat.c
@@ -49,7 +49,7 @@ static int dfd = AT_FDCWD;
 
 /* Wrapper for testing areadlinkat.  */
 static char *
-do_areadlinkat (char const *name, size_t ignored _UNUSED_PARAMETER_)
+do_areadlinkat (char const *name, size_t ignored _GL_UNUSED)
 {
   return areadlinkat (dfd, name);
 }

diff --git a/tests/test-filenamecat.c b/tests/test-filenamecat.c
index d10bf5fdb8db7299658728993de844871cb819d4..2d8fd69a201f0a459a1a25c81b231c60e51d95b3 100644 (file)
--- a/tests/test-filenamecat.c
+++ b/tests/test-filenamecat.c
@@ -29,7 +29,7 @@
 #include "progname.h"
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   static char const *const tests[][3] =
     {

diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c
index 037c7f5ecd8f966d424fab7f7271f59386f67fb1..bdf025f5bf947824cc4f50fe56edf2c04fde4cd1 100644 (file)
--- a/tests/test-fseeko.c
+++ b/tests/test-fseeko.c
@@ -45,7 +45,7 @@
 #endif
 
 int
-main (int argc, char **argv _UNUSED_PARAMETER_)
+main (int argc, char **argv _GL_UNUSED)
 {
   /* Assume stdin is non-empty, seekable, and starts with '#!/bin/sh'
      iff argc > 1.  */

diff --git a/tests/test-ftello.c b/tests/test-ftello.c
index ab5c456552ae9246f262216cc6b2a0cc4a17e0c4..dfe5be02fcaf2cf35018c2ce85dfc53ea60c0744 100644 (file)
--- a/tests/test-ftello.c
+++ b/tests/test-ftello.c
@@ -46,7 +46,7 @@
 #endif
 
 int
-main (int argc, char **argv _UNUSED_PARAMETER_)
+main (int argc, char **argv _GL_UNUSED)
 {
   int ch;
   /* Assume stdin is seekable iff argc > 1.  */

diff --git a/tests/test-getdate.c b/tests/test-getdate.c
index 40d80dfe03282a812e62823f6b726ef3f5539694..2971f97e4814f8c101143f8495f69abc183919bd 100644 (file)
--- a/tests/test-getdate.c
+++ b/tests/test-getdate.c
@@ -61,7 +61,7 @@ static const char* const day_table[] =
 };
 
 int
-main (int argc _UNUSED_PARAMETER_, char **argv)
+main (int argc _GL_UNUSED, char **argv)
 {
   struct timespec result;
   struct timespec result2;

diff --git a/tests/test-getgroups.c b/tests/test-getgroups.c
index aed80f181353a2faa4bf0037a4755006ae2372b3..6d4a5140fddb8ccec89db63b83fdf2f4d7d37f49 100644 (file)
--- a/tests/test-getgroups.c
+++ b/tests/test-getgroups.c
@@ -38,7 +38,7 @@
   while (0)
 
 int
-main (int argc, char **argv _UNUSED_PARAMETER_)
+main (int argc, char **argv _GL_UNUSED)
 {
   int result;
   gid_t *groups;

diff --git a/tests/test-gethostname.c b/tests/test-gethostname.c
index 32723da193a863cfe67e6fc4284e710ed18054b6..af1293b886c7fa6afa7d87d3b2ee79675fedfeff 100644 (file)
--- a/tests/test-gethostname.c
+++ b/tests/test-gethostname.c
@@ -29,7 +29,7 @@
 #define NOHOSTNAME "magic-gnulib-test-string"
 
 int
-main (int argc, char *argv[] _UNUSED_PARAMETER_)
+main (int argc, char *argv[] _GL_UNUSED)
 {
   char buf[HOST_NAME_MAX];
   int rc;

diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c
index c9636a1ccff228e07012e54ebd177d4dfbb6aa7e..cb5a73b0974b96fce0cd332282e3374fd7e377c2 100644 (file)
--- a/tests/test-quotearg.c
+++ b/tests/test-quotearg.c
@@ -378,7 +378,7 @@ use_quotearg_colon (const char *str, size_t *len)
 }
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   int i;
   bool ascii_only = MB_CUR_MAX == 1 && !isprint ((unsigned char) LQ[0]);

diff --git a/tests/test-version-etc.c b/tests/test-version-etc.c
index 9ff97c45a8b12c22fdc61f277a18a4164faf1e52..26940ab9b43f6d6e41a95a9611f582616455c30e 100644 (file)
--- a/tests/test-version-etc.c
+++ b/tests/test-version-etc.c
@@ -24,7 +24,7 @@
 #define AUTHORS "Sergey Poznyakoff", "Eric Blake"
 
 int
-main (int argc _UNUSED_PARAMETER_, char **argv)
+main (int argc _GL_UNUSED, char **argv)
 {
   set_program_name (argv[0]);
   version_etc (stdout, "test-version-etc", "dummy", "0", AUTHORS,

diff --git a/tests/test-xalloc-die.c b/tests/test-xalloc-die.c
index 8b190d062ab2c480ddcf19d1e0341cc6827901d2..14cdbe6b6ac12e86274fd0a1d5afec852a0b1cdb 100644 (file)
--- a/tests/test-xalloc-die.c
+++ b/tests/test-xalloc-die.c
@@ -22,7 +22,7 @@
 #include "progname.h"
 
 int
-main (int argc _UNUSED_PARAMETER_, char **argv)
+main (int argc _GL_UNUSED, char **argv)
 {
   set_program_name (argv[0]);
   xalloc_die ();

diff --git a/tests/test-xfprintf-posix.c b/tests/test-xfprintf-posix.c
index 70fb93adbe69096ea53847c1d28859742497ad45..b7adf76a4c6958dc48d79e66d833da3d30548345 100644 (file)
--- a/tests/test-xfprintf-posix.c
+++ b/tests/test-xfprintf-posix.c
@@ -44,7 +44,7 @@
 #include "test-fprintf-posix.h"
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   set_program_name (argv[0]);
 

diff --git a/tests/test-xprintf-posix.c b/tests/test-xprintf-posix.c
index baba0422e97669c224e445358ff6c25db6affb0f..501f04ad5045c28361f97d7a8707619047307517 100644 (file)
--- a/tests/test-xprintf-posix.c
+++ b/tests/test-xprintf-posix.c
@@ -43,7 +43,7 @@
 #include "test-printf-posix.h"
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   set_program_name (argv[0]);
 

diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c
index a18994e238855c721e60fc46c0a1096af95b80fc..eb230dbb26a139a2157f24ff005558b386cb2e91 100644 (file)
--- a/tests/test-xvasprintf.c
+++ b/tests/test-xvasprintf.c
@@ -130,7 +130,7 @@ test_xasprintf ()
 }
 
 int
-main (int argc _UNUSED_PARAMETER_, char *argv[])
+main (int argc _GL_UNUSED, char *argv[])
 {
   set_program_name (argv[0]);