aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGabriel F. T. Gomes <gabriel@inconstante.eti.br>2019-03-21 17:24:30 -0300
committerGabriel F. T. Gomes <gabriel@inconstante.eti.br>2019-03-21 17:53:03 -0300
commit5abcddd7949270998c6e8d99fdbbba821b664f8b (patch)
tree27501fa7879f5e6fef7b71ca7664e1fccb325d6f /locale
parentac64195ccd4f320659fd0058bc7524c6fd0b37b4 (diff)
downloadglibc-5abcddd7949270998c6e8d99fdbbba821b664f8b.tar
glibc-5abcddd7949270998c6e8d99fdbbba821b664f8b.tar.gz
glibc-5abcddd7949270998c6e8d99fdbbba821b664f8b.tar.bz2
glibc-5abcddd7949270998c6e8d99fdbbba821b664f8b.zip
Fix parentheses error in iconvconfig.c and ld-collate.c [BZ #24372]
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 <carlos@redhat.com>
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-collate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 19b23c2453..6baab6cfb0 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