[Emacs-diffs] /srv/bzr/emacs/trunk r108768: * alloc.c (allocate_string): Omit intervals initialization.

[Dmitry Antipov]

------------------------------------------------------------
revno: 108768
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-27 18:35:51 +0400
message:
  * alloc.c (allocate_string): Omit intervals initialization.
  * alloc.c (make_uninit_multibyte_string): Initialize intervals
  as in make_pure_string and make_pure_c_string.
modified:
  src/ChangeLog
  src/alloc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-27 11:25:56 +0000
+++ b/src/ChangeLog     2012-06-27 14:35:51 +0000
@@ -1,5 +1,11 @@
 2012-06-27  Dmitry Antipov  <address@hidden>
 
+       * alloc.c (allocate_string): Omit intervals initialization.
+       * alloc.c (make_uninit_multibyte_string): Initialize intervals
+       as in make_pure_string and make_pure_c_string.
+
+2012-06-27  Dmitry Antipov  <address@hidden>
+
        * alloc.c (allocate_string):  Fix last change.
 
 2012-06-27  Dmitry Antipov  <address@hidden>

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-06-27 11:25:56 +0000
+++ b/src/alloc.c       2012-06-27 14:35:51 +0000
@@ -1959,10 +1959,6 @@
 
   MALLOC_UNBLOCK_INPUT;
 
-  /* SIZE and SIZE_BYTE fields will be initialized
-     by calling allocate_string_data.  */
-  s->intervals = NULL_INTERVAL;
-
   --total_free_strings;
   ++total_strings;
   ++strings_consed;
@@ -2529,6 +2525,7 @@
     return empty_multibyte_string;
 
   s = allocate_string ();
+  s->intervals = NULL_INTERVAL;
   allocate_string_data (s, nchars, nbytes);
   XSETSTRING (string, s);
   string_chars_consed += nbytes;