* lib-src/ebrowse.c (xfree): Remove definition; s/xfree/free/

2 files changed, 9 insertions, 17 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 433df1698b5..95d06f5dfc1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,7 @@
 2008-06-02  Jim Meyering  <meyering@redhat.com>
 
+	* lib-src/ebrowse.c (xfree): Remove definition; s/xfree/free/
+
 	remove useless if-before-free tests
 	* lib-src/ebrowse.c (xfree): Likewise.
 	* lib-src/etags.c (process_file_name, free_tree, free_fdesc): Likewise.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index faa5be0e5d6..720e02081c5 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -589,16 +589,6 @@ xrealloc (p, sz)
 }
 
 
-/* Like free but always check for null pointers..  */
-
-void
-xfree (p)
-     void *p;
-{
-  free (p);
-}
-
-
 /* Like strdup, but print an error and exit if not enough memory is
    available..  If S is null, return null.  */
 
@@ -2758,7 +2748,7 @@ member (cls, vis)
           if (LOOKING_AT ('{') && id && cls)
 	    add_member_defn (cls, id, regexp, pos, hash, 0, sc, flags);
 
-	  xfree (id);
+	  free (id);
           id = NULL;
           sc = SC_MEMBER;
           break;
@@ -2837,7 +2827,7 @@ member (cls, vis)
       print_info ();
     }
 
-  xfree (id);
+  free (id);
 }
 
 
@@ -3074,7 +3064,7 @@ parse_qualified_ident_or_type (last_id)
 	    cls = add_sym (id, cls);
 
 	  *last_id = NULL;
-	  xfree (id);
+	  free (id);
 	  id = NULL;
 	  id_size = 0;
 	  MATCH ();
@@ -3277,7 +3267,7 @@ add_declarator (cls, id, flags, sc)
       print_info ();
     }
 
-  xfree (*id);
+  free (*id);
   *id = NULL;
   *cls = NULL;
 }
@@ -3330,7 +3320,7 @@ declaration (flags)
              `declare (X, Y)\n class A : ...'.  */
           if (id)
 	    {
-	      xfree (id);
+	      free (id);
 	      return;
 	    }
 
@@ -3424,7 +3414,7 @@ declaration (flags)
           if (!cls && id && LOOKING_AT ('{'))
 	    add_global_defn (id, regexp, pos, hash, 0, sc, flags);
 
-	  xfree (id);
+	  free (id);
           id = NULL;
           break;
         }
@@ -3480,7 +3470,7 @@ globals (start_flags)
                     MATCH_IF ('}');
                   }
 
-		xfree (namespace_name);
+		free (namespace_name);
               }
           }
           break;