AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 07:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Florian Weimer 2020-02-08 16:15:09 +01:00
parent c76147afe9
commit 2efa52c880
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/inline-hashtab.h
View File

@ -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. */