diff options
| author | Eric Blake <eblake@redhat.com> | 2013-09-04 17:02:47 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2013-10-01 13:50:29 -0600 |
| commit | e833b53fe618af287a0b818ac3592d842b76dec8 (patch) | |
| tree | 00b480512aa4e2bf2e3652b29ee90ff675f7b895 | |
| parent | c17fdf95b69e166a777083336f7204bf4f6da2fa (diff) | |
| download | glibc-e833b53fe618af287a0b818ac3592d842b76dec8.tar glibc-e833b53fe618af287a0b818ac3592d842b76dec8.tar.gz glibc-e833b53fe618af287a0b818ac3592d842b76dec8.tar.bz2 glibc-e833b53fe618af287a0b818ac3592d842b76dec8.zip | |
glob: silence -Wattribute warnings
Colin Watson reported that some versions of gcc warn about
attribute leaf used on a static function, since it has no
effect on anything but external functions.
* posix/glob.c (next_brace_sub, prefix_array, collated_compare):
Use __THROWNL rather than __THROW on static functions.
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | posix/glob.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -432,6 +432,11 @@ [!_SOFT_FLOAT && !__NO_FPRS__] (_FPU_SETCW): Likewise. Use parentheses around reference to macro parameter. +2013-09-04 Eric Blake <eblake@redhat.com> + + * posix/glob.c (next_brace_sub, prefix_array, collated_compare): + Use __THROWNL rather than __THROW on static functions. + 2013-09-13 Richard Sandiford <richard@codesourcery.com> * locale/programs/ld-ctype.c (find_idx): Use uint32_t in diff --git a/posix/glob.c b/posix/glob.c index 4c7dce5ee8..ece71c168f 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -193,7 +193,7 @@ # define GET_LOGIN_NAME_MAX() (-1) #endif -static const char *next_brace_sub (const char *begin, int flags) __THROW; +static const char *next_brace_sub (const char *begin, int flags) __THROWNL; #endif /* !defined _LIBC || !defined GLOB_ONLY_P */ @@ -208,8 +208,8 @@ extern int __glob_pattern_type (const char *pattern, int quote) attribute_hidden; #if !defined _LIBC || !defined GLOB_ONLY_P -static int prefix_array (const char *prefix, char **array, size_t n) __THROW; -static int collated_compare (const void *, const void *) __THROW; +static int prefix_array (const char *prefix, char **array, size_t n) __THROWNL; +static int collated_compare (const void *, const void *) __THROWNL; /* Find the end of the sub-pattern in a brace expression. */ |