]> Savannah Git Hosting - gnulib.git/commitdiff
uniname/uniname: Fix -Wshadow warning.
authorBruno Haible <bruno@clisp.org>
Sat, 5 Sep 2020 12:26:49 +0000 (14:26 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 5 Sep 2020 13:44:58 +0000 (15:44 +0200)
* lib/uniname/uniname.c (unicode_name_word): Don't declare i upfront.
* modules/uniname/uniname (Depends-on): Add c99.

ChangeLog
lib/uniname/uniname.c
modules/uniname/uniname

index 205d98ab133d196da0748dbe1564a2f9906f90e7..052d965c0c731e4bded714c3063c9202dae189e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-05  Bruno Haible  <bruno@clisp.org>
+
+       uniname/uniname: Fix -Wshadow warning.
+       * lib/uniname/uniname.c (unicode_name_word): Don't declare i upfront.
+       * modules/uniname/uniname (Depends-on): Add c99.
+
 2020-09-05  Bruno Haible  <bruno@clisp.org>
 
        uniname/uniname: Fix -Wshorten-64-to-32 warnings.
index db8399d6bd7dd4bf0c4523f1f77b1eb6ee31f6ec..adefa43694e7c1f09dad26669b2fbefb10a84784 100644 (file)
@@ -60,7 +60,6 @@ unicode_name_word (unsigned int index, unsigned int *lengthp)
 {
   unsigned int i1;
   unsigned int i2;
-  unsigned int i;
 
   assert (index < UNICODE_CHARNAME_NUM_WORDS);
 
@@ -80,7 +79,7 @@ unicode_name_word (unsigned int index, unsigned int *lengthp)
       else
         i2 = i;
     }
-  i = i1;
+  unsigned int i = i1;
   assert (unicode_name_by_length[i].ind_offset <= index
           && index < unicode_name_by_length[i+1].ind_offset);
   *lengthp = i;
index bbd8a997dd759b3724c5938f4a8c7032d4ea82a8..0f2ffa92923dafac2f815f380d844d81ff91e4d5 100644 (file)
@@ -10,6 +10,7 @@ Depends-on:
 uniname/base
 attribute
 memcmp
+c99
 
 configure.ac:
 gl_LIBUNISTRING_MODULE([0.9.8], [uniname/uniname])