diff src/callproc.c @ 21244:50929073a0ba

Use STRING_BYTES and SET_STRING_BYTES.

--- a/src/callproc.c	Sat Mar 21 06:16:35 1998 +0000
+++ b/src/callproc.c	Sat Mar 21 07:06:14 1998 +0000
@@ -445,7 +445,7 @@
 	  for (i = 4; i < nargs; i++)
 	    {
 	      int size = encoding_buffer_size (&argument_coding,
-					       XSTRING (args[i])->size_byte);
+					       STRING_BYTES (XSTRING (args[i])));
 	      unsigned char *dummy1 = (unsigned char *) alloca (size);
 	      int dummy;
 
@@ -454,7 +454,7 @@
 	      encode_coding (&argument_coding,
 			     XSTRING (args[i])->data,
 			     new_argv[i - 3],
-			     XSTRING (args[i])->size_byte,
+			     STRING_BYTES (XSTRING (args[i])),
 			     size);
 	      new_argv[i - 3][argument_coding.produced] = 0;
 	    }
@@ -837,9 +837,9 @@
   strcat (tempfile, "detmp.XXX");
 #endif
 #else /* not DOS_NT */
-  char *tempfile = (char *) alloca (XSTRING (Vtemp_file_name_pattern)->size_byte + 1);
+  char *tempfile = (char *) alloca (STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
   bcopy (XSTRING (Vtemp_file_name_pattern)->data, tempfile,
-	 XSTRING (Vtemp_file_name_pattern)->size_byte + 1);
+	 STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
 #endif /* not DOS_NT */
 
   mktemp (tempfile);
@@ -977,7 +977,7 @@
     register char *temp;
     register int i;
 
-    i = XSTRING (current_dir)->size_byte;
+    i = STRING_BYTES (XSTRING (current_dir));
     pwd_var = (char *) alloca (i + 6);
     temp = pwd_var + 4;
     bcopy ("PWD=", pwd_var, 4);
@@ -1172,7 +1172,7 @@
 
       entry = XCONS (scan)->car;
       if (STRINGP (entry)
-	  && XSTRING (entry)->size_byte > varlen
+	  && STRING_BYTES (XSTRING (entry)) > varlen
 	  && XSTRING (entry)->data[varlen] == '='
 #ifdef WINDOWSNT
 	  /* NT environment variables are case insensitive.  */
@@ -1183,7 +1183,7 @@
 	  )
 	{
 	  *value    = (char *) XSTRING (entry)->data + (varlen + 1);
-	  *valuelen = XSTRING (entry)->size_byte - (varlen + 1);
+	  *valuelen = STRING_BYTES (XSTRING (entry)) - (varlen + 1);
 	  return 1;
 	}
     }
@@ -1202,7 +1202,7 @@
   int valuelen;
 
   CHECK_STRING (var, 0);
-  if (getenv_internal (XSTRING (var)->data, XSTRING (var)->size_byte,
+  if (getenv_internal (XSTRING (var)->data, STRING_BYTES (XSTRING (var)),
 		       &value, &valuelen))
     return make_string (value, valuelen);
   else