From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1211) id B30453857034; Wed, 24 Aug 2022 04:59:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B30453857034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661317150; bh=rtzUeJzi6112HkdP+CjMSWziaDozHLMleve4xQS8TP4=; h=From:To:Subject:Date:From; b=J2jtp6doah0eFccTgWyTXjksAHa8GAaEAY/E1/KjffRbCf1bP8lS3W8dOF40A0paV XxGqiP2HN0t0E6X9ubBmNawquGwdY1PpemvYX2RYcjzXqZGiz4S+kKbcUwFIDeXXrn dfb4DQ8RbgYUgQPFkXKPuf3Giir68jGRd1snm8L0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Paul Eggert To: glibc-cvs@sourceware.org Subject: [glibc] Merge _GL_UNUSED C23 patch from Gnulib X-Act-Checkin: glibc X-Git-Author: Paul Eggert X-Git-Refname: refs/heads/master X-Git-Oldrev: 8995b84c45e82c461bfcce34fff63c8e4e0b2aea X-Git-Newrev: 464138e90497be474fdbb19eebc0269ea24c5ce1 Message-Id: <20220824045910.B30453857034@sourceware.org> Date: Wed, 24 Aug 2022 04:59:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=464138e90497be474fdbb19eebc0269ea24c5ce1 commit 464138e90497be474fdbb19eebc0269ea24c5ce1 Author: Paul Eggert 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;