mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-30 12:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use htab_eq_string in libctf

Browse Source 
* ctf-impl.h (ctf_dynset_eq_string): Don't declare.
	* ctf-hash.c (ctf_dynset_eq_string): Delete function.
	* ctf-dedup.c (make_set_element): Use htab_eq_string.
	(ctf_dedup_atoms_init, ADD_CITER, ctf_dedup_init): Likewise.
	(ctf_dedup_conflictify_unshared): Likewise.
	(ctf_dedup_walk_output_mapping): Likewise.
This commit is contained in:
Alan Modra 2021-05-09 12:28:32 +09:30
parent b05a0fc79b
commit 4821e618ad
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libctf/ChangeLog
View File

@ -1,3 +1,12 @@
2021-05-09 Alan Modra <amodra@gmail.com>
* ctf-impl.h (ctf_dynset_eq_string): Don't declare.
* ctf-hash.c (ctf_dynset_eq_string): Delete function.
* ctf-dedup.c (make_set_element): Use htab_eq_string.
(ctf_dedup_atoms_init, ADD_CITER, ctf_dedup_init): Likewise.
(ctf_dedup_conflictify_unshared): Likewise.
(ctf_dedup_walk_output_mapping): Likewise.
2021-05-06 Nick Alcock <nick.alcock@oracle.com>
* testsuite/lib/ctf-lib.exp: Use -gctf, not -gt.

14
libctf/ctf-dedup.c
View File

@ -352,7 +352,7 @@ make_set_element (ctf_dynhash_t *set, const void *key)
if ((element = ctf_dynhash_lookup (set, key)) == NULL)
{
if ((element = ctf_dynset_create (htab_hash_string,
ctf_dynset_eq_string,
htab_eq_string,
NULL)) == NULL)
return NULL;
@ -376,7 +376,7 @@ ctf_dedup_atoms_init (ctf_dict_t *fp)
if (!fp->ctf_dedup_atoms_alloc)
{
if ((fp->ctf_dedup_atoms_alloc
= ctf_dynset_create (htab_hash_string, ctf_dynset_eq_string,
= ctf_dynset_create (htab_hash_string, htab_eq_string,
free)) == NULL)
return ctf_set_errno (fp, ENOMEM);
}
@ -584,8 +584,8 @@ ctf_dedup_rhash_type (ctf_dict_t *fp, ctf_dict_t *input, ctf_dict_t **inputs,
whaterr = N_("error updating citers"); \
if (!citers) \
if ((citers = ctf_dynset_create (htab_hash_string, \
ctf_dynset_eq_string, \
NULL)) == NULL) \
htab_eq_string, \
NULL)) == NULL) \
goto oom; \
if (ctf_dynset_cinsert (citers, hval) < 0) \
goto oom; \
@ -1656,7 +1656,7 @@ ctf_dedup_init (ctf_dict_t *fp)
if ((d->cd_conflicting_types
= ctf_dynset_create (htab_hash_string,
ctf_dynset_eq_string, NULL)) == NULL)
htab_eq_string, NULL)) == NULL)
goto oom;
return 0;
@ -1814,7 +1814,7 @@ ctf_dedup_conflictify_unshared (ctf_dict_t *output, ctf_dict_t **inputs)
const void *k;
ctf_dynset_t *to_mark = NULL;
if ((to_mark = ctf_dynset_create (htab_hash_string, ctf_dynset_eq_string,
if ((to_mark = ctf_dynset_create (htab_hash_string, htab_eq_string,
NULL)) == NULL)
goto err_no;
@ -2351,7 +2351,7 @@ ctf_dedup_walk_output_mapping (ctf_dict_t *output, ctf_dict_t **inputs,
void *k;
if ((already_visited = ctf_dynset_create (htab_hash_string,
ctf_dynset_eq_string,
htab_eq_string,
NULL)) == NULL)
return ctf_set_errno (output, ENOMEM);

9
libctf/ctf-hash.c
View File

@ -140,15 +140,6 @@ ctf_hash_eq_type_id_key (const void *a, const void *b)
&& (key_a->ctii_type == key_b->ctii_type);
}
/* Hash and eq functions for the dynset. Most of these can just use the
underlying hashtab functions directly. */
int
ctf_dynset_eq_string (const void *a, const void *b)
{
return !strcmp((const char *) a, (const char *) b);
}
/* The dynhash, used for hashes whose size is not known at creation time. */
/* Free a single ctf_helem with arbitrary key/value functions. */

2
libctf/ctf-impl.h
View File

@ -617,8 +617,6 @@ extern int ctf_hash_eq_string (const void *, const void *);
extern int ctf_hash_eq_type_key (const void *, const void *);
extern int ctf_hash_eq_type_id_key (const void *, const void *);
extern int ctf_dynset_eq_string (const void *, const void *);
typedef void (*ctf_hash_free_fun) (void *);
typedef void (*ctf_hash_iter_f) (void *key, void *value, void *arg);