diff src/xsmfns.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/xsmfns.c	Sun Jul 14 23:54:05 2002 +0000
+++ b/src/xsmfns.c	Mon Jul 15 00:00:41 2002 +0000
@@ -216,8 +216,8 @@
   props[props_idx]->type = SmARRAY8;
   props[props_idx]->num_vals = 1;
   props[props_idx]->vals = &values[val_idx++];
-  props[props_idx]->vals[0].length = strlen (XSTRING (Vinvocation_name)->data);
-  props[props_idx]->vals[0].value = XSTRING (Vinvocation_name)->data;
+  props[props_idx]->vals[0].length = strlen (SDATA (Vinvocation_name));
+  props[props_idx]->vals[0].value = SDATA (Vinvocation_name);
   ++props_idx;
   
   /* How to restart Emacs (i.e.: /path/to/emacs --smid=xxxx). */
@@ -244,8 +244,8 @@
   props[props_idx]->type = SmARRAY8;
   props[props_idx]->num_vals = 1;
   props[props_idx]->vals = &values[val_idx++];
-  props[props_idx]->vals[0].length = strlen (XSTRING (Vuser_login_name)->data);
-  props[props_idx]->vals[0].value = XSTRING (Vuser_login_name)->data;
+  props[props_idx]->vals[0].length = strlen (SDATA (Vuser_login_name));
+  props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
   ++props_idx;
 
   /* The current directory property, not mandatory */
@@ -407,12 +407,12 @@
   /* Check if we where started by the session manager.  If so, we will
      have a previous id. */
   if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
-    previous_id = XSTRING (Vx_session_previous_id)->data;
+    previous_id = SDATA (Vx_session_previous_id);
 
   /* Construct the path to the Emacs program. */
   if (! EQ (Vinvocation_directory, Qnil))
-    name_len += strlen (XSTRING (Vinvocation_directory)->data);
-  name_len += strlen (XSTRING (Vinvocation_name)->data);
+    name_len += strlen (SDATA (Vinvocation_directory));
+  name_len += strlen (SDATA (Vinvocation_name));
 
   /* This malloc will not be freed, but it is only done once, and hopefully
      not very large  */
@@ -420,8 +420,8 @@
   emacs_program[0] = '\0';
 
   if (! EQ (Vinvocation_directory, Qnil))
-    strcpy (emacs_program, XSTRING (Vinvocation_directory)->data);
-  strcat (emacs_program, XSTRING (Vinvocation_name)->data);
+    strcpy (emacs_program, SDATA (Vinvocation_directory));
+  strcat (emacs_program, SDATA (Vinvocation_name));
   
   /* The SM protocol says all callbacks are mandatory, so set up all
      here and in the mask passed to SmcOpenConnection */