From 70279bd1cbd56a16b39cb09ac0b47b564db6949b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 25 Feb 2011 16:23:33 -0800 Subject: [PATCH] * ebrowse.c (insert_keyword): Rename parameter to avoid shadowing diagnostic. --- lib-src/ChangeLog | 1 + lib-src/ebrowse.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 969a84ca6b..ed6162bc99 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -3,6 +3,7 @@ * ebrowse.c (putstr): Rename from PUTSTR and turn into a function. All callers changed. This is cleaner, and avoids GCC warnings about passing NULL to fputs. + (insert_keyword): Rename parameter to avoid shadowing diagnostic. 2011-02-25 Paul Eggert diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index bc537ec719..60baf99c51 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -2063,11 +2063,11 @@ re_init_scanner (void) } -/* Insert a keyword NAME with token value TK into the keyword hash +/* Insert a keyword NAME with token value TKV into the keyword hash table. */ static void -insert_keyword (const char *name, int tk) +insert_keyword (const char *name, int tkv) { const char *s; unsigned h = 0; @@ -2078,7 +2078,7 @@ insert_keyword (const char *name, int tk) h %= KEYWORD_TABLE_SIZE; k->name = name; - k->tk = tk; + k->tk = tkv; k->next = keyword_table[h]; keyword_table[h] = k; } -- 2.20.1