mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 11:43:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parentheses error in iconvconfig.c and ld-collate.c [BZ #24372]

Browse Source 
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>
This commit is contained in:
Gabriel F. T. Gomes 2019-03-21 17:24:30 -03:00
parent ac64195ccd
commit 5abcddd794
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2019-03-05 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
[BZ #24372]
* iconv/iconvconfig.c (write_output): Add parentheses to get rid
of compiler warning.
* locale/programs/ld-collate.c (collate_output): Likewise.
2019-03-21 DJ Delorie <dj@redhat.com>
[BZ #24372]

2
iconv/iconvconfig.c
View File

@ -1081,7 +1081,7 @@ write_output (void)
Creating a perfect hash table is not reasonable here. Therefore
we use open hashing and a table size which is the next prime 50%
larger than the number of strings. */
hash_size = next_prime (nnames + nnames >> 1);
hash_size = next_prime (nnames + (nnames >> 1));
hash_table = (struct hash_entry *) xcalloc (hash_size,
sizeof (struct hash_entry));
/* Fill the hash table. */

2
locale/programs/ld-collate.c
View File

@ -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