public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Siddhesh Poyarekar <siddhesh@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] string.h: fix __fortified_attr_access macro call [BZ #29162] Date: Mon, 23 May 2022 08:41:13 +0000 (GMT) [thread overview] Message-ID: <20220523084113.BF0493856241@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=14770f3e0462721b317f138197e1fbf4db542c94 commit 14770f3e0462721b317f138197e1fbf4db542c94 Author: Sergei Trofimovich <slyich@gmail.com> Date: Mon May 23 13:56:43 2022 +0530 string.h: fix __fortified_attr_access macro call [BZ #29162] commit e938c0274 "Don't add access size hints to fortifiable functions" converted a few '__attr_access ((...))' into '__fortified_attr_access (...)' calls. But one of conversions had double parentheses of '__fortified_attr_access (...)'. Noticed as a gnat6 build failure: /<<NIX>>-glibc-2.34-210-dev/include/bits/string_fortified.h:110:50: error: macro "__fortified_attr_access" requires 3 arguments, but only 1 given The change fixes parentheses. This is seen when using compilers that do not support __builtin___stpncpy_chk, e.g. gcc older than 4.7, clang older than 2.6 or some compiler not derived from gcc or clang. Signed-off-by: Sergei Trofimovich <slyich@gmail.com> Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> (cherry picked from commit 5a5f94af0542f9a35aaa7992c18eb4e2403a29b9) Diff: --- string/bits/string_fortified.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h index 218006c9ba..4e66e0bd1e 100644 --- a/string/bits/string_fortified.h +++ b/string/bits/string_fortified.h @@ -107,7 +107,7 @@ __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) # else extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n, size_t __destlen) __THROW - __fortified_attr_access ((__write_only__, 1, 3)) + __fortified_attr_access (__write_only__, 1, 3) __attr_access ((__read_only__, 2)); extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src, size_t __n), stpncpy);
reply other threads:[~2022-05-23 8:41 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=20220523084113.BF0493856241@sourceware.org \ --to=siddhesh@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: linkBe 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).