From 810e1275dd9bb92c6d3f2a7d399e45f8bd611dbe Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <m@siav.pw>
Date: 周日, 16 6月 2019 19:45:41 +0800
Subject: [PATCH] Merge pull request #23 from tizzybec/master
---
src/library/os/os-win.c | 6 +++---
src/library/base/logger.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/library/base/logger.h b/src/library/base/logger.h
index 0803685..c9dae04 100644
--- a/src/library/base/logger.h
+++ b/src/library/base/logger.h
@@ -1,7 +1,7 @@
#ifndef logger_INCLUDED
#define logger_INCLUDED
-#ifndef LOG_ENABLED
+#ifndef LOG_DISABLED
#include <errno.h>
#ifdef __cplusplus
extern "C" {
diff --git a/src/library/os/os-win.c b/src/library/os/os-win.c
index 6b828cd..e406ab9 100644
--- a/src/library/os/os-win.c
+++ b/src/library/os/os-win.c
@@ -131,7 +131,7 @@
FUNCTION_RETURN result;
PIP_ADAPTER_INFO pAdapterInfo, pAdapter = NULL;
//IP_ADAPTER_INFO AdapterInfo[20]; // Allocate information for up to 16 NICs
- DWORD dwBufLen = 0; //10 * sizeof(IP_ADAPTER_INFO); // Save the memory size of buffer
+ DWORD dwBufLen = sizeof(IP_ADAPTER_INFO); //10 * sizeof(IP_ADAPTER_INFO); // Save the memory size of buffer
i = 3;
do {
@@ -158,7 +158,8 @@
return FUNC_RET_OK;
}
- memset(adapterInfos, 0, *adapter_info_size);
+ *adapter_info_size = dwBufLen / sizeof(IP_ADAPTER_INFO);
+ memset(adapterInfos, 0, dwBufLen);
pAdapter = pAdapterInfo;
i = 0;
result = FUNC_RET_OK;
@@ -178,7 +179,6 @@
}
}
free(pAdapterInfo);
- *adapter_info_size = i;
return result;
}
--
Gitblit v1.9.1