From 5abcddd7949270998c6e8d99fdbbba821b664f8b Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Thu, 21 Mar 2019 17:24:30 -0300 Subject: Fix parentheses error in iconvconfig.c and ld-collate.c [BZ #24372] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When -Werror=parentheses is in use, iconvconfig.c builds fail with: iconvconfig.c: In function ‘write_output’: iconvconfig.c:1084:34: error: suggest parentheses around ‘+’ inside ‘>>’ [-Werror=parentheses] hash_size = next_prime (nnames + nnames >> 1); ~~~~~~~^~~~~~~~ This patch adds parentheses to the expression. Not where suggested by the compiler warning, but where it produces the expected result, i.e.: where it has the effect of multiplying nnames by 1.5. Likewise for elem_size in ld-collate.c. Tested for powerpc64le. Reviewed-by: Carlos O'Donell --- locale/programs/ld-collate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'locale') diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 19b23c2..6baab6c 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2402,7 +2402,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, runp = runp->next; } /* Add 50% and find the next prime number. */ - elem_size = next_prime (elem_size + elem_size >> 1); + elem_size = next_prime (elem_size + (elem_size >> 1)); /* Allocate the table. Each entry consists of two words: the hash value and an index in a secondary table which provides the index -- cgit v1.1