From 4bd7da9ff2eb06c11b1f54e2b8e2cfb44af56776 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 02 5月 2020 10:20:38 +0800
Subject: [PATCH] rename StringUtils in string_utls
---
src/library/os/windows/network.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/library/os/windows/network.cpp b/src/library/os/windows/network.cpp
index fd111aa..f3ccd2d 100644
--- a/src/library/os/windows/network.cpp
+++ b/src/library/os/windows/network.cpp
@@ -15,9 +15,9 @@
#include <iphlpapi.h>
#include <unordered_map>
#include <stdio.h>
-#pragma comment(lib, "IPHLPAPI.lib")
+//#pragma comment(lib, "IPHLPAPI.lib")
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
#include "../../base/logger.h"
#include "../network.hpp"
@@ -52,7 +52,7 @@
DWORD dwStatus;
int adapter_info_size;
PIP_ADAPTER_INFO pAdapterInfo;
- DWORD dwBufLen = sizeof(IP_ADAPTER_INFO);
+ DWORD dwBufLen = sizeof(IP_ADAPTER_INFO);
unsigned int i = 3;
do {
@@ -82,7 +82,7 @@
while (pAdapter) {
OsAdapterInfo ai = {};
strncpy(ai.description, pAdapter->Description,
- min(sizeof(ai.description), MAX_ADAPTER_DESCRIPTION_LENGTH));
+ min((int)sizeof(ai.description), MAX_ADAPTER_DESCRIPTION_LENGTH));
memcpy(ai.mac_address, pAdapter->Address, 8);
translate(pAdapter->IpAddressList.IpAddress.String, ai.ipv4_address);
ai.type = IFACE_TYPE_ETHERNET;
--
Gitblit v1.9.1