[Emacs-diffs] /srv/bzr/emacs/trunk r108772: * alloc.c (allocate_string_data): Remove dead code.

[Dmitry Antipov]

------------------------------------------------------------
revno: 108772
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-27 19:46:48 +0400
message:
  * alloc.c (allocate_string_data): Remove dead code.
  * xsettings.c (XSETTINGS_FONT_NAME): Move under HAVE_XFT to
  avoid GCC warning about unused macro.
modified:
  src/ChangeLog
  src/alloc.c
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-27 14:35:51 +0000
+++ b/src/ChangeLog     2012-06-27 15:46:48 +0000
@@ -1,5 +1,11 @@
 2012-06-27  Dmitry Antipov  <address@hidden>
 
+       * alloc.c (allocate_string_data): Remove dead code.
+       * xsettings.c (XSETTINGS_FONT_NAME): Move under HAVE_XFT to
+       avoid GCC warning about unused macro.
+
+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.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-06-27 14:35:51 +0000
+++ b/src/alloc.c       2012-06-27 15:46:48 +0000
@@ -1991,9 +1991,9 @@
 allocate_string_data (struct Lisp_String *s,
                      EMACS_INT nchars, EMACS_INT nbytes)
 {
-  struct sdata *data, *old_data;
+  struct sdata *data;
   struct sblock *b;
-  ptrdiff_t needed, old_nbytes;
+  ptrdiff_t needed;
 
   if (STRING_BYTES_MAX < nbytes)
     string_overflow ();
@@ -2001,8 +2001,6 @@
   /* Determine the number of bytes needed to store NBYTES bytes
      of string data.  */
   needed = SDATA_SIZE (nbytes);
-  old_data = s->data ? SDATA_OF_STRING (s) : NULL;
-  old_nbytes = GC_STRING_BYTES (s);
 
   MALLOC_BLOCK_INPUT;
 
@@ -2072,16 +2070,6 @@
   memcpy ((char *) data + needed, string_overrun_cookie,
          GC_STRING_OVERRUN_COOKIE_SIZE);
 #endif
-
-  /* If S had already data assigned, mark that as free by setting its
-     string back-pointer to null, and recording the size of the data
-     in it.  */
-  if (old_data)
-    {
-      SDATA_NBYTES (old_data) = old_nbytes;
-      old_data->string = NULL;
-    }
-
   consing_since_gc += needed;
 }
 

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2012-04-09 13:05:48 +0000
+++ b/src/xsettings.c   2012-06-27 15:46:48 +0000
@@ -159,8 +159,9 @@
                                 XCAR (dpyinfo->name_list_element));
 }
 
-
+#ifdef HAVE_XFT
 #define XSETTINGS_FONT_NAME       "Gtk/FontName"
+#endif
 #define XSETTINGS_TOOL_BAR_STYLE  "Gtk/ToolbarStyle"
 
 enum {