From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri, 17 Oct 2025 19:12:48 +0000 (-0300)
Subject: elf: Fix clang -Wstring-plus-int on rtld.c
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7dbcab417ae42c2808c94fb67d5d0fbdcc296af;p=thirdparty%2Fglibc.git

elf: Fix clang -Wstring-plus-int on rtld.c

clang issues an warning adding 'const unsigned char' to a string
does not append to the string.

Use array indexes instead of string addition (it is simpler than
add a warning suppression).

Reviewed-by: Sam James <sam@gentoo.org>
---

diff --git a/elf/rtld.c b/elf/rtld.c
index 753ce6690b..8b472e9c0c 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2494,7 +2494,7 @@ Valid options for the LD_DEBUG environment variable are:\n\n");
 
       for (cnt = 0; cnt < ndebopts; ++cnt)
 	_dl_printf ("  %.*s%s%s\n", debopts[cnt].len, debopts[cnt].name,
-		    "         " + debopts[cnt].len - 3,
+		    &"         "[debopts[cnt].len - 3],
 		    debopts[cnt].helptext);
 
       _dl_printf ("\n\