maint: prefer MAYBE_UNUSED

Prefer MAYBE_UNUSED to _GL_UNUSED, since the C2x syntax
will be [[maybe_unused]] at the start of the declaration,
and we want to look forward to that.  All uses of _GL_UNUSED
either changed to MAYBE_UNUSED, or (when not needed) removed.

diff --git a/src/chroot.c b/src/chroot.c
index 9a0cd2a5bf47873f08f363696f8c1b0990a95c53..e5aa7c0b2cc25515b8f42f57014d04e00411c407 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -67,7 +67,7 @@ static struct option const long_opts[] =
 #if ! HAVE_SETGROUPS
 /* At least Interix lacks supplemental group support.  */
 static int
-setgroups (size_t size, gid_t const *list _GL_UNUSED)
+setgroups (size_t size, MAYBE_UNUSED gid_t const *list)
 {
   if (size == 0)
     {

diff --git a/src/cksum.c b/src/cksum.c
index 51afe89f6828dd4d4f9d89a588ae89e88d6b1644..2209807cb39062a116ff17fb3b7af822b6018336 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -286,8 +286,7 @@ crc_sum_stream (FILE *stream, void *resstream, uintmax_t *length)
 
 void
 output_crc (char const *file, int binary_file, void const *digest,
-            bool tagged, unsigned char delim, bool args _GL_UNUSED,
-            uintmax_t length _GL_UNUSED)
+            bool tagged, unsigned char delim, bool args, uintmax_t length)
 {
   char length_buf[INT_BUFSIZE_BOUND (uintmax_t)];
   printf ("%u %s", *(unsigned int *)digest, umaxtostr (length, length_buf));

diff --git a/src/cksum.h b/src/cksum.h
index 8e9be44391206d1934c6f9f368ff1c54cb021e25..28d72ee2475f7d57a0e3c859c3a7334f5e1a94e2 100644 (file)
--- a/src/cksum.h
+++ b/src/cksum.h
@@ -8,8 +8,7 @@ crc_sum_stream (FILE *stream, void *resstream, uintmax_t *length);
 
 extern void
 output_crc (char const *file, int binary_file, void const *digest,
-            bool tagged, unsigned char delim, bool args _GL_UNUSED,
-            uintmax_t length _GL_UNUSED)
+            bool tagged, unsigned char delim, bool args, uintmax_t length)
   _GL_ATTRIBUTE_NONNULL ((3));
 
 extern bool

diff --git a/src/copy.c b/src/copy.c
index 196c7810406d7fe39bda7a5fcbe071616622bef5..ba46cd3b7fac07a976bb7af5cca173c898cd9e13 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -669,7 +669,7 @@ errno_unsupported (int err)
 #if USE_XATTR
 ATTRIBUTE_FORMAT ((printf, 2, 3))
 static void
-copy_attr_error (struct error_context *ctx _GL_UNUSED,
+copy_attr_error (MAYBE_UNUSED struct error_context *ctx,
                  char const *fmt, ...)
 {
   if (!errno_unsupported (errno))
@@ -686,7 +686,7 @@ copy_attr_error (struct error_context *ctx _GL_UNUSED,
 
 ATTRIBUTE_FORMAT ((printf, 2, 3))
 static void
-copy_attr_allerror (struct error_context *ctx _GL_UNUSED,
+copy_attr_allerror (MAYBE_UNUSED struct error_context *ctx,
                     char const *fmt, ...)
 {
   int err = errno;
@@ -699,14 +699,14 @@ copy_attr_allerror (struct error_context *ctx _GL_UNUSED,
 }
 
 static char const *
-copy_attr_quote (struct error_context *ctx _GL_UNUSED, char const *str)
+copy_attr_quote (MAYBE_UNUSED struct error_context *ctx, char const *str)
 {
   return quoteaf (str);
 }
 
 static void
-copy_attr_free (struct error_context *ctx _GL_UNUSED,
-                char const *str _GL_UNUSED)
+copy_attr_free (MAYBE_UNUSED struct error_context *ctx,
+                MAYBE_UNUSED char const *str)
 {
 }
 
@@ -759,11 +759,11 @@ copy_attr (char const *src_path, int src_fd,
 #else /* USE_XATTR */
 
 static bool
-copy_attr (char const *src_path _GL_UNUSED,
-           int src_fd _GL_UNUSED,
-           char const *dst_path _GL_UNUSED,
-           int dst_fd _GL_UNUSED,
-           struct cp_options const *x _GL_UNUSED)
+copy_attr (MAYBE_UNUSED char const *src_path,
+           MAYBE_UNUSED int src_fd,
+           MAYBE_UNUSED char const *dst_path,
+           MAYBE_UNUSED int dst_fd,
+           MAYBE_UNUSED struct cp_options const *x)
 {
   return true;
 }

diff --git a/src/digest.c b/src/digest.c
index 62ed795c18f060717f4504b9b703174a68eccab0..85e2909b4b8cafee569debb6ed33189e7191265c 100644 (file)
--- a/src/digest.c
+++ b/src/digest.c
@@ -167,8 +167,8 @@
 #if !HASH_ALGO_SUM
 static void
 output_file (char const *file, int binary_file, void const *digest,
-             bool tagged, unsigned char delim, bool args _GL_UNUSED,
-             uintmax_t length _GL_UNUSED);
+             bool tagged, unsigned char delim, bool args,
+             uintmax_t length);
 #endif
 
 /* True if any of the files read were the standard input. */
@@ -902,7 +902,7 @@ print_filename (char const *file, bool escape)
 
 static bool
 digest_file (char const *filename, int *binary, unsigned char *bin_result,
-             bool *missing, uintmax_t* length _GL_UNUSED)
+             bool *missing, MAYBE_UNUSED uintmax_t *length)
 {
   FILE *fp;
   int err;
@@ -968,8 +968,8 @@ digest_file (char const *filename, int *binary, unsigned char *bin_result,
 #if !HASH_ALGO_SUM
 static void
 output_file (char const *file, int binary_file, void const *digest,
-             bool tagged, unsigned char delim, bool args _GL_UNUSED,
-             uintmax_t length _GL_UNUSED)
+             bool tagged, unsigned char delim, MAYBE_UNUSED bool args,
+             MAYBE_UNUSED uintmax_t length)
 {
   unsigned char const *bin_buffer = digest;
 

diff --git a/src/factor.c b/src/factor.c
index 614f8fa15cc0be469dfa8f0b28f75990a5234453..caa97cbd27c2b9a6b3b5c1eedc64462bcdc2f4e5 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -776,7 +776,8 @@ factor_using_division (uintmax_t *t1p, uintmax_t t1, uintmax_t t0,
     {
       for (;;)
         {
-          uintmax_t q1, q0, hi, lo _GL_UNUSED;
+          uintmax_t q1, q0, hi;
+          MAYBE_UNUSED uintmax_t lo;
 
           q0 = t0 * primes_dtab[i].binv;
           umul_ppmm (hi, lo, q0, p);
@@ -916,7 +917,8 @@ static const unsigned char  binvert_table[128] =
     _q0 = (u0) * _di;                                                   \
     if ((u1) >= (d))                                                    \
       {                                                                 \
-        uintmax_t _p1, _p0 _GL_UNUSED;                                 \
+        uintmax_t _p1;                                                  \
+        MAYBE_UNUSED intmax_t _p0;                                      \
         umul_ppmm (_p1, _p0, _q0, d);                                   \
         (q1) = ((u1) - _p1) * _di;                                      \
         (q0) = _q0;                                                     \
@@ -931,7 +933,7 @@ static const unsigned char  binvert_table[128] =
 /* x B (mod n).  */
 #define redcify(r_prim, r, n)                                           \
   do {                                                                  \
-    uintmax_t _redcify_q _GL_UNUSED;                                   \
+    MAYBE_UNUSED uintmax_t _redcify_q;                                 \
     udiv_qrnnd (_redcify_q, r_prim, r, 0, n);                           \
   } while (0)
 
@@ -964,7 +966,8 @@ static const unsigned char  binvert_table[128] =
 static inline uintmax_t
 mulredc (uintmax_t a, uintmax_t b, uintmax_t m, uintmax_t mi)
 {
-  uintmax_t rh, rl, q, th, tl _GL_UNUSED, xh;
+  uintmax_t rh, rl, q, th, xh;
+  MAYBE_UNUSED uintmax_t tl;
 
   umul_ppmm (rh, rl, a, b);
   q = rl * mi;
@@ -984,7 +987,8 @@ mulredc2 (uintmax_t *r1p,
           uintmax_t a1, uintmax_t a0, uintmax_t b1, uintmax_t b0,
           uintmax_t m1, uintmax_t m0, uintmax_t mi)
 {
-  uintmax_t r1, r0, q, p1, p0 _GL_UNUSED, t1, t0, s1, s0;
+  uintmax_t r1, r0, q, p1, t1, t0, s1, s0;
+  MAYBE_UNUSED uintmax_t p0;
   mi = -mi;
   assert ((a1 >> (W_TYPE_SIZE - 1)) == 0);
   assert ((b1 >> (W_TYPE_SIZE - 1)) == 0);
@@ -1254,7 +1258,7 @@ prime_p (uintmax_t n)
           a_prim = s0 % n;
         else
           {
-            uintmax_t dummy _GL_UNUSED;
+            MAYBE_UNUSED uintmax_t dummy;
             udiv_qrnnd (dummy, a_prim, s1, s0, n);
           }
       }
@@ -1802,7 +1806,7 @@ isqrt2 (uintmax_t nh, uintmax_t nl)
   /* Do we need more than one iteration?  */
   for (;;)
     {
-      uintmax_t r _GL_UNUSED;
+      MAYBE_UNUSED uintmax_t r;
       uintmax_t q, y;
       udiv_qrnnd (q, r, nh, nl, x);
       y = (x + q) / 2;

diff --git a/src/ls.c b/src/ls.c
index 992f604f451891c09752f98c24adcddfc113e9d8..77d94072b1836b0f8a6f50f0b955b6e4c629ac5e 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -3177,7 +3177,7 @@ has_capability (char const *name)
 }
 #else
 static bool
-has_capability (char const *name _GL_UNUSED)
+has_capability (MAYBE_UNUSED char const *name)
 {
   errno = ENOTSUP;
   return false;

diff --git a/src/od.c b/src/od.c
index b4ae8490f243449912c5bcf2842fe7da3e2ec8f5..645f71f3a3f453b50be221d42fbf9764d707b414 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -427,10 +427,10 @@ Binary prefixes can be used, too: KiB=K, MiB=M, and so on.\n\
 
 /* Define the print functions.  */
 
-#define PRINT_FIELDS(N, T, FMT_STRING, ACTION)                          \
+#define PRINT_FIELDS(N, T, FMT_STRING_DECL, ACTION)                     \
 static void                                                             \
 N (size_t fields, size_t blank, void const *block,                      \
-   char const *FMT_STRING, int width, int pad)                          \
+   FMT_STRING_DECL, int width, int pad)                                 \
 {                                                                       \
   T const *p = block;                                                   \
   uintmax_t i;                                                          \
@@ -460,10 +460,11 @@ N (size_t fields, size_t blank, void const *block,                      \
 }
 
 #define PRINT_TYPE(N, T)                                                \
-  PRINT_FIELDS (N, T, fmt_string, xprintf (fmt_string, adjusted_width, x))
+  PRINT_FIELDS (N, T, char const *fmt_string,                           \
+                xprintf (fmt_string, adjusted_width, x))
 
 #define PRINT_FLOATTYPE(N, T, FTOASTR, BUFSIZE)                         \
-  PRINT_FIELDS (N, T, fmt_string _GL_UNUSED,                      \
+  PRINT_FIELDS (N, T, MAYBE_UNUSED char const *fmt_string,              \
                 char buf[BUFSIZE];                                      \
                 FTOASTR (buf, sizeof buf, 0, 0, x);                     \
                 xprintf ("%*s", adjusted_width, buf))
@@ -498,7 +499,7 @@ dump_hexl_mode_trailer (size_t n_bytes, char const *block)
 
 static void
 print_named_ascii (size_t fields, size_t blank, void const *block,
-                   char const *unused_fmt_string _GL_UNUSED,
+                   MAYBE_UNUSED char const *unused_fmt_string,
                    int width, int pad)
 {
   unsigned char const *p = block;
@@ -529,7 +530,7 @@ print_named_ascii (size_t fields, size_t blank, void const *block,
 
 static void
 print_ascii (size_t fields, size_t blank, void const *block,
-             char const *unused_fmt_string _GL_UNUSED, int width,
+             MAYBE_UNUSED char const *unused_fmt_string, int width,
              int pad)
 {
   unsigned char const *p = block;
@@ -1112,8 +1113,8 @@ skip (uintmax_t n_skip)
 }
 
 static void
-format_address_none (uintmax_t address _GL_UNUSED,
-                     char c _GL_UNUSED)
+format_address_none (MAYBE_UNUSED uintmax_t address,
+                     MAYBE_UNUSED char c)
 {
 }
 

diff --git a/src/stat.c b/src/stat.c
index 280142b5ce488f43245cdbaeeeeb317f76ae6f89..7849b54dc27eae0ac0026d7fbfd5074ff27a660c 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -860,7 +860,7 @@ out_file_context (char *pformat, size_t prefix_len, char const *filename)
 /* Print statfs info.  Return zero upon success, nonzero upon failure.  */
 NODISCARD
 static bool
-print_statfs (char *pformat, size_t prefix_len, char mod _GL_UNUSED, char m,
+print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m,
               int fd, char const *filename,
               void const *data)
 {

diff --git a/src/stty.c b/src/stty.c
index 9b10eb1eec0eb514c3d0fb56e831d3822f5e900b..fa5a0dc546b6c8a3b40bfbfcbe53ec0c8d73f251 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -1274,7 +1274,7 @@ main (int argc, char **argv)
   int argi = 0;
   int opti = 1;
   bool require_set_attr;
-  bool speed_was_set _GL_UNUSED;
+  MAYBE_UNUSED bool speed_was_set;
   bool verbose_output;
   bool recoverable_output;
   bool noargs = true;

diff --git a/src/sum.c b/src/sum.c
index 3c5e687db59416e01debe4f9ef1be444481495cb..c9713ca8b9ab7daa4a39e324920426e41f19d72a 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -184,8 +184,8 @@ cleanup_buffer:
 
 void
 output_bsd (char const *file, int binary_file, void const *digest,
-            bool tagged, unsigned char delim, bool args _GL_UNUSED,
-            uintmax_t length _GL_UNUSED)
+            bool tagged, unsigned char delim, bool args,
+            uintmax_t length)
 {
 
   char hbuf[LONGEST_HUMAN_READABLE + 1];
@@ -201,8 +201,8 @@ output_bsd (char const *file, int binary_file, void const *digest,
 
 void
 output_sysv (char const *file, int binary_file, void const *digest,
-             bool tagged, unsigned char delim, bool args _GL_UNUSED,
-             uintmax_t length _GL_UNUSED)
+             bool tagged, unsigned char delim, bool args,
+             uintmax_t length)
 {
 
   char hbuf[LONGEST_HUMAN_READABLE + 1];

diff --git a/src/sum.h b/src/sum.h
index 1681697aba4573df488f64b8f446bfbe00654364..7e46b871ce7bef849d65f8ca340732e23df1c79c 100644 (file)
--- a/src/sum.h
+++ b/src/sum.h
@@ -9,10 +9,10 @@ typedef int (*sumfn)(FILE *, void *, uintmax_t*);
 
 extern void
 output_bsd (char const *file, int binary_file, void const *digest,
-            bool tagged, unsigned char delim, bool args _GL_UNUSED,
-            uintmax_t length _GL_UNUSED);
+            bool tagged, unsigned char delim, bool args,
+            uintmax_t length);
 
 extern void
 output_sysv (char const *file, int binary_file, void const *digest,
-             bool tagged, unsigned char delim, bool args _GL_UNUSED,
-             uintmax_t length _GL_UNUSED);
+             bool tagged, unsigned char delim, bool args,
+             uintmax_t length);

diff --git a/src/tac.c b/src/tac.c
index cbc3deac99ed95fe7769f943283d6d22b5d9106f..f40a9c0fe9684ff70a78cb5ada008639c6072e96 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -417,7 +417,7 @@ record_or_unlink_tempfile (char const *fn, FILE *fp)
 #else
 
 static void
-record_or_unlink_tempfile (char const *fn, FILE *fp _GL_UNUSED)
+record_or_unlink_tempfile (char const *fn, MAYBE_UNUSED FILE *fp)
 {
   unlink (fn);
 }

diff --git a/src/tsort.c b/src/tsort.c
index de45823035328006f24842146baa04b9bad71746..c685345a35b8b008dcb5ac2a4560fca8aa488824 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -285,7 +285,7 @@ record_relation (struct item *j, struct item *k)
 }
 
 static bool
-count_items (struct item *unused _GL_UNUSED)
+count_items (MAYBE_UNUSED struct item *unused)
 {
   n_strings++;
   return false;