Mercurial > emacs
diff src/character.h @ 106185:f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
ignored second argument. All callers changed.
* regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR)
(RE_STRING_CHAR_AND_LENGTH): Likewise.
* xdisp.c (string_char_and_length): Likewise.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 21 Nov 2009 11:52:23 +0000 |
| parents | 89183b6f6e9d |
| children | 1d1d5d9bd884 |
line wrap: on
line diff
--- a/src/character.h Sat Nov 21 10:32:20 2009 +0000 +++ b/src/character.h Sat Nov 21 11:52:23 2009 +0000 @@ -311,10 +311,9 @@ } while (0) /* Return the character code of character whose multibyte form is at - P. The argument LEN is ignored. It will be removed in the - future. */ + P. */ -#define STRING_CHAR(p, len) \ +#define STRING_CHAR(p) \ (!((p)[0] & 0x80) \ ? (p)[0] \ : ! ((p)[0] & 0x20) \ @@ -329,10 +328,9 @@ /* Like STRING_CHAR, but set ACTUAL_LEN to the length of multibyte - form. The argument LEN is ignored. It will be removed in the - future. */ + form. */ -#define STRING_CHAR_AND_LENGTH(p, len, actual_len) \ +#define STRING_CHAR_AND_LENGTH(p, actual_len) \ (!((p)[0] & 0x80) \ ? ((actual_len) = 1, (p)[0]) \ : ! ((p)[0] & 0x20) \ @@ -382,7 +380,7 @@ unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ int len; \ \ - OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len); \ + OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ BYTEIDX += len; \ } \ else \ @@ -405,7 +403,7 @@ unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ int len; \ \ - OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len); \ + OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ BYTEIDX += len; \ } \ else \ @@ -426,7 +424,7 @@ unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ int len; \ \ - OUTPUT = STRING_CHAR_AND_LENGTH (ptr, 0, len); \ + OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ BYTEIDX += len; \ CHARIDX++; \ } \ @@ -445,7 +443,7 @@ unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \ int len; \ \ - OUTPUT= STRING_CHAR_AND_LENGTH (ptr, 0, len); \ + OUTPUT= STRING_CHAR_AND_LENGTH (ptr, len); \ BYTEIDX += len; \ } \ else \ @@ -465,7 +463,7 @@ unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \ int len; \ \ - OUTPUT= STRING_CHAR_AND_LENGTH (ptr, 0, len); \ + OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ BYTEIDX += len; \ CHARIDX++; \ } \