From: Marek Vavruša Date: Tue, 31 Mar 2015 20:45:42 +0000 (+0200) Subject: modules: renamed ‘modulelist_t’ to ‘module_array_t’ X-Git-Tag: v1.0.0-beta1~274^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2706a21c4d75d28f7533873fe2ecf07674a4dbc;p=thirdparty%2Fknot-resolver.git modules: renamed ‘modulelist_t’ to ‘module_array_t’ --- diff --git a/daemon/engine.c b/daemon/engine.c index ae15ac967..861720729 100644 --- a/daemon/engine.c +++ b/daemon/engine.c @@ -277,7 +277,7 @@ int engine_register(struct engine *engine, const char *name) int engine_unregister(struct engine *engine, const char *name) { /* Find matching module. */ - modulelist_t *mod_list = &engine->modules; + module_array_t *mod_list = &engine->modules; size_t found = mod_list->len; for (size_t i = 0; i < mod_list->len; ++i) { if (strcmp(mod_list->at[i].name, name) == 0) { diff --git a/daemon/engine.h b/daemon/engine.h index c4c2e5bd4..98712bb50 100644 --- a/daemon/engine.h +++ b/daemon/engine.h @@ -26,8 +26,8 @@ struct lua_State; struct engine { struct kr_context resolver; - modulelist_t modules; struct network net; + module_array_t modules; mm_ctx_t *pool; struct lua_State *L; }; diff --git a/lib/resolve.h b/lib/resolve.h index e5aedfee9..913bcc55c 100644 --- a/lib/resolve.h +++ b/lib/resolve.h @@ -26,7 +26,7 @@ #include "lib/module.h" /** Array of modules. */ -typedef array_t(struct kr_module) modulelist_t; +typedef array_t(struct kr_module) module_array_t; /** * Name resolution context. @@ -40,7 +40,7 @@ struct kr_context { mm_ctx_t *pool; struct kr_cache *cache; - modulelist_t *modules; + module_array_t *modules; uint32_t options; }; diff --git a/tests/test_integration.c b/tests/test_integration.c index 38b58cdf1..2fb7c8063 100644 --- a/tests/test_integration.c +++ b/tests/test_integration.c @@ -24,7 +24,7 @@ * Globals */ static mm_ctx_t global_mm; /* Test memory context */ -static modulelist_t global_modules; /* Array of modules. */ +static module_array_t global_modules; /* Array of modules. */ static struct kr_context global_context; /* Resolution context */ static const char *global_tmpdir = NULL; /* Temporary directory */