From: Florian Weimer <fweimer@redhat.com>
Date: Sat, 8 Feb 2020 15:15:09 +0000 (+0100)
Subject: Remove weak declaration of free from <inline-hashtab.h>
X-Git-Tag: glibc-2.32~627
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2efa52c880d46ee89523c8ed8102ceeb02043926;p=thirdparty%2Fglibc.git

Remove weak declaration of free from <inline-hashtab.h>

elf/dl-minimal.c provides a definition of free, so the function
pointer is always non-null, even before the final relocation
of the loader.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/include/inline-hashtab.h b/include/inline-hashtab.h
index d25bb950831..3c09978199c 100644
--- a/include/inline-hashtab.h
+++ b/include/inline-hashtab.h
@@ -25,8 +25,6 @@
 #ifndef INLINE_HASHTAB_H
 # define INLINE_HASHTAB_H 1
 
-extern void weak_function free (void *ptr);
-
 struct hashtab
 {
   /* Table itself.  */
@@ -56,8 +54,7 @@ htab_create (void)
   ht->free = free;
   if (! ht->entries)
     {
-      if (ht->free)
-	ht->free (ht);
+      free (ht);
       return NULL;
     }
 
@@ -78,8 +75,7 @@ htab_delete (struct hashtab *htab)
   for (i = htab->size - 1; i >= 0; i--)
     free (htab->entries[i]);
 
-  if (htab->free)
-    htab->free (htab->entries);
+  htab->free (htab->entries);
   free (htab);
 }
 
@@ -167,8 +163,7 @@ htab_expand (struct hashtab *htab, int (*hash_fn) (void *))
      allocated early as long as there's no corresponding free(), but
      this isn't so much memory as to be significant.  */
 
-  if (htab->free)
-    htab->free (oentries);
+  htab->free (oentries);
 
   /* Use the free() corresponding to the malloc() above to free this
      up.  */