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, 6 insertions, 6 deletions

diff --git a/src/w32select.c b/src/w32select.c
index ef0910964e8..1cb5838c6fc 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -125,8 +125,8 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
   
   BLOCK_INPUT;
 
-  nbytes = STRING_BYTES (XSTRING (string)) + 1;
-  src = XSTRING (string)->data;
+  nbytes = SBYTES (string) + 1;
+  src = SDATA (string);
   dst = src;
 
   /* We need to know how many lines there are, since we need CRLF line
@@ -141,7 +141,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
   {
     /* Since we are now handling multilingual text, we must consider
        encoding text for the clipboard.  */
-    int charset_info = find_charset_in_text (src, XSTRING (string)->size,
+    int charset_info = find_charset_in_text (src, SCHARS (string),
                                              nbytes, NULL, Qnil);
 
     if (charset_info == 0)
@@ -202,8 +202,8 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
             && !NILP (Ffboundp (coding.pre_write_conversion)))
           {
             string = run_pre_post_conversion_on_str (string, &coding, 1);
-            src = XSTRING (string)->data;
-            nbytes = STRING_BYTES (XSTRING (string));
+            src = SDATA (string);
+            nbytes = SBYTES (string);
           }
         coding.src_multibyte = 1;
         coding.dst_multibyte = 0;
@@ -368,7 +368,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data,
         /* Convert CRLF line endings (the standard CF_TEXT clipboard
            format) to LF endings as used internally by Emacs.  */
 
-        dst = XSTRING (ret)->data;
+        dst = SDATA (ret);
         while (1)
           {
             unsigned char *next;