diff mbox series

[1/3] Merge _GL_UNUSED C23 patch from Gnulib

Message ID 20220822205834.563590-1-eggert@cs.ucla.edu
State Committed
Commit 464138e90497be474fdbb19eebc0269ea24c5ce1
Headers
Series [1/3] Merge _GL_UNUSED C23 patch from Gnulib |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Paul Eggert Aug. 22, 2022, 8:58 p.m. UTC 
  * posix/getopt.c (_getopt_initialize):
* sysdeps/posix/tempname.c (try_dir, try_nocreate):
Put _GL_UNUSED before args instead of after.
This makes no difference for glibc.
It is needed for Gnulib when being compiled on
non-GCC C23 compilers.
---
 posix/getopt.c           | 4 ++--
 sysdeps/posix/tempname.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Florian Weimer Aug. 23, 2022, 7:16 a.m. UTC | #1 
* Paul Eggert:

> * posix/getopt.c (_getopt_initialize):
> * sysdeps/posix/tempname.c (try_dir, try_nocreate):
> Put _GL_UNUSED before args instead of after.
> This makes no difference for glibc.
> It is needed for Gnulib when being compiled on
> non-GCC C23 compilers.

This looks okay.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian
diff mbox series

Patch

diff --git a/posix/getopt.c b/posix/getopt.c
index e9661c79fa..a160a4e3bd 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -377,8 +377,8 @@  process_long_option (int argc, char **argv, const char *optstring,
 /* Initialize internal data upon the first call to getopt.  */
 
 static const char *
-_getopt_initialize (int argc _GL_UNUSED,
-		    char **argv _GL_UNUSED, const char *optstring,
+_getopt_initialize (_GL_UNUSED int argc,
+		    _GL_UNUSED char **argv, const char *optstring,
 		    struct _getopt_data *d, int posixly_correct)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
index ebd2a43951..60f8541085 100644
--- a/sysdeps/posix/tempname.c
+++ b/sysdeps/posix/tempname.c
@@ -181,13 +181,13 @@  try_file (char *tmpl, void *flags)
 }
 
 static int
-try_dir (char *tmpl, void *flags _GL_UNUSED)
+try_dir (char *tmpl, _GL_UNUSED void *flags)
 {
   return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
 }
 
 static int
-try_nocreate (char *tmpl, void *flags _GL_UNUSED)
+try_nocreate (char *tmpl, _GL_UNUSED void *flags)
 {
   struct_stat64 st;