gnulib: update

Contains the creation of the xhash module.
https://lists.gnu.org/archive/html/bug-gnulib/2019-09/msg00046.html

* src/muscle-tab.c, src/state.c, src/symtab.c, src/uniqstr.c:
Use hash_xinitialize.
This commit is contained in:
Akim Demaille
2019-09-09 19:40:31 +02:00
parent 06a273625b
commit 84a6621c78
7 changed files with 43 additions and 47 deletions

View File

@@ -25,7 +25,7 @@ gnulib_modules='
error extensions fdl fopen-safer error extensions fdl fopen-safer
getopt-gnu getopt-gnu
gettext-h git-version-gen gitlog-to-changelog gettext-h git-version-gen gitlog-to-changelog
gpl-3.0 hash inttypes isnan javacomp-script gpl-3.0 inttypes isnan javacomp-script
javaexec-script javaexec-script
ldexpl ldexpl
libtextstyle-optional libtextstyle-optional
@@ -48,6 +48,7 @@ gnulib_modules='
xalloc xalloc
xalloc-die xalloc-die
xconcat-filename xconcat-filename
xhash
xlist xlist
xmemdup0 xmemdup0
xstrndup xstrndup

2
gnulib

Submodule gnulib updated: 03add7eb9d...672663aca3

31
lib/.gitignore vendored
View File

@@ -16,6 +16,7 @@
/argmatch.c /argmatch.c
/argmatch.h /argmatch.h
/asnprintf.c /asnprintf.c
/assure.h
/basename-lgpl.c /basename-lgpl.c
/basename.c /basename.c
/binary-io.c /binary-io.c
@@ -38,6 +39,7 @@
/canonicalize-lgpl.c /canonicalize-lgpl.c
/careadlinkat.c /careadlinkat.c
/careadlinkat.h /careadlinkat.h
/cdefs.h
/charset.alias /charset.alias
/cloexec.c /cloexec.c
/cloexec.h /cloexec.h
@@ -89,6 +91,7 @@
/fseterr.c /fseterr.c
/fseterr.h /fseterr.h
/fstat.c /fstat.c
/fsync.c
/getdtablesize.c /getdtablesize.c
/gethrxtime.c /gethrxtime.c
/gethrxtime.h /gethrxtime.h
@@ -131,6 +134,7 @@
/isnanl.c /isnanl.c
/itold.c /itold.c
/ldexpl.c /ldexpl.c
/libc-config.h
/limits.h /limits.h
/limits.in.h /limits.in.h
/localcharset.c /localcharset.c
@@ -189,6 +193,9 @@
/relocatable.c /relocatable.c
/relocatable.h /relocatable.h
/relocwrapper.c /relocwrapper.c
/rename.c
/rmdir.c
/same-inode.h
/sched.h /sched.h
/sched.in.h /sched.in.h
/setenv.c /setenv.c
@@ -264,6 +271,7 @@
/sys_types.in.h /sys_types.in.h
/sys_wait.in.h /sys_wait.in.h
/sysexits.in.h /sysexits.in.h
/textstyle.in.h
/time.h /time.h
/time.in.h /time.in.h
/timespec.c /timespec.c
@@ -300,10 +308,20 @@
/wctype.h /wctype.h
/wctype.in.h /wctype.in.h
/wcwidth.c /wcwidth.c
/windows-initguard.h
/windows-mutex.c
/windows-mutex.h
/windows-once.c
/windows-once.h
/windows-recmutex.c
/windows-recmutex.h
/windows-rwlock.c
/windows-rwlock.h
/xalloc-die.c /xalloc-die.c
/xalloc-oversized.h /xalloc-oversized.h
/xalloc.h /xalloc.h
/xconcat-filename.c /xconcat-filename.c
/xhash.c
/xmalloc.c /xmalloc.c
/xmemdup0.c /xmemdup0.c
/xmemdup0.h /xmemdup0.h
@@ -315,16 +333,3 @@
/xstrndup.h /xstrndup.h
/xtime.c /xtime.c
/xtime.h /xtime.h
/rename.c
/rmdir.c
/same-inode.h
/assure.h
/fsync.c
/textstyle.in.h
/windows-mutex.c
/windows-mutex.h
/windows-once.c
/windows-once.h
/windows-recmutex.c
/windows-recmutex.h
/windows-spinlock.h

View File

@@ -126,10 +126,8 @@ muscle_init (void)
/* Initialize the muscle obstack. */ /* Initialize the muscle obstack. */
obstack_init (&muscle_obstack); obstack_init (&muscle_obstack);
muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle, muscle_table = hash_xinitialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,
hash_compare_muscles, muscle_entry_free); hash_compare_muscles, muscle_entry_free);
if (!muscle_table)
xalloc_die ();
/* Version and input file. */ /* Version and input file. */
MUSCLE_INSERT_STRING ("version", VERSION); MUSCLE_INSERT_STRING ("version", VERSION);

View File

@@ -359,13 +359,11 @@ state_hasher (void const *s, size_t tablesize)
void void
state_hash_new (void) state_hash_new (void)
{ {
state_table = hash_initialize (HT_INITIAL_CAPACITY, state_table = hash_xinitialize (HT_INITIAL_CAPACITY,
NULL, NULL,
state_hasher, state_hasher,
state_comparator, state_comparator,
NULL); NULL);
if (!state_table)
xalloc_die ();
} }

View File

@@ -779,20 +779,16 @@ hash_semantic_type_hasher (void const *m, size_t tablesize)
void void
symbols_new (void) symbols_new (void)
{ {
symbol_table = hash_initialize (HT_INITIAL_CAPACITY, symbol_table = hash_xinitialize (HT_INITIAL_CAPACITY,
NULL, NULL,
hash_symbol_hasher, hash_symbol_hasher,
hash_symbol_comparator, hash_symbol_comparator,
symbol_free); symbol_free);
if (!symbol_table) semantic_type_table = hash_xinitialize (HT_INITIAL_CAPACITY,
xalloc_die (); NULL,
semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY, hash_semantic_type_hasher,
NULL, hash_semantic_type_comparator,
hash_semantic_type_hasher, free);
hash_semantic_type_comparator,
free);
if (!semantic_type_table)
xalloc_die ();
} }

View File

@@ -157,13 +157,11 @@ hash_uniqstr (void const *m, size_t tablesize)
void void
uniqstrs_new (void) uniqstrs_new (void)
{ {
uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY, uniqstrs_table = hash_xinitialize (HT_INITIAL_CAPACITY,
NULL, NULL,
hash_uniqstr, hash_uniqstr,
hash_compare_uniqstr, hash_compare_uniqstr,
free); free);
if (!uniqstrs_table)
xalloc_die ();
} }