>From 8fba1d09bd8e99404cd82670138a98dad44aad94 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Sep 2020 14:26:49 +0200 Subject: [PATCH 3/3] uniname/uniname: Fix -Wshadow warning. * lib/uniname/uniname.c (unicode_name_word): Don't declare i upfront. * modules/uniname/uniname (Depends-on): Add c99. --- ChangeLog | 6 ++++++ lib/uniname/uniname.c | 3 +-- modules/uniname/uniname | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 205d98a..052d965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-09-05 Bruno Haible + 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 + uniname/uniname: Fix -Wshorten-64-to-32 warnings. * lib/uniname/uniname.c (unicode_name_word_lookup): Change type of last argument to size_t. diff --git a/lib/uniname/uniname.c b/lib/uniname/uniname.c index db8399d..adefa43 100644 --- a/lib/uniname/uniname.c +++ b/lib/uniname/uniname.c @@ -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; diff --git a/modules/uniname/uniname b/modules/uniname/uniname index bbd8a99..0f2ffa9 100644 --- a/modules/uniname/uniname +++ b/modules/uniname/uniname @@ -10,6 +10,7 @@ Depends-on: uniname/base attribute memcmp +c99 configure.ac: gl_LIBUNISTRING_MODULE([0.9.8], [uniname/uniname]) -- 2.7.4