(FETCH_STRING_CHAR_ADVANCE, FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES

instead of XSTRING()->size_byte.

diff --git a/src/ChangeLog b/src/ChangeLog
index 29f28059f6196ffb70890f606039aa82554e2a3d..d0cf9f06534f5c7f769da351358bdd98002251f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2002-07-16  Ken Raeburn  <raeburn@gnu.org>
 
+       * fontset.c (Fset_fontset_font): Use SDATA instead of
+       XSTRING()->data.
+
+       * charset.h (FETCH_STRING_CHAR_ADVANCE,
+       FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES instead of
+       XSTRING()->size_byte.
+
        * lisp.h (SDATA, SREF): Produce rvalue.
        (SSET): New macro.
        * alloc.c (make_event_array): Use SSET for storing into a string.

diff --git a/src/charset.h b/src/charset.h
index d8d504b828343357fc1f68119e554c4f9b00216a..c84d33ca89dd3ed1081a5d57b6c5301f2cb2e5f1 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -574,7 +574,7 @@ if (1)                                                                         \
     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 @@ else
 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                                                                   \