diff mbox series

Do not use array parameter to new_composite_name (bug 26726)

Message ID alpine.DEB.2.22.394.2010281957130.233090@digraph.polyomino.org.uk
State Committed
Headers show
Series Do not use array parameter to new_composite_name (bug 26726) | expand

Commit Message

Joseph Myers Oct. 28, 2020, 7:57 p.m. UTC
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.

---

After this patch and the one for bug 26647 are applied, I see the
build failing with the ypclnt.c errors mentioned in bug 26687.  That
is, despite that bug having been marked FIXED, it seems only some of
the warnings from it have actually been fixed so far.
diff mbox series

Patch

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;