From: Alan T. DeKok Date: Sat, 26 Aug 2023 19:02:04 +0000 (-0400) Subject: we no longer need paircmp_unregister_instance() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13884164ed18a94ff35bad3ab9c32c587990ee73;p=thirdparty%2Ffreeradius-server.git we no longer need paircmp_unregister_instance() no modules have registered paircmp() functions --- diff --git a/src/lib/server/module.c b/src/lib/server/module.c index 1f159a395c1..341e33cc4c1 100644 --- a/src/lib/server/module.c +++ b/src/lib/server/module.c @@ -893,10 +893,6 @@ static int _module_instance_free(module_instance_t *mi) */ if (mi->dl_inst && mi->dl_inst->data) { xlat_func_unregister(mi->name); - /* - * Remove any registered paircmps. - */ - paircmp_unregister_instance(mi->dl_inst->data); xlat_func_unregister_module(mi->dl_inst); } diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c index e6ac3e5d7ad..252e0c794ee 100644 --- a/src/lib/server/paircmp.c +++ b/src/lib/server/paircmp.c @@ -724,28 +724,6 @@ void paircmp_unregister(fr_dict_attr_t const *da, fr_paircmp_func_t func) talloc_free(c); } -/** Unregister comparison function for a module - * - * All paircmp() functions for this module will be unregistered. - * - * @param instance the module instance - */ -void paircmp_unregister_instance(void *instance) -{ - paircmp_t *c, **tail; - - tail = &cmp; - while ((c = *tail) != NULL) { - if (c->instance == instance) { - *tail = c->next; - talloc_free(c); - continue; - } - - tail = &(c->next); - } -} - /** Add built in pair comparisons * */ diff --git a/src/lib/server/paircmp.h b/src/lib/server/paircmp.h index 9c6867f4390..a5ae428c77b 100644 --- a/src/lib/server/paircmp.h +++ b/src/lib/server/paircmp.h @@ -50,8 +50,6 @@ int paircmp_register(fr_dict_attr_t const *attribute, fr_dict_attr_t const *fro void paircmp_unregister(fr_dict_attr_t const *attr, fr_paircmp_func_t func); -void paircmp_unregister_instance(void *instance); - int paircmp_init(void); void paircmp_free(void);