- For PR #93: windows compile warnings removal

- windows compile warnings removal for ip dscp option code.
NLnetLabs · May 19, 2020 · 711c054 · 711c054
1 parent a1d4e15
commit 711c054
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/doc/Changelog b/doc/Changelog
@@ -6,6 +6,8 @@
 	- Release 1.10.1 is 1.10.0 with fixes, code repository continues,
 	  including those fixes, towards the next release.  Configure has
 	  version 1.10.2 version number in it.
+	- For PR #93: windows compile warnings removal
+	- windows compile warnings removal for ip dscp option code.
 
 18 May 2020: Wouter
 	- For PR #93: dynlibmod can handle reloads and deinit and inits again,

diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
@@ -15,15 +15,15 @@ void log_dlerror() {
     DWORD dwFormatFlags = FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_IGNORE_INSERTS |
         FORMAT_MESSAGE_FROM_SYSTEM ;
-    if(dwBufferLength = FormatMessageA(
+    if((dwBufferLength = FormatMessageA(
         dwFormatFlags,
         NULL, // module to get message from (NULL == system)
         dwLastError,
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // default language
         (LPSTR) &MessageBuffer,
         0,
         NULL
-        ))
+        )))
     {
         log_err("dynlibmod: %s (%ld)", MessageBuffer, dwLastError);
         LocalFree(MessageBuffer);
@@ -108,47 +108,47 @@ int dynlibmod_init(struct module_env* env, int id) {
             log_err("dynlibmod[%d]: unable to load init procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_init = (func_init_t) initializer;
+            de->func_init = (func_init_t)(void*)initializer;
         }
         deinitializer = __LOADSYM(dynamic_library,"deinit");
         if (deinitializer == NULL) {
             log_dlerror();
             log_err("dynlibmod[%d]: unable to load deinit procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_deinit = (func_deinit_t) deinitializer;
+            de->func_deinit = (func_deinit_t)(void*)deinitializer;
         }
         operate = __LOADSYM(dynamic_library,"operate");
         if (operate == NULL) {
             log_dlerror();
             log_err("dynlibmod[%d]: unable to load operate procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_operate = (func_operate_t) operate;
+            de->func_operate = (func_operate_t)(void*)operate;
         }
         inform = __LOADSYM(dynamic_library,"inform_super");
         if (inform == NULL) {
             log_dlerror();
             log_err("dynlibmod[%d]: unable to load inform_super procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_inform = (func_inform_t) inform;
+            de->func_inform = (func_inform_t)(void*)inform;
         }
         clear = __LOADSYM(dynamic_library,"clear");
         if (clear == NULL) {
             log_dlerror();
             log_err("dynlibmod[%d]: unable to load clear procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_clear = (func_clear_t) clear;
+            de->func_clear = (func_clear_t)(void*)clear;
         }
         get_mem = __LOADSYM(dynamic_library,"get_mem");
         if (get_mem == NULL) {
             log_dlerror();
             log_err("dynlibmod[%d]: unable to load get_mem procedure from dynamic library \"%s\".", dynlib_mod_idx, de->fname);
             return 0;
         } else {
-            de->func_get_mem = (func_get_mem_t) get_mem;
+            de->func_get_mem = (func_get_mem_t)(void*)get_mem;
         }
     }
     de->inplace_cb_delete_wrapped = &inplace_cb_delete_wrapped;

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
@@ -884,11 +884,11 @@ set_ip_dscp(int socket, int addrfamily, int dscp)
 	ds = dscp << 2;
 	switch(addrfamily) {
 	case AF_INET6:
-		if(setsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, &ds, sizeof(ds)) < 0)
+		if(setsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, (void*)&ds, sizeof(ds)) < 0)
 			return sock_strerror(errno);
 		break;
 	default:
-		if(setsockopt(socket, IPPROTO_IP, IP_TOS, &ds, sizeof(ds)) < 0)
+		if(setsockopt(socket, IPPROTO_IP, IP_TOS, (void*)&ds, sizeof(ds)) < 0)
 			return sock_strerror(errno);
 		break;
 	}