# HG changeset patch # User Ken Raeburn # Date 1026837426 0 # Node ID 2eb3c4881e5a22acfba7f4d3243025cf8f9396a3 # Parent dd231f1390d2bc75c2463f9fd204173abaeb2fa3 (FETCH_STRING_CHAR_ADVANCE, FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES instead of XSTRING()->size_byte. diff -r dd231f1390d2 -r 2eb3c4881e5a src/charset.h --- a/src/charset.h Tue Jul 16 16:35:27 2002 +0000 +++ b/src/charset.h Tue Jul 16 16:37:06 2002 +0000 @@ -574,7 +574,7 @@ if (STRING_MULTIBYTE (STRING)) \ { \ unsigned char *ptr = SDATA (STRING) + BYTEIDX; \ - int space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ + int space_left = SBYTES (STRING) - BYTEIDX; \ int actual_len; \ \ OUTPUT = STRING_CHAR_AND_LENGTH (ptr, space_left, actual_len); \ @@ -591,7 +591,7 @@ if (1) \ { \ unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX; \ - int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ + int fetch_string_char_space_left = SBYTES (STRING) - BYTEIDX; \ int actual_len; \ \ OUTPUT \