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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ccl.c b/src/ccl.c
index 18fcad40328..d85045252b8 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2198,12 +2198,12 @@ See the documentation of `define-ccl-program' for the detail of CCL program.  */
       if (ccl.ic < i && i < ccl.size)
         ccl.ic = i;
     }
-  outbufsize = STRING_BYTES (XSTRING (str)) * ccl.buf_magnification + 256;
+  outbufsize = SBYTES (str) * ccl.buf_magnification + 256;
   outbuf = (char *) xmalloc (outbufsize);
   ccl.last_block = NILP (contin);
   ccl.multibyte = STRING_MULTIBYTE (str);
-  produced = ccl_driver (&ccl, XSTRING (str)->data, outbuf,
-                         STRING_BYTES (XSTRING (str)), outbufsize, (int *) 0);
+  produced = ccl_driver (&ccl, SDATA (str), outbuf,
+                         SBYTES (str), outbufsize, (int *) 0);
   for (i = 0; i < 8; i++)
     XSET (AREF (status, i), Lisp_Int, ccl.reg[i]);
   XSETINT (AREF (status, 8), ccl.ic);