From f755c992915b25acd114ef98e61dd9eae7ff57fe Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 13 Apr 2018 14:47:56 +0200 Subject: [PATCH] Signed/unsigned warnings of MSVC resolved This patch fixes the signed/unsigned comparison warnings discovered when compiling openvpnserv using MSVC. Wherever possible, it changes iterator and/or size variables to a more appropriate type, or uses type-casting when it is safe to do so. Acked-by: Gert Doering Message-Id: <20180413124756.5756-1-simon@rozman.si> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16756.html Signed-off-by: Gert Doering --- src/openvpnserv/automatic.c | 2 +- src/openvpnserv/common.c | 2 +- src/openvpnserv/interactive.c | 7 +++---- src/openvpnserv/validate.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 1f9828378..89367fcf6 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -135,7 +135,7 @@ match(const WIN32_FIND_DATA *find, LPCTSTR ext) * Modify the extension on a filename. */ static bool -modext(LPTSTR dest, int size, LPCTSTR src, LPCTSTR newext) +modext(LPTSTR dest, size_t size, LPCTSTR src, LPCTSTR newext) { size_t i; diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index 73c418f58..073e3939e 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -40,7 +40,7 @@ openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist) len = _vsntprintf(str, size, format, arglist); str[size - 1] = 0; } - return (len >= 0 && len < size); + return (len >= 0 && (size_t)len < size); } int openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index c8733e609..8f92c24a7 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -187,7 +187,7 @@ typedef enum { static DWORD AsyncPipeOp(async_op_t op, HANDLE pipe, LPVOID buffer, DWORD size, DWORD count, LPHANDLE events) { - int i; + DWORD i; BOOL success; HANDLE io_event; DWORD res, bytes = 0; @@ -932,7 +932,7 @@ static DWORD WINAPI RegisterDNS(LPVOID unused) { DWORD err; - DWORD i; + size_t i; DWORD timeout = RDNS_TIMEOUT * 1000; /* in milliseconds */ /* path of ipconfig command */ @@ -947,7 +947,6 @@ RegisterDNS(LPVOID unused) { ipcfg, L"ipconfig /flushdns", timeout }, { ipcfg, L"ipconfig /registerdns", timeout }, }; - int ncmds = sizeof(cmds) / sizeof(cmds[0]); HANDLE wait_handles[2] = {rdns_semaphore, exit_event}; @@ -957,7 +956,7 @@ RegisterDNS(LPVOID unused) if (WaitForMultipleObjects(2, wait_handles, FALSE, timeout) == WAIT_OBJECT_0) { /* Semaphore locked */ - for (i = 0; i < ncmds; ++i) + for (i = 0; i < _countof(cmds); ++i) { ExecCommand(cmds[i].argv0, cmds[i].cmdline, cmds[i].timeout); } diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 91c6a2ba3..c576ac16c 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -301,7 +301,7 @@ IsUserInGroup(PSID sid, const PTOKEN_GROUPS token_groups, const WCHAR *group_nam break; } /* If a match is already found, ret == TRUE and the loop is skipped */ - for (int i = 0; i < nread && !ret; ++i) + for (DWORD i = 0; i < nread && !ret; ++i) { ret = EqualSid(members[i].lgrmi0_sid, sid); } -- 2.47.2