diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2020-10-30 21:39:12 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2020-10-30 21:39:12 +0000 |
| commit | 5c3b0374ebe0aa4b0a434c0addb4c455886a0986 (patch) | |
| tree | f98fc76afbd04beda539fcb25530131705e9c241 | |
| parent | 2098d4034d398cbde6ccd4a2aaac52c518374698 (diff) | |
| download | glibc-5c3b0374ebe0aa4b0a434c0addb4c455886a0986.zip glibc-5c3b0374ebe0aa4b0a434c0addb4c455886a0986.tar.gz glibc-5c3b0374ebe0aa4b0a434c0addb4c455886a0986.tar.bz2 | |
Do not use array parameter to new_composite_name (bug 26726)
Among the warnings causing a glibc build with GCC 11 to fail is one
for a call new_composite_name in setlocale.c. The newnames argument
is declared as an array with __LC_LAST elements, but when the category
argument is not LC_ALL, it actually only has one element. Since the
number of elements depends on the first argument to the function, it
seems clearer to declare the argument as a pointer.
Tested with build-many-glibcs.py for arm-linux-gnueabi, where this
allows the build to get further.
Reviewed-by: DJ Delorie <dj@redhat.com>
| -rw-r--r-- | locale/setlocale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c index 030f172..89e8724 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -135,7 +135,7 @@ extern int _nl_msg_cat_cntr; /* Construct a new composite name. */ static char * -new_composite_name (int category, const char *newnames[__LC_LAST]) +new_composite_name (int category, const char **newnames) { size_t last_len = 0; size_t cumlen = 0; |