Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

Fix -Wshadow=compatible-local warnings.

Browse Source 
* src/search.cc (Search::prepare_asso_values): Declare 'temp' in each
'for' loop separately.
This commit is contained in:
Bruno Haible
2025-04-26 14:45:56 +02:00
parent 6c00ca4f97
commit 9273667ad1
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2025-04-26 Bruno Haible <bruno@clisp.org>
Fix -Wshadow=compatible-local warnings.
* src/search.cc (Search::prepare_asso_values): Declare 'temp' in each
'for' loop separately.
2025-04-20 Bruno Haible <bruno@clisp.org> 2025-04-20 Bruno Haible <bruno@clisp.org>
Add some developer documentation. Add some developer documentation.

10
src/search.cc
View File

@@ -743,8 +743,6 @@ Search::find_alpha_inc ()
void void
Search::prepare_asso_values () Search::prepare_asso_values ()
{ {
KeywordExt_List *temp;
/* Initialize each keyword's _selchars array. */ /* Initialize each keyword's _selchars array. */
init_selchars_multiset(_key_positions, _alpha_unify, _alpha_inc); init_selchars_multiset(_key_positions, _alpha_unify, _alpha_inc);
@@ -766,7 +764,7 @@ Search::prepare_asso_values ()
Hash_Table representatives (_list_len, !_hash_includes_len); Hash_Table representatives (_list_len, !_hash_includes_len);
KeywordExt_List *prev = NULL; /* list node before temp */ KeywordExt_List *prev = NULL; /* list node before temp */
for (temp = _head; temp; ) for (KeywordExt_List *temp = _head; temp; )
{ {
KeywordExt *keyword = temp->first(); KeywordExt *keyword = temp->first();
KeywordExt *other_keyword = representatives.insert (keyword); KeywordExt *other_keyword = representatives.insert (keyword);
@@ -831,7 +829,7 @@ Search::prepare_asso_values ()
/* Compute the occurrences of each character in the alphabet. */ /* Compute the occurrences of each character in the alphabet. */
_occurrences = new int[_alpha_size]; _occurrences = new int[_alpha_size];
memset (_occurrences, 0, _alpha_size * sizeof (_occurrences[0])); memset (_occurrences, 0, _alpha_size * sizeof (_occurrences[0]));
for (temp = _head; temp; temp = temp->rest()) for (KeywordExt_List *temp = _head; temp; temp = temp->rest())
{ {
KeywordExt *keyword = temp->first(); KeywordExt *keyword = temp->first();
const unsigned int *ptr = keyword->_selchars; const unsigned int *ptr = keyword->_selchars;
@@ -843,7 +841,7 @@ Search::prepare_asso_values ()
_asso_values = new int[_alpha_size]; _asso_values = new int[_alpha_size];
/* Memory allocation in each Keyword. */ /* Memory allocation in each Keyword. */
for (temp = _head; temp; temp = temp->rest()) for (KeywordExt_List *temp = _head; temp; temp = temp->rest())
{ {
KeywordExt *keyword = temp->first(); KeywordExt *keyword = temp->first();
keyword->_undetermined_chars = new unsigned int[keyword->_selchars_length]; keyword->_undetermined_chars = new unsigned int[keyword->_selchars_length];
@@ -885,14 +883,12 @@ Search::prepare_asso_values ()
int field_width; int field_width;
field_width = 0; field_width = 0;
{
for (KeywordExt_List *temp = _head; temp; temp = temp->rest()) for (KeywordExt_List *temp = _head; temp; temp = temp->rest())
{ {
KeywordExt *keyword = temp->first(); KeywordExt *keyword = temp->first();
if (field_width < keyword->_selchars_length) if (field_width < keyword->_selchars_length)
field_width = keyword->_selchars_length; field_width = keyword->_selchars_length;
} }
}
fprintf (stderr, "\ndumping the keyword list without duplicates\n"); fprintf (stderr, "\ndumping the keyword list without duplicates\n");
fprintf (stderr, "keyword #, %*s, keyword\n", field_width, "keysig"); fprintf (stderr, "keyword #, %*s, keyword\n", field_width, "keysig");