[Emacs-diffs] emacs/src ChangeLog nsfont.m term.c w32.c w32fo...

[Jim Meyering]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jim Meyering <meyering> 09/06/29 05:28:56

Modified files:
        src            : ChangeLog nsfont.m term.c w32.c w32font.c 
                         xfaces.c xselect.c 

Log message:
        Remove useless if-before-xfree tests.
        
        * nsfont.m (nsfont_close): Remove useless test.
        * term.c (delete_tty): Likewise.
        * w32.c (system_process_attributes): Likewise.
        * w32font.c (w32font_close): Likewise.
        * xfaces.c (x_free_gc): Likewise.
        * xselect.c (buffer): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7613&r2=1.7614
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32.c?cvsroot=emacs&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32font.c?cvsroot=emacs&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.436&r2=1.437
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xselect.c?cvsroot=emacs&r1=1.189&r2=1.190

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7613
retrieving revision 1.7614
diff -u -b -r1.7613 -r1.7614
--- ChangeLog   28 Jun 2009 20:12:20 -0000      1.7613
+++ ChangeLog   29 Jun 2009 05:28:54 -0000      1.7614
@@ -1,3 +1,13 @@
+2009-06-29  Jim Meyering  <address@hidden>
+
+       Remove useless if-before-xfree test.
+       * nsfont.m (nsfont_close): Remove useless test.
+       * term.c (delete_tty): Likewise.
+       * w32.c (system_process_attributes): Likewise.
+       * w32font.c (w32font_close): Likewise.
+       * xfaces.c (x_free_gc): Likewise.
+       * xselect.c (buffer): Likewise.
+
 2009-06-28  Andreas Schwab  <address@hidden>
 
        * process.c (send_process): Keep decoded string in a local

Index: nsfont.m
===================================================================
RCS file: /cvsroot/emacs/emacs/src/nsfont.m,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- nsfont.m    15 Jun 2009 04:34:52 -0000      1.26
+++ nsfont.m    29 Jun 2009 05:28:55 -0000      1.27
@@ -868,9 +868,7 @@
 
   for (i =0; i<0x100; i++)
     {
-      if (font_info->glyphs[i])
         xfree (font_info->glyphs[i]);
-      if (font_info->metrics[i])
         xfree (font_info->metrics[i]);
     }
   [font_info->nsfont release];

Index: term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/term.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- term.c      28 Jun 2009 19:06:50 -0000      1.244
+++ term.c      29 Jun 2009 05:28:55 -0000      1.245
@@ -4018,9 +4018,7 @@
 
   xfree (tty->old_tty);
   xfree (tty->Wcm);
-  if (tty->termcap_strings_buffer)
     xfree (tty->termcap_strings_buffer);
-  if (tty->termcap_term_buffer)
     xfree (tty->termcap_term_buffer);
 
   bzero (tty, sizeof (struct tty_display_info));

Index: w32.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- w32.c       21 Mar 2009 11:29:29 -0000      1.161
+++ w32.c       29 Jun 2009 05:28:55 -0000      1.162
@@ -3995,7 +3995,6 @@
                }
            }
        }
-      if (buf)
        xfree (buf);
     }
   if (!result)

Index: w32font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32font.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- w32font.c   23 Jun 2009 05:50:20 -0000      1.73
+++ w32font.c   29 Jun 2009 05:28:55 -0000      1.74
@@ -289,7 +289,6 @@
     {
       for (i = 0; i < w32_font->n_cache_blocks; i++)
         {
-          if (w32_font->cached_metrics[i])
             xfree (w32_font->cached_metrics[i]);
         }
       xfree (w32_font->cached_metrics);

Index: xfaces.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfaces.c,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -b -r1.436 -r1.437
--- xfaces.c    9 Jun 2009 05:57:37 -0000       1.436
+++ xfaces.c    29 Jun 2009 05:28:56 -0000      1.437
@@ -785,7 +785,6 @@
      struct frame *f;
      GC gc;
 {
-  if (gc)
       xfree (gc);
 }
 #endif  /* HAVE_NS */

Index: xselect.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xselect.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- xselect.c   8 Jan 2009 03:16:12 -0000       1.189
+++ xselect.c   29 Jun 2009 05:28:56 -0000      1.190
@@ -2395,7 +2395,6 @@
 
   if (!data || !format)
     {
-      if (data)
        xfree (data);
       return Qnil;
     }