From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 16 Mar 2011 21:34:32 +0000 (-0700)
Subject: * character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6670b0ba2834d8996162596a55e09b1428e4ee6;p=emacs.git

* character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):

Rename locals to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bdb71c582b..e68f478cb40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):
+	Rename locals to avoid shadowing.
+
 	* lread.c (read1): Rewrite so as not to use empty "else".
 
 	* print.c (Fredirect_debugging_output): Fix pointer signedess.
diff --git a/src/character.h b/src/character.h
index 77c670728d0..4c468e14d2c 100644
--- a/src/character.h
+++ b/src/character.h
@@ -397,11 +397,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \
   do    								     \
     {									     \
-      unsigned char *ptr = &SDATA (STRING)[BYTEIDX];			     \
-      int len;								     \
+      unsigned char *fetch_ptr = &SDATA (STRING)[BYTEIDX];		     \
+      int fetch_len;							     \
 									     \
-      OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);			     \
-      BYTEIDX += len;							     \
+      OUTPUT = STRING_CHAR_AND_LENGTH (fetch_ptr, fetch_len);		     \
+      BYTEIDX += fetch_len;						     \
       CHARIDX++;							     \
     }									     \
   while (0)
@@ -510,8 +510,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define BUF_INC_POS(buf, pos_byte)				\
   do {								\
-    unsigned char *p = BUF_BYTE_ADDRESS (buf, pos_byte);	\
-    pos_byte += BYTES_BY_CHAR_HEAD (*p);			\
+    unsigned char *bbp = BUF_BYTE_ADDRESS (buf, pos_byte);	\
+    pos_byte += BYTES_BY_CHAR_HEAD (*bbp);			\
   } while (0)