* ebrowse.c (insert_keyword): Rename parameter to avoid shadowing diagnostic.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 969a84ca6bfa43aa608e76fce4bdc9cea4e2fd16..ed6162bc9971e3650c4b33f316010c9cc87a6efa 100644 (file)
--- 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  <eggert@cs.ucla.edu>
 

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index bc537ec719cef181885178a553f1e6e8cc7bfa28..60baf99c5117c9b3661cadabbba869ca49dfb9c4 100644 (file)
--- 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;
 }