diff src/mac.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/mac.c	Sun Jul 14 23:54:05 2002 +0000
+++ b/src/mac.c	Mon Jul 15 00:00:41 2002 +0000
@@ -2048,7 +2048,7 @@
 
 	  if (NILP (path))
 	    return -1;
-	  if (posix_to_mac_pathname (XSTRING (path)->data, tempmacpathname,
+	  if (posix_to_mac_pathname (SDATA (path), tempmacpathname,
 				    MAXPATHLEN+1) == 0)
 	    return -1;
 	}
@@ -2529,7 +2529,7 @@
 
   CHECK_STRING (script);
   
-  status = do_applescript (XSTRING (script)->data, &result);
+  status = do_applescript (SDATA (script), &result);
   if (status)
     {
       if (!result)
@@ -2566,7 +2566,7 @@
 
   CHECK_STRING (mac_filename);
   
-  if (mac_to_posix_pathname (XSTRING (mac_filename)->data, posix_filename,
+  if (mac_to_posix_pathname (SDATA (mac_filename), posix_filename,
 			   MAXPATHLEN))
     return build_string (posix_filename);
   else
@@ -2584,7 +2584,7 @@
 
   CHECK_STRING (posix_filename);
   
-  if (posix_to_mac_pathname (XSTRING (posix_filename)->data, mac_filename,
+  if (posix_to_mac_pathname (SDATA (posix_filename), mac_filename,
 			   MAXPATHLEN))
     return build_string (mac_filename);
   else
@@ -2670,9 +2670,9 @@
 
   CHECK_STRING (value);
   
-  len = XSTRING (value)->size;
+  len = SCHARS (value);
   buf = (char *) alloca (len+1);
-  bcopy (XSTRING (value)->data, buf, len);
+  bcopy (SDATA (value), buf, len);
   buf[len] = '\0';
   
   /* convert to Mac-style eol's before sending to clipboard */