diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-07 20:37:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-07 20:37:19 -0800 |
| commit | 2735d0606bd871584b2e6343f3dce4c1a155b296 (patch) | |
| tree | e9068d2b26d01760d14b97c0fe28f3cbca7886d5 /src/character.h | |
| parent | f38b440c4b40777c25631323f2501ffb5ba98251 (diff) | |
| download | emacs-2735d0606bd871584b2e6343f3dce4c1a155b296.tar.gz | |
* coding.c (Fdefine_coding_system_internal): Don't redeclare 'i' inside
a block, when the outer 'i' will do.
(decode_coding_utf_8, decode_coding_utf_16, detect_coding_emacs_mule):
(emacs_mule_char, decode_coding_emacs_mule, detect_coding_iso_2022):
(decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5):
(decode_coding_raw_text, decode_coding_charset, get_translation_table):
(Fdecode_sjis_char, Fdefine_coding_system_internal):
Rename locals to avoid shadowing.
* character.h (FETCH_STRING_CHAR_ADVANCE): Likewise.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/character.h b/src/character.h index fb29ced66b7..d29ab41557b 100644 --- a/src/character.h +++ b/src/character.h @@ -356,11 +356,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ CHARIDX++; \ if (STRING_MULTIBYTE (STRING)) \ { \ - unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ - int len; \ + unsigned char *string_ptr = &SDATA (STRING)[BYTEIDX]; \ + int string_len; \ \ - OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ - BYTEIDX += len; \ + OUTPUT = STRING_CHAR_AND_LENGTH (string_ptr, string_len); \ + BYTEIDX += string_len; \ } \ else \ { \ |