From: PMunch <peterme@peterme.net>
Date: Tue, 22 Oct 2019 06:42:00 +0000 (+0200)
Subject: Cleanup some minor things in dynlibmod
X-Git-Tag: release-1.11.0~45^2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f79811435ba13cab2e397be4918fdd89530dbc86;p=thirdparty%2Funbound.git

Cleanup some minor things in dynlibmod
---

diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index 54b2a5816..977f45047 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -25,12 +25,12 @@ void log_dlerror() {
         NULL
         ))
     {
-        DWORD dwBytesWritten;
         log_err("dynlibmod: %s (%ld)", MessageBuffer, dwLastError);
         LocalFree(MessageBuffer);
     }
 
 }
+
 HMODULE open_library(const char* fname) {
     return LoadLibrary(fname);
 }
@@ -42,6 +42,7 @@ HMODULE open_library(const char* fname) {
 void log_dlerror() {
     log_err("dynlibmod: %s", dlerror());
 }
+
 void* open_library(const char* fname) {
     return dlopen(fname, RTLD_LAZY | RTLD_GLOBAL);
 }
@@ -60,10 +61,8 @@ typedef void (*func_clear_t)(struct module_qstate*, int);
 typedef size_t (*func_get_mem_t)(struct module_env*, int);
 
 struct dynlibmod_env {
-
 	/** Dynamic library filename. */
 	const char* fname;
-
 	/** Module init function */
 	func_init_t func_init;
 	/** Module deinit function */
@@ -76,19 +75,11 @@ struct dynlibmod_env {
 	func_clear_t func_clear;
 	/** Module get_mem function */
 	func_get_mem_t func_get_mem;
-
-	/** Module qstate. */
-	struct module_qstate* qstate;
 };
 
-/**
- * counter for dynamic library module instances
- * incremeted by dynlibmod_init
- */
-int dynlib_mod_count = 0;
-
 /** dynlib module init */
 int dynlibmod_init(struct module_env* env, int id) {
+    static int dynlib_mod_count;
     int dynlib_mod_idx = dynlib_mod_count++;
     struct config_strlist* cfg_item = env->cfg->dynlib_file;
     struct dynlibmod_env* de = (struct dynlibmod_env*)calloc(1, sizeof(struct dynlibmod_env));