emacs: src/doc.c comparison

comparison src/doc.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.

author	Ken Raeburn <raeburn@raeburn.org>
date	Mon, 15 Jul 2002 00:00:41 +0000
parents	65ad2c8b301b
children	23a1cea22d13

comparison

equal deleted inserted replaced

-:dd1d3b1d0053
+:40db0673e6f0
 If it is relative, combine it with Vdoc_directory.  */
 tem = Ffile_name_absolute_p (file);
 if (NILP (tem))
 {
-minsize = XSTRING (Vdoc_directory)->size;
+minsize = SCHARS (Vdoc_directory);
 /* sizeof ("../etc/") == 8 */
 if (minsize < 8)
 	minsize = 8;
-name = (char *) alloca (minsize + XSTRING (file)->size + 8);
+name = (char *) alloca (minsize + SCHARS (file) + 8);
-strcpy (name, XSTRING (Vdoc_directory)->data);
+strcpy (name, SDATA (Vdoc_directory));
-strcat (name, XSTRING (file)->data);
+strcat (name, SDATA (file));
 munge_doc_file_name (name);
 }
 else
 {
-name = (char *) XSTRING (file)->data;
+name = (char *) SDATA (file);
 }
 fd = emacs_open (name, O_RDONLY, 0);
 if (fd < 0)
 {
 if (!NILP (Vpurify_flag))
 	{
 	  /* Preparing to dump; DOC file is probably not installed.
 	     So check in ../etc. */
 	  strcpy (name, "../etc/");
-	  strcat (name, XSTRING (file)->data);
+	  strcat (name, SDATA (file));
 	  munge_doc_file_name (name);
 	  fd = emacs_open (name, O_RDONLY, 0);
 	}
 #endif
 (!NILP (Vpurify_flag))
 #else /* CANNOT_DUMP */
 (0)
 #endif /* CANNOT_DUMP */
 {
-name = (char *) alloca (XSTRING (filename)->size + 14);
+name = (char *) alloca (SCHARS (filename) + 14);
 strcpy (name, "../etc/");
 }
 else
 {
 CHECK_STRING (Vdoc_directory);
-name = (char *) alloca (XSTRING (filename)->size
+name = (char *) alloca (SCHARS (filename)
-			  + XSTRING (Vdoc_directory)->size + 1);
+			  + SCHARS (Vdoc_directory) + 1);
-strcpy (name, XSTRING (Vdoc_directory)->data);
+strcpy (name, SDATA (Vdoc_directory));
 }
-strcat (name, XSTRING (filename)->data); 	/*** Add this line ***/
+strcat (name, SDATA (filename)); 	/*** Add this line ***/
 #ifdef VMS
 #ifndef VMS4_4
 /* For VMS versions with limited file name syntax,
 convert the name to something VMS will allow.  */
 p = name;
 or from a \\<mapname> construct in STRING itself..  */
 keymap = current_kboard->Voverriding_terminal_local_map;
 if (NILP (keymap))
 keymap = Voverriding_local_map;
-bsize = STRING_BYTES (XSTRING (string));
+bsize = SBYTES (string);
 bufp = buf = (unsigned char *) xmalloc (bsize);
-strp = (unsigned char *) XSTRING (string)->data;
+strp = (unsigned char *) SDATA (string);
-while (strp < XSTRING (string)->data + STRING_BYTES (XSTRING (string)))
+while (strp < SDATA (string) + SBYTES (string))
 {
 if (strp[0] == '\\' && strp[1] == '=')
 	{
 	  /* \= quotes the next character;
 	     thus, to put in \[ without its special meaning, use \=\[.  */
 	  changed = 1;
 	  strp += 2;
 	  if (multibyte)
 	    {
 	      int len;
-	      int maxlen = XSTRING (string)->data + STRING_BYTES (XSTRING (string)) - strp;
+	      int maxlen = SDATA (string) + SBYTES (string) - strp;
 	      STRING_CHAR_AND_LENGTH (strp, maxlen, len);
 	      if (len == 1)
 		*bufp = *strp;
 	      else
 	  int start_idx;
 	  changed = 1;
 	  strp += 2;		/* skip \[ */
 	  start = strp;
-	  start_idx = start - XSTRING (string)->data;
+	  start_idx = start - SDATA (string);
-	  while ((strp - (unsigned char *) XSTRING (string)->data
+	  while ((strp - (unsigned char *) SDATA (string)
-		  < STRING_BYTES (XSTRING (string)))
+		  < SBYTES (string))
 		 && *strp != ']')
 	    strp++;
 	  length_byte = strp - start;
 	  strp++;		/* skip ] */
 	  /* Save STRP in IDX.  */
-	  idx = strp - (unsigned char *) XSTRING (string)->data;
+	  idx = strp - (unsigned char *) SDATA (string);
 	  tem = Fintern (make_string (start, length_byte), Qnil);
 	  /* Note the Fwhere_is_internal can GC, so we have to take
 	     relocation of string contents into account.  */
 	  tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
-	  strp = XSTRING (string)->data + idx;
+	  strp = SDATA (string) + idx;
-	  start = XSTRING (string)->data + start_idx;
+	  start = SDATA (string) + start_idx;
 	  /* Disregard menu bar bindings; it is positively annoying to
 	     mention them when there's no menu bar, and it isn't terribly
 	     useful even when there is a menu bar.  */
 	  if (!NILP (tem))
 	  int start_idx;
 	  changed = 1;
 	  strp += 2;		/* skip \{ or \< */
 	  start = strp;
-	  start_idx = start - XSTRING (string)->data;
+	  start_idx = start - SDATA (string);
-	  while ((strp - (unsigned char *) XSTRING (string)->data
+	  while ((strp - (unsigned char *) SDATA (string)
-		  < XSTRING (string)->size)
+		  < SCHARS (string))
 		 && *strp != '}' && *strp != '>')
 	    strp++;
 	  length_byte = strp - start;
 	  strp++;			/* skip } or > */
 	  /* Save STRP in IDX.  */
-	  idx = strp - (unsigned char *) XSTRING (string)->data;
+	  idx = strp - (unsigned char *) SDATA (string);
 	  /* Get the value of the keymap in TEM, or nil if undefined.
 	     Do this while still in the user's current buffer
 	     in case it is a local variable.  */
 	  name = Fintern (make_string (start, length_byte), Qnil);
 	      tem = Fsymbol_value (name);
 	      if (! NILP (tem))
 		{
 		  tem = get_keymap (tem, 0, 1);
 		  /* Note that get_keymap can GC.  */
-		  strp = XSTRING (string)->data + idx;
+		  strp = SDATA (string) + idx;
-		  start = XSTRING (string)->data + start_idx;
+		  start = SDATA (string) + start_idx;
 		}
 	    }
 	  /* Now switch to a temp buffer.  */
 	  oldbuf = current_buffer;
 	  if (NILP (tem))
 	    {
 	      name = Fsymbol_name (name);
 	      insert_string ("\nUses keymap \"");
 	      insert_from_string (name, 0, 0,
-				  XSTRING (name)->size,
+				  SCHARS (name),
-				  STRING_BYTES (XSTRING (name)), 1);
+				  SBYTES (name), 1);
 	      insert_string ("\", which is not currently defined.\n");
 	      if (start[-1] == '<') keymap = Qnil;
 	    }
 	  else if (start[-1] == '<')
 	    keymap = tem;
 	  tem = Fbuffer_string ();
 	  Ferase_buffer ();
 	  set_buffer_internal (oldbuf);
 	subst_string:
-	  start = XSTRING (tem)->data;
+	  start = SDATA (tem);
-	  length = XSTRING (tem)->size;
+	  length = SCHARS (tem);
-	  length_byte = STRING_BYTES (XSTRING (tem));
+	  length_byte = SBYTES (tem);
 	subst:
 	  {
 	    int offset = bufp - buf;
 	    buf = (unsigned char *) xrealloc (buf, bsize += length_byte);
 	    bufp = buf + offset;
 	    bcopy (start, bufp, length_byte);
 	    bufp += length_byte;
 	    nchars += length;
 	    /* Check STRING again in case gc relocated it.  */
-	    strp = (unsigned char *) XSTRING (string)->data + idx;
+	    strp = (unsigned char *) SDATA (string) + idx;
 	  }
 	}
 else if (! multibyte)		/* just copy other chars */
 	*bufp++ = *strp++, nchars++;
 else
 	{
 	  int len;
-	  int maxlen = XSTRING (string)->data + STRING_BYTES (XSTRING (string)) - strp;
+	  int maxlen = SDATA (string) + SBYTES (string) - strp;
 	  STRING_CHAR_AND_LENGTH (strp, maxlen, len);
 	  if (len == 1)
 	    *bufp = *strp;
 	  else

Mercurial > emacs

comparison src/doc.c @ 46370:40db0673e6f0