aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2011-02-25 16:23:33 -0800
committerPaul Eggert2011-02-25 16:23:33 -0800
commit70279bd1cbd56a16b39cb09ac0b47b564db6949b (patch)
tree2a9e29472946b6e7398430fb4ebe38f370bb70e0 /lib-src
parent34e6d7823aeee6c20219bbab1045ca6649ca8fa5 (diff)
downloademacs-70279bd1cbd56a16b39cb09ac0b47b564db6949b.tar.gz
emacs-70279bd1cbd56a16b39cb09ac0b47b564db6949b.zip
* ebrowse.c (insert_keyword): Rename parameter to avoid shadowing diagnostic.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog1
-rw-r--r--lib-src/ebrowse.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 969a84ca6bf..ed6162bc997 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -3,6 +3,7 @@
3 * ebrowse.c (putstr): Rename from PUTSTR and turn into a function. 3 * ebrowse.c (putstr): Rename from PUTSTR and turn into a function.
4 All callers changed. This is cleaner, and avoids GCC warnings about 4 All callers changed. This is cleaner, and avoids GCC warnings about
5 passing NULL to fputs. 5 passing NULL to fputs.
6 (insert_keyword): Rename parameter to avoid shadowing diagnostic.
6 7
72011-02-25 Paul Eggert <eggert@cs.ucla.edu> 82011-02-25 Paul Eggert <eggert@cs.ucla.edu>
8 9
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index bc537ec719c..60baf99c511 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -2063,11 +2063,11 @@ re_init_scanner (void)
2063} 2063}
2064 2064
2065 2065
2066/* Insert a keyword NAME with token value TK into the keyword hash 2066/* Insert a keyword NAME with token value TKV into the keyword hash
2067 table. */ 2067 table. */
2068 2068
2069static void 2069static void
2070insert_keyword (const char *name, int tk) 2070insert_keyword (const char *name, int tkv)
2071{ 2071{
2072 const char *s; 2072 const char *s;
2073 unsigned h = 0; 2073 unsigned h = 0;
@@ -2078,7 +2078,7 @@ insert_keyword (const char *name, int tk)
2078 2078
2079 h %= KEYWORD_TABLE_SIZE; 2079 h %= KEYWORD_TABLE_SIZE;
2080 k->name = name; 2080 k->name = name;
2081 k->tk = tk; 2081 k->tk = tkv;
2082 k->next = keyword_table[h]; 2082 k->next = keyword_table[h];
2083 keyword_table[h] = k; 2083 keyword_table[h] = k;
2084} 2084}