[Emacs-diffs] Changes to emacs/src/macterm.c,v

[Jim Meyering]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jim Meyering <meyering> 08/06/02 06:09:17

Index: src/macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -b -r1.251 -r1.252
--- src/macterm.c       22 May 2008 14:53:14 -0000      1.251
+++ src/macterm.c       2 Jun 2008 06:09:15 -0000       1.252
@@ -910,7 +910,6 @@
 #if USE_MAC_IMAGE_IO
   if (pixmap)
     {
-      if (pixmap->data)
        xfree (pixmap->data);
       xfree (pixmap);
     }
@@ -7390,7 +7389,6 @@
 
   x_free_gcs (f);
 
-  if (FRAME_SIZE_HINTS (f))
     xfree (FRAME_SIZE_HINTS (f));
 
   xfree (f->output_data.mac);
@@ -7640,7 +7638,6 @@
     {
       if (pat->buf)
        {
-         if (pat->blocks)
            xfree (pat->blocks);
          xfree (pat->buf);
        }
@@ -8364,7 +8361,6 @@
                                         HASH_VALUE (h, j));
            prev_family = family;
          }
-      if (font_ids)
        xfree (font_ids);
     }
 #endif
@@ -9242,19 +9238,16 @@
       int i;
 
       for (i = font->min_byte1; i <= font->max_byte1; i++)
-       if (font->bounds.rows[i])
          xfree (font->bounds.rows[i]);
       xfree (font->bounds.rows);
       ATSUDisposeStyle (font->mac_style);
     }
   else
 #endif
-    if (font->bounds.per_char)
       xfree (font->bounds.per_char);
 #if USE_CG_TEXT_DRAWING
   if (font->cg_font)
     CGFontRelease (font->cg_font);
-  if (font->cg_glyphs)
     xfree (font->cg_glyphs);
 #endif
   xfree (font);
@@ -13026,11 +13019,9 @@
 
   if (dpyinfo->font_table)
     {
-      if (dpyinfo->font_table->font_encoder)
        xfree (dpyinfo->font_table->font_encoder);
       xfree (dpyinfo->font_table);
     }
-  if (dpyinfo->mac_id_name)
     xfree (dpyinfo->mac_id_name);
 
   if (x_display_list == 0)