From: Bruno Haible <bruno@clisp.org>
Date: Wed, 4 Dec 2024 08:09:23 +0000 (+0100)
Subject: Refactor: Fix some gcc 14 -Wshadow warnings.
X-Git-Tag: v0.24~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45304ca67b7e51e3bf1b882542d661c33e5e52d0;p=thirdparty%2Fgettext.git

Refactor: Fix some gcc 14 -Wshadow warnings.

* gettext-tools/src/x-c.c (phase5_get): Rename some local variables.
* gettext-tools/src/x-php.c (phase4_get): Likewise.
---

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 4137f8e99..ae065e913 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1463,14 +1463,14 @@ phase5_get (token_ty *tp)
                                 break;
 
                               /* Update the state.  */
-                              string_desc_t contents = sb_contents (&buffer);
-                              const char *buf = string_desc_data (contents);
-                              size_t buflen = string_desc_length (contents);
-                              if (c == (state < buflen ? buf[state] : '"'))
+                              string_desc_t raw_contents = sb_contents (&buffer);
+                              const char *raw_buf = string_desc_data (raw_contents);
+                              size_t raw_buflen = string_desc_length (raw_contents);
+                              if (c == (state < raw_buflen ? raw_buf[state] : '"'))
                                 {
-                                  if (state < buflen)
+                                  if (state < raw_buflen)
                                     state++;
-                                  else /* state == buflen && c == '"' */
+                                  else /* state == raw_buflen && c == '"' */
                                     {
                                       /* Finished parsing the string.  */
                                       sb_free (&buffer);
@@ -1484,10 +1484,10 @@ phase5_get (token_ty *tp)
                                 {
                                   int i;
 
-                                  /* None of the bytes buf[0]...buf[state-1]
+                                  /* None of the bytes raw_buf[0]...raw_buf[state-1]
                                      can be ')'.  */
                                   for (i = 0; i < state; i++)
-                                    mixed_string_buffer_append_char (&msb, buf[i]);
+                                    mixed_string_buffer_append_char (&msb, raw_buf[i]);
 
                                   /* But c may be ')'.  */
                                   if (c == ')')
diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 19a7cc54c..231480f0d 100644
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1458,16 +1458,16 @@ phase4_get (struct php_extractor *xp, token_ty *tp)
                         for (p = doc; p < doc + doc_len; p++)
                           {
                             /* Invariant: doc <= q <= p <= doc + doc_len.  */
-                            char c = *p;
-                            *q++ = c;
+                            char d = *p;
+                            *q++ = d;
                             if (curr_line_indent < end_label_indent)
                               {
-                                if (c == ' ')
+                                if (d == ' ')
                                   {
                                     curr_line_indent++;
                                     --q;
                                   }
-                                else if (c == '\t')
+                                else if (d == '\t')
                                   {
                                     curr_line_indent |= TAB_WIDTH - 1;
                                     curr_line_indent++;
@@ -1475,7 +1475,7 @@ phase4_get (struct php_extractor *xp, token_ty *tp)
                                       --q;
                                   }
                               }
-                            if (c == '\n')
+                            if (d == '\n')
                               curr_line_indent = 0;
                           }
                         doc_len = q - doc;