public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Paul Eggert <eggert@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Merge _GL_UNUSED C23 patch from Gnulib
Date: Wed, 24 Aug 2022 04:59:10 +0000 (GMT)	[thread overview]
Message-ID: <20220824045910.B30453857034@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=464138e90497be474fdbb19eebc0269ea24c5ce1

commit 464138e90497be474fdbb19eebc0269ea24c5ce1
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Aug 23 21:16:39 2022 -0700

    Merge _GL_UNUSED C23 patch from Gnulib
    
    * 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.

Diff:
---
 posix/getopt.c           | 4 ++--
 sysdeps/posix/tempname.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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;

                 reply	other threads:[~2022-08-24  4:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220824045910.B30453857034@sourceware.org \
    --to=eggert@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).