From patchwork Fri Apr 13 02:47:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 298 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id 4DqFA7Cr0Fq0GQAAIUCqbw for ; Fri, 13 Apr 2018 09:08:00 -0400 Received: from proxy10.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net (Dovecot) with LMTP id 3+RHC7Cr0FonVAAAalYnBA ; Fri, 13 Apr 2018 09:08:00 -0400 Received: from smtp35.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy10.mail.ord1d.rsapps.net with LMTP id MIA6OLCr0Fo+eAAAfSg8FQ ; Fri, 13 Apr 2018 09:08:00 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp35.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Suspicious-Flag: YES X-Classification-ID: ae93c1b2-3f1b-11e8-837f-525400a7b7b4-1-1 Received: from [216.105.38.7] ([216.105.38.7:62883] helo=lists.sourceforge.net) by smtp35.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B8/F6-04786-CABA0DA5; Fri, 13 Apr 2018 09:07:56 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1f6yOq-0008Qe-Bc; Fri, 13 Apr 2018 13:05:56 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1f6yOo-0008QU-4a for openvpn-devel@lists.sourceforge.net; Fri, 13 Apr 2018 13:05:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YduEmF1tx645ImMNR1obQOty/ARrmhU5dhXm/u5LMjo=; b=nVqql2f5bFKxm7kXqHhAM+f0N7 SZ5g4h9RsOXkVn47GIWxSkcmQ4ilj29qqQKIgcjaSbuhH2OVp4+hJhnz3oNPlM8q5wmg4eSNxyAsy 2Dgee+GTy7h5lODWmMfTcJcLD+ot7YNlDBAa7RDr+VP4dmBBOZwCxfTYXQMZxvGVQDy0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YduEmF1tx645ImMNR1obQOty/ARrmhU5dhXm/u5LMjo=; b=WLNk3yjwTTSk+IYY92WXdat8oE P/YYtt1F2sUXDoVyOdW1fr2DJA8Tt65CnD3Iwr5SiqLwH/apuxjM5GcEG8R1c7x7xvjfeG31rpOJ4 ZZvx+4rAKIHa+z8bCOAI9gaf7f1nbLyBP/ttlaQDu7RpPdPD05CDWtjQcgnVtNhL7KW4=; Received: from pub5.amebis.si ([213.250.55.21]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1f6yOX-00ESNw-MZ for openvpn-devel@lists.sourceforge.net; Fri, 13 Apr 2018 13:05:54 +0000 Received: from SR5.amebis.doma (sr5.amebis.doma [IPv6:2a00:ee2:209:164:3::2]) by pub5.amebis.si (Postfix) with ESMTP id 8C90F2001D; Fri, 13 Apr 2018 14:47:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1523623678; bh=kqSB4CIY9M37Df2lQKYLEC3nxSY2lQChbQ5+qm7t528=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xb+dWBGySg2RAFTHjACSnFe5XK2AiAuq68NdcEjjheAIQxZ6xOfVliYtaMvc8W//m rlm72ovF4B/dYOE0DNmsqyd9ixkpqqd9NDAmNPQ787o6POZ1IZFNbOBuwRzp9+Dg66 7DbbCcKiqu7s2YqFLnCH2OmWnt78Ewil+eBhFqDA= From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Fri, 13 Apr 2018 14:47:56 +0200 Message-Id: <20180413124756.5756-1-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20180125160037.GT69387@greenie.muc.de> References: <20180125160037.GT69387@greenie.muc.de> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 TIME_LIMIT_EXCEEDED Exceeded time limit / deadline X-Headers-End: 1f6yOX-00ESNw-MZ Subject: [Openvpn-devel] [PATCH v2 09/13] Signed/unsigned warnings of MSVC resolved X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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 --- 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 1f98283..89367fc 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 dc47666..59f73bd 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 fbc32f9..66ffeec 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -188,7 +188,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; @@ -934,7 +934,7 @@ static DWORD WINAPI RegisterDNS(LPVOID unused) { DWORD err; - DWORD i; + size_t i; WCHAR sys_path[MAX_PATH]; DWORD timeout = RDNS_TIMEOUT * 1000; /* in milliseconds */ @@ -950,7 +950,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}; @@ -963,7 +962,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 653bd12..26ffa8f 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -298,7 +298,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); }