[PATCH 4/5] Pacify -Wunterminated-string-initialization

[Paul Eggert]

* tests/test-fwrite.c (main): Mark nonstrings with
_GL_ATTRIBUTE_NONSTRING.
* tests/test-mbsinit.c (main): "\303" → {'\303'} in initializer.
---
 ChangeLog            | 5 +++++
 tests/test-fwrite.c  | 6 +++---
 tests/test-mbsinit.c | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b143d1311b..7a5586a8d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2025-04-17  Paul Eggert  <egg...@cs.ucla.edu>
 
+       Pacify -Wunterminated-string-initialization
+       * tests/test-fwrite.c (main): Mark nonstrings with
+       _GL_ATTRIBUTE_NONSTRING.
+       * tests/test-mbsinit.c (main): "\303" → {'\303'} in initializer.
+
        getlogin-tests: remove xalloc dependency
        * modules/getlogin-tests (Depends-on): Remove xalloc.
        (test_getlogin_LDADD): Remove @LIBINTL@.
diff --git a/tests/test-fwrite.c b/tests/test-fwrite.c
index b7c540ca76..8cabd58cb2 100644
--- a/tests/test-fwrite.c
+++ b/tests/test-fwrite.c
@@ -48,7 +48,7 @@ main ()
   #if !defined __ANDROID__ /* fdsan */
   {
     FILE *fp = fopen (filename, "w");
-    char buf[5] = "world";
+    char buf[5] _GL_ATTRIBUTE_NONSTRING = "world";
     ASSERT (fp != NULL);
     setvbuf (fp, NULL, _IONBF, 0);
     ASSERT (close (fileno (fp)) == 0);
@@ -66,7 +66,7 @@ main ()
     FILE *fp = fdopen (-1, "w");
     if (fp != NULL)
       {
-        char buf[5] = "world";
+        char buf[5] _GL_ATTRIBUTE_NONSTRING = "world";
         setvbuf (fp, NULL, _IONBF, 0);
         errno = 0;
         ASSERT (fwrite (buf, 1, sizeof (buf), fp) == 0);
@@ -81,7 +81,7 @@ main ()
     fp = fdopen (99, "w");
     if (fp != NULL)
       {
-        char buf[5] = "world";
+        char buf[5] _GL_ATTRIBUTE_NONSTRING = "world";
         setvbuf (fp, NULL, _IONBF, 0);
         errno = 0;
         ASSERT (fwrite (buf, 1, sizeof (buf), fp) == 0);
diff --git a/tests/test-mbsinit.c b/tests/test-mbsinit.c
index 110c16c805..cd57e9ff60 100644
--- a/tests/test-mbsinit.c
+++ b/tests/test-mbsinit.c
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
 
   if (argc > 1)
     {
-      static const char input[1] = "\303";
+      static const char input[1] = {'\303'};
       wchar_t wc;
       size_t ret;
 
-- 
2.49.0