remove useless if-before-free tests

* lib-src/ebrowse.c (xfree): Likewise.
* lib-src/etags.c (process_file_name, free_tree, free_fdesc): Likewise.
(popclass_above, Prolog_functions, Erlang_functions): Likewise.
* lib-src/pop.c (pop_quit): Likewise.
* lwlib/lwlib-Xm.c (xm_update_one_value): Likewise.
* lwlib/lwlib.c (safe_free_str, free_widget_value_tree): Likewise.
* src/editfns.c (Fset_time_zone_rule): Likewise.
* src/lread.c (nosuffix): Likewise.
* src/ralloc.c (get_bloc): Likewise.
* src/regex.c (reg_free): Likewise.
* src/xftfont.c (xftfont_open, xftfont_close): Likewise.
* src/xrdb.c (get_user_app, get_environ_db, x_load_resources): Likewise.
* src/xsmfns.c (smc_save_yourself_CB): Likewise.

4 files changed, 21 insertions, 19 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2df0b7082d0..433df1698b5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-02  Jim Meyering  <meyering@redhat.com>
+
+        remove useless if-before-free tests
+        * lib-src/ebrowse.c (xfree): Likewise.
+        * lib-src/etags.c (process_file_name, free_tree, free_fdesc): Likewise.
+        (popclass_above, Prolog_functions, Erlang_functions): Likewise.
+        * lib-src/pop.c (pop_quit): Likewise.
+
 2008-05-30  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (lisp2): Add minibuffer.elc.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 3cc85a75640..faa5be0e5d6 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -595,8 +595,7 @@ void
 xfree (p)
      void *p;
 {
-  if (p)
-    free (p);
+  free (p);
 }
 
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 675e926f203..23eefd6865a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1799,8 +1799,8 @@ process_file_name (file, lang)
     pfatal (file);
 
  cleanup:
-  if (compressed_name) free (compressed_name);
-  if (uncompressed_name) free (uncompressed_name);
+  free (compressed_name);
+  free (uncompressed_name);
   last_node = NULL;
   curfdp = NULL;
   return;
@@ -2179,8 +2179,7 @@ free_tree (np)
     {
       register node *node_right = np->right;
       free_tree (np->left);
-      if (np->name != NULL)
-        free (np->name);
+      free (np->name);
       free (np->regex);
       free (np);
       np = node_right;
@@ -2195,11 +2194,11 @@ static void
 free_fdesc (fdp)
      register fdesc *fdp;
 {
-  if (fdp->infname != NULL) free (fdp->infname);
-  if (fdp->infabsname != NULL) free (fdp->infabsname);
-  if (fdp->infabsdir != NULL) free (fdp->infabsdir);
-  if (fdp->taggedfname != NULL) free (fdp->taggedfname);
-  if (fdp->prop != NULL) free (fdp->prop);
+  free (fdp->infname);
+  free (fdp->infabsname);
+  free (fdp->infabsdir);
+  free (fdp->taggedfname);
+  free (fdp->prop);
   free (fdp);
 }
 
@@ -2844,8 +2843,7 @@ popclass_above (bracelev)
        nl >= 0 && cstack.bracelev[nl] >= bracelev;
        nl--)
     {
-      if (cstack.cname[nl] != NULL)
-        free (cstack.cname[nl]);
+      free (cstack.cname[nl]);
       cstack.nl = nl;
     }
 }
@@ -5521,8 +5519,7 @@ Prolog_functions (inf)
           last[len] = '\0';
         }
     }
-  if (last != NULL)
-    free (last);
+  free (last);
 }
 
 
@@ -5700,8 +5697,7 @@ Erlang_functions (inf)
           last[len] = '\0';
         }
     }
-  if (last != NULL)
-    free (last);
+  free (last);
 }
 
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 96be6afaa2c..76cd2fb5792 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -998,8 +998,7 @@ pop_quit (server)
       close (server->file);
     }
 
-  if (server->buffer)
-    free (server->buffer);
+  free (server->buffer);
   free ((char *) server);
 
   return (ret);