diff src/composite.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.

--- a/src/composite.c	Sun Jul 14 23:54:05 2002 +0000
+++ b/src/composite.c	Mon Jul 15 00:00:41 2002 +0000
@@ -615,8 +615,8 @@
       count = SPECPDL_INDEX ();
       GCPRO1 (string);
       stop = end;
-      ptr = XSTRING (string)->data + string_char_to_byte (string, start);
-      pend = ptr + STRING_BYTES (XSTRING (string));
+      ptr = SDATA (string) + string_char_to_byte (string, start);
+      pend = ptr + SBYTES (string);
     }
   else
     {
@@ -650,7 +650,7 @@
 	    break;
 	  stop = end;
 	  if (STRINGP (string))
-	    ptr = XSTRING (string)->data + string_char_to_byte (string, start);
+	    ptr = SDATA (string) + string_char_to_byte (string, start);
 	  else
 	    ptr = CHAR_POS_ADDR (start);
 	}
@@ -680,7 +680,7 @@
 		    {
 		      start += XINT (val);
 		      if (STRINGP (string))
-			ptr = XSTRING (string)->data + string_char_to_byte (string, start);
+			ptr = SDATA (string) + string_char_to_byte (string, start);
 		      else
 			ptr = CHAR_POS_ADDR (start);
 		    }
@@ -746,7 +746,7 @@
 
   if (XINT (start) < 0 ||
       XINT (start) > XINT (end)
-      || XINT (end) > XSTRING (string)->size)
+      || XINT (end) > SCHARS (string))
     args_out_of_range (start, end);
 
   compose_text (XINT (start), XINT (end), components, mod_func, string);
@@ -779,7 +779,7 @@
   if (!NILP (string))
     {
       CHECK_STRING (string);
-      if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
+      if (XINT (pos) < 0 || XINT (pos) > SCHARS (string))
 	args_out_of_range (string, pos);
     }
   else