Add lh_doall inlining

[openssl.git] / crypto / objects / o_names.c

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index f7216f2..d63575d 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -320,8 +320,6 @@ static void names_lh_free_doall(OBJ_NAME *onp)
         OBJ_NAME_remove(onp->name, onp->type);
 }
 
         OBJ_NAME_remove(onp->name, onp->type);
 }
 

-static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME)
-

 static void name_funcs_free(NAME_FUNCS *ptr)
 {
     OPENSSL_free(ptr);
 static void name_funcs_free(NAME_FUNCS *ptr)
 {
     OPENSSL_free(ptr);


@@ -338,7 +336,7 @@ void OBJ_NAME_cleanup(int type)
     down_load = lh_OBJ_NAME_get_down_load(names_lh);
     lh_OBJ_NAME_set_down_load(names_lh, 0);
 
     down_load = lh_OBJ_NAME_get_down_load(names_lh);
     lh_OBJ_NAME_set_down_load(names_lh, 0);
 

-    lh_OBJ_NAME_doall(names_lh, LHASH_DOALL_FN(names_lh_free));
+    lh_OBJ_NAME_doall(names_lh, names_lh_free_doall);

     if (type < 0) {
         lh_OBJ_NAME_free(names_lh);
         sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free);
     if (type < 0) {
         lh_OBJ_NAME_free(names_lh);
         sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free);