Mercurial > emacs
diff src/lread.c @ 21244:50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 21 Mar 1998 07:06:14 +0000 |
| parents | 8cbc0182c543 |
| children | 05fbf4f5b14f |
line wrap: on
line diff
--- a/src/lread.c Sat Mar 21 06:16:35 1998 +0000 +++ b/src/lread.c Sat Mar 21 07:06:14 1998 +0000 @@ -1157,12 +1157,12 @@ CHECK_STRING (string,0); if (NILP (end)) - endval = XSTRING (string)->size_byte; + endval = STRING_BYTES (XSTRING (string)); else { CHECK_NUMBER (end, 2); endval = string_char_to_byte (string, XINT (end)); - if (endval < 0 || endval > XSTRING (string)->size_byte) + if (endval < 0 || endval > STRING_BYTES (XSTRING (string))) args_out_of_range (string, end); } @@ -2255,7 +2255,7 @@ tem = oblookup (obarray, XSTRING (string)->data, XSTRING (string)->size, - XSTRING (string)->size_byte); + STRING_BYTES (XSTRING (string))); if (!INTEGERP (tem)) return tem; @@ -2292,7 +2292,7 @@ tem = oblookup (obarray, XSTRING (string)->data, XSTRING (string)->size, - XSTRING (string)->size_byte); + STRING_BYTES (XSTRING (string))); if (!INTEGERP (tem)) return tem; return Qnil; @@ -2323,7 +2323,7 @@ tem = oblookup (obarray, XSTRING (string)->data, XSTRING (string)->size, - XSTRING (string)->size_byte); + STRING_BYTES (XSTRING (string))); if (INTEGERP (tem)) return Qnil; /* If arg was a symbol, don't delete anything but that symbol itself. */ @@ -2398,7 +2398,7 @@ else for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next)) { - if (XSYMBOL (tail)->name->size_byte == size_byte + if (STRING_BYTES (XSYMBOL (tail)->name) == size_byte && XSYMBOL (tail)->name->size == size && !bcmp (XSYMBOL (tail)->name->data, ptr, size_byte)) return tail;