Commit a6670b0b authored by Paul Eggert's avatar Paul Eggert
Browse files

* character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):

Rename locals to avoid shadowing.
parent cef2010d
2011-03-16 Paul Eggert <eggert@cs.ucla.edu> 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". * lread.c (read1): Rewrite so as not to use empty "else".
   
* print.c (Fredirect_debugging_output): Fix pointer signedess. * print.c (Fredirect_debugging_output): Fix pointer signedess.
...@@ -397,11 +397,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -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) \ #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \
do \ do \
{ \ { \
unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ unsigned char *fetch_ptr = &SDATA (STRING)[BYTEIDX]; \
int len; \ int fetch_len; \
\ \
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ OUTPUT = STRING_CHAR_AND_LENGTH (fetch_ptr, fetch_len); \
BYTEIDX += len; \ BYTEIDX += fetch_len; \
CHARIDX++; \ CHARIDX++; \
} \ } \
while (0) while (0)
...@@ -510,8 +510,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -510,8 +510,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BUF_INC_POS(buf, pos_byte) \ #define BUF_INC_POS(buf, pos_byte) \
do { \ do { \
unsigned char *p = BUF_BYTE_ADDRESS (buf, pos_byte); \ unsigned char *bbp = BUF_BYTE_ADDRESS (buf, pos_byte); \
pos_byte += BYTES_BY_CHAR_HEAD (*p); \ pos_byte += BYTES_BY_CHAR_HEAD (*bbp); \
} while (0) } while (0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment