libctf, hash: add support for freeing functions taking an arg

There are a bunch of places in libctf where the code is complicated
by the fact that freeing a hash key or value requires access to the
dict: more generally, they want an arg pointer to *something*.

But for the sake of being able to use free() as a freeing function,
we can't do this at all times.  We also don't want to bloat up the
hash itself with an arg value unless necessary (in the same way we
already avoid storing the key or value freeing functions unless at
least one of them is specified).

So from the outside this change is simple: add a new
ctf_dynhash_create_arg which takes a new sort of freeing function
which takes an argument.  Internally, we store the arg only when
the key or owner is set, and cast from the one freeing function
to the other iff the arg is non-NULL.  This means it's impossible
to pass a value that may or may not be NULL to the freeing
function, but that's harmless for all current uses, and allows
significant simplifications elsewhere.

1 files changed, 8 insertions, 4 deletions

diff --git a/libctf/ctf-open.c b/libctf/ctf-open.c
index 219831b..4cf18f0 100644
--- a/libctf/ctf-open.c
+++ b/libctf/ctf-open.c
@@ -791,17 +791,20 @@ init_static_types (ctf_dict_t *fp, ctf_header_t *cth)
 
   if ((fp->ctf_structs
        = ctf_dynhash_create_sized (pop[CTF_K_STRUCT], ctf_hash_string,
-				   ctf_hash_eq_string, NULL, NULL)) == NULL)
+				   ctf_hash_eq_string,
+				   NULL, NULL, NULL)) == NULL)
     return ENOMEM;
 
   if ((fp->ctf_unions
        = ctf_dynhash_create_sized (pop[CTF_K_UNION], ctf_hash_string,
-				   ctf_hash_eq_string, NULL, NULL)) == NULL)
+				   ctf_hash_eq_string,
+				   NULL, NULL, NULL)) == NULL)
     return ENOMEM;
 
   if ((fp->ctf_enums
        = ctf_dynhash_create_sized (pop[CTF_K_ENUM], ctf_hash_string,
-				   ctf_hash_eq_string, NULL, NULL)) == NULL)
+				   ctf_hash_eq_string,
+				   NULL, NULL, NULL)) == NULL)
     return ENOMEM;
 
   if ((fp->ctf_names
@@ -816,7 +819,8 @@ init_static_types (ctf_dict_t *fp, ctf_header_t *cth)
 				   pop[CTF_K_RESTRICT] +
 				   pop_enumerators,
 				   ctf_hash_string,
-				   ctf_hash_eq_string, NULL, NULL)) == NULL)
+				   ctf_hash_eq_string,
+				   NULL, NULL, NULL)) == NULL)
     return ENOMEM;
 
   if ((fp->ctf_conflicting_enums