Mercurial > emacs
diff src/doc.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 | 8cd0a6343a84 |
| children | fce0c8c246d1 |
line wrap: on
line diff
--- a/src/doc.c Sat Mar 21 06:16:35 1998 +0000 +++ b/src/doc.c Sat Mar 21 07:06:14 1998 +0000 @@ -562,11 +562,11 @@ if (NILP (keymap)) keymap = Voverriding_local_map; - bsize = XSTRING (string)->size_byte; + bsize = STRING_BYTES (XSTRING (string)); bufp = buf = (unsigned char *) xmalloc (bsize); strp = (unsigned char *) XSTRING (string)->data; - while (strp < XSTRING (string)->data + XSTRING (string)->size_byte) + while (strp < XSTRING (string)->data + STRING_BYTES (XSTRING (string))) { if (strp[0] == '\\' && strp[1] == '=') { @@ -577,7 +577,7 @@ if (multibyte) { int len; - int maxlen = XSTRING (string)->data + XSTRING (string)->size_byte - strp; + int maxlen = XSTRING (string)->data + STRING_BYTES (XSTRING (string)) - strp; STRING_CHAR_AND_LENGTH (strp, maxlen, len); if (len == 1) @@ -600,7 +600,7 @@ start = strp; while ((strp - (unsigned char *) XSTRING (string)->data - < XSTRING (string)->size_byte) + < STRING_BYTES (XSTRING (string))) && *strp != ']') strp++; length_byte = strp - start; @@ -685,7 +685,7 @@ insert_string ("\nUses keymap \""); insert_from_string (name, 0, 0, XSTRING (name)->size, - XSTRING (name)->size_byte, 1); + STRING_BYTES (XSTRING (name)), 1); insert_string ("\", which is not currently defined.\n"); if (start[-1] == '<') keymap = Qnil; } @@ -700,7 +700,7 @@ subst_string: start = XSTRING (tem)->data; length = XSTRING (tem)->size; - length_byte = XSTRING (tem)->size_byte; + length_byte = STRING_BYTES (XSTRING (tem)); subst: new = (unsigned char *) xrealloc (buf, bsize += length_byte); bufp += new - buf; @@ -716,7 +716,7 @@ else { int len; - int maxlen = XSTRING (string)->data + XSTRING (string)->size_byte - strp; + int maxlen = XSTRING (string)->data + STRING_BYTES (XSTRING (string)) - strp; STRING_CHAR_AND_LENGTH (strp, maxlen, len); if (len == 1)