X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fplugin.c;h=0a69bff2364a50e2b7566e4f4d0c4aaa6ec5b74c;hb=7fff2a4596a081a5b36b22d3ec4df53219fc7047;hp=f771d70936e5eda9fbbc2f2fbfa7c735b3e0605a;hpb=1fee763a36a0c9af761244bbce8cd6c233ddbe2a;p=sysdb.git diff --git a/src/core/plugin.c b/src/core/plugin.c index f771d70..0a69bff 100644 --- a/src/core/plugin.c +++ b/src/core/plugin.c @@ -154,27 +154,6 @@ sdb_plugin_cmp_next_update(const sdb_object_t *a, const sdb_object_t *b) ? -1 : 0; } /* sdb_plugin_cmp_next_update */ -static sdb_plugin_cb_t * -sdb_plugin_find_by_name(sdb_llist_t *list, const char *name) -{ - sdb_object_t tmp = SDB_OBJECT_INIT; - - sdb_object_t *obj; - assert(name); - - if (! list) - return NULL; - - tmp.name = strdup(name); - if (! tmp.name) - return NULL; - obj = sdb_llist_search(list, &tmp, sdb_object_cmp_by_name); - free(tmp.name); - if (! obj) - return NULL; - return SDB_PLUGIN_CB(obj); -} /* sdb_plugin_find_by_name */ - /* * private types */ @@ -191,7 +170,7 @@ sdb_plugin_cb_init(sdb_object_t *obj, va_list ap) assert(type); assert(obj); - if (sdb_plugin_find_by_name(*list, obj->name)) { + if (sdb_llist_search_by_name(*list, obj->name)) { sdb_log(SDB_LOG_WARNING, "plugin: %s callback '%s' " "has already been registered. Ignoring newly " "registered version.", type, obj->name); @@ -537,7 +516,7 @@ sdb_plugin_configure(const char *name, oconfig_item_t *ci) if ((! name) || (! ci)) return -1; - plugin = sdb_plugin_find_by_name(config_list, name); + plugin = SDB_PLUGIN_CB(sdb_llist_search_by_name(config_list, name)); if (! plugin) { /* XXX: check if any such plugin has been loaded */ sdb_log(SDB_LOG_ERR, "plugin: Plugin '%s' did not register "