From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 20 Apr 2025 02:22:37 +0000 (-0700)
Subject: Pacify GCC 15 -Wunterminated-string-initialization
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56aad204c19aff127a3250a67e7d79c7ddd8d71b;p=emacs.git

Pacify GCC 15 -Wunterminated-string-initialization

* src/fns.c (hexbuf_digest):
* src/json.c (json_out_string):
Add ATTRIBUTE_NONSTRING to character arrays that are not strings.

(cherry picked from commit e2fb12a40ca2b90dfedbfe916ed8a87345ca89f1)
---

diff --git a/src/fns.c b/src/fns.c
index fd240d55f6d..eefc74b3b38 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -6015,7 +6015,7 @@ hexbuf_digest (char *hexbuf, void const *digest, int digest_size)
 
   for (int i = digest_size - 1; i >= 0; i--)
     {
-      static char const hexdigit[16] = "0123456789abcdef";
+      static char const hexdigit[16] ATTRIBUTE_NONSTRING = "0123456789abcdef";
       int p_i = p[i];
       hexbuf[2 * i] = hexdigit[p_i >> 4];
       hexbuf[2 * i + 1] = hexdigit[p_i & 0xf];
diff --git a/src/json.c b/src/json.c
index beac242b709..44eae653eb5 100644
--- a/src/json.c
+++ b/src/json.c
@@ -323,7 +323,7 @@ json_out_string (json_out_t *jo, Lisp_Object str, int skip)
 {
   /* FIXME: this code is slow, make faster! */
 
-  static const char hexchar[16] = "0123456789ABCDEF";
+  static const char hexchar[16] ATTRIBUTE_NONSTRING = "0123456789ABCDEF";
   ptrdiff_t len = SBYTES (str);
   json_make_room (jo, len + 2);
   json_out_byte (jo, '"');