comparison src/alloc.c @ 21244:50929073a0ba

Use STRING_BYTES and SET_STRING_BYTES.

21243:e82a4a4fa12a

		  (struct Lisp_String *) current_string_block->chars);
    }
    
  string_chars_consed += fullsize;
  XSTRING (val)->size = length;
  XSTRING (val)->size_byte = length_byte;
  XSTRING (val)->data[length_byte] = 0;
  INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL);

  return val;
}

  if (pureptr + size > PURESIZE)
    error ("Pure Lisp storage exhausted");
  XSETSTRING (new, PUREBEG + pureptr);
  XSTRING (new)->size = length;
  XSTRING (new)->size_byte = length_byte;
  bcopy (data, XSTRING (new)->data, length_byte);
  XSTRING (new)->data[length_byte] = 0;

  /* We must give strings in pure storage some kind of interval.  So we
     give them a null one.  */

  else if (FLOATP (obj))
    return make_pure_float (XFLOAT (obj)->data);
#endif /* LISP_FLOAT_TYPE */
  else if (STRINGP (obj))
    return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size,
			     XSTRING (obj)->size_byte);
  else if (COMPILEDP (obj) || VECTORP (obj))
    {
      register struct Lisp_Vector *vec;
      register int i, size;

	  register struct Lisp_String *nextstr
	    = (struct Lisp_String *) &from_sb->chars[pos];

	  register struct Lisp_String *newaddr;
	  register EMACS_INT size = nextstr->size;
	  EMACS_INT size_byte = nextstr->size_byte;

	  /* NEXTSTR is the old address of the next string.
	     Just skip it if it isn't marked.  */
	  if (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE)
	    {

21244:50929073a0ba

		  (struct Lisp_String *) current_string_block->chars);
    }
    
  string_chars_consed += fullsize;
  XSTRING (val)->size = length;
  SET_STRING_BYTES (XSTRING (val), length_byte);
  XSTRING (val)->data[length_byte] = 0;
  INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL);

  return val;
}

  if (pureptr + size > PURESIZE)
    error ("Pure Lisp storage exhausted");
  XSETSTRING (new, PUREBEG + pureptr);
  XSTRING (new)->size = length;
  SET_STRING_BYTES (XSTRING (new), length_byte);
  bcopy (data, XSTRING (new)->data, length_byte);
  XSTRING (new)->data[length_byte] = 0;

  /* We must give strings in pure storage some kind of interval.  So we
     give them a null one.  */

  else if (FLOATP (obj))
    return make_pure_float (XFLOAT (obj)->data);
#endif /* LISP_FLOAT_TYPE */
  else if (STRINGP (obj))
    return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size,
			     STRING_BYTES (XSTRING (obj)));
  else if (COMPILEDP (obj) || VECTORP (obj))
    {
      register struct Lisp_Vector *vec;
      register int i, size;

	  register struct Lisp_String *nextstr
	    = (struct Lisp_String *) &from_sb->chars[pos];

	  register struct Lisp_String *newaddr;
	  register EMACS_INT size = nextstr->size;
	  EMACS_INT size_byte = STRING_BYTES (nextstr);

	  /* NEXTSTR is the old address of the next string.
	     Just skip it if it isn't marked.  */
	  if (((EMACS_UINT) size & ~DONT_COPY_FLAG) > STRING_BLOCK_SIZE)
	    {