From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 8 Mar 2011 00:22:52 +0000 (-0800)
Subject: * charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f60958682b055102431c24a30b598a2bf3ec97c3;p=emacs.git

* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid

shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e3b3c8c2566..ec7322cfe43 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,3 @@
-2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
-
 2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xmenu.c (menu_highlight_callback): Now static.
@@ -30,6 +28,10 @@
 	* window.h (check_all_windows): New decl, to forestall
 	gcc -Wmissing-prototypes diagnostic.
 
+	* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid
+	shadowing.
+	* charset.c (map_charset_for_dump, Fchar_charset): Likewise.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
diff --git a/src/charset.c b/src/charset.c
index 3624e740acb..f2fcb5bf9d7 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -668,9 +668,9 @@ map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object
 
   while (1)
     {
-      int index = GET_TEMP_CHARSET_WORK_ENCODER (c);
+      int idx = GET_TEMP_CHARSET_WORK_ENCODER (c);
 
-      if (index >= from_idx && index <= to_idx)
+      if (idx >= from_idx && idx <= to_idx)
 	{
 	  if (NILP (XCAR (range)))
 	    XSETCAR (range, make_number (c));
@@ -2066,10 +2066,10 @@ that case, find the charset from what supported by that coding system.  */)
 
 	  for (; CONSP (restriction); restriction = XCDR (restriction))
 	    {
-	      struct charset *charset;
+	      struct charset *rcharset;
 
-	      CHECK_CHARSET_GET_CHARSET (XCAR (restriction), charset);
-	      if (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset))
+	      CHECK_CHARSET_GET_CHARSET (XCAR (restriction), rcharset);
+	      if (ENCODE_CHAR (rcharset, c) != CHARSET_INVALID_CODE (rcharset))
 		return XCAR (restriction);
 	    }
 	  return Qnil;
diff --git a/src/charset.h b/src/charset.h
index 1fc552a5bd3..8c87ffe6c3d 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -358,9 +358,9 @@ extern int emacs_mule_charset[256];
 
 #define CHECK_CHARSET_GET_CHARSET(x, charset)	\
   do {						\
-    int id;					\
-    CHECK_CHARSET_GET_ID (x, id);		\
-    charset = CHARSET_FROM_ID (id);		\
+    int csid;					\
+    CHECK_CHARSET_GET_ID (x, csid);		\
+    charset = CHARSET_FROM_ID (csid);		\
   } while (0)
 
 
@@ -541,4 +541,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object),
                                struct charset *, unsigned, unsigned);
 
 #endif /* EMACS_CHARSET_H */
-