From patchwork Wed Oct 11 20:24:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 29 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director6.mail.ord1d.rsapps.net ([172.30.157.13]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id gRarMe8Y31k9DAAAgoeIoA for ; Thu, 12 Oct 2017 03:25:35 -0400 Received: from proxy18.mail.iad3a.rsapps.net ([172.27.129.39]) by director6.mail.ord1d.rsapps.net (Dovecot) with LMTP id G6w0Be8Y31kiXgAAhgvE6Q ; Thu, 12 Oct 2017 03:25:35 -0400 Received: from smtp42.gate.iad3a ([172.27.255.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.iad3a.rsapps.net (Dovecot) with LMTP id t+tcMekY31kLCQAAon3hFg ; Thu, 12 Oct 2017 03:25:35 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1200-w 0-298-1001-1564-w 0-298-0-9580-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=O657h11W c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=hFZyTu8Ko3elI3TDNfsA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp42.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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-Classification-ID: 88cc7c9a-af1e-11e7-bc63-782bcb4244d8-1-1 Received: from [216.34.181.88] ([216.34.181.88:47793] helo=lists.sourceforge.net) by smtp42.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D8/BF-03557-DE81FD95; Thu, 12 Oct 2017 03:25:34 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e2XrX-0000SM-2d; Thu, 12 Oct 2017 07:24:59 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e2XrT-0000Ry-F6 for openvpn-devel@lists.sourceforge.net; Thu, 12 Oct 2017 07:24:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From; bh=hskFZdZgi83FvsQjKj5PFKlrd6Ak0AqqAC6eMhIiay0=; b=j5vrtfGT2loGgJ90jPgrbw29kCMRPrAhpvHe+pQHN4ulu8jGZsQM9vqnlWdwQEfe4xhODm7ja0iStvwHVVvUdnfsIoE73Zy0tVwDi3xEuAKBvBNEco8A4WYMillt+2FxbIbwZxRrwQrvBi9mo3Hk7KP30VdA2qD2ruwBBOxc0n4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Message-Id:Date:Subject:Cc:To:From; bh=hskFZdZgi83FvsQjKj5PFKlrd6Ak0AqqAC6eMhIiay0=; b=eyU7ZBHEhHxwBQsuNcEtrnqNYSoph8BvpZYTUy4YscCOQbk6vLODqjyHIbC+I0piDpeBfFyOarInFEKQw51dRb/x0V5kCF3EOklrXkjp3WCOOhZXvOtdnfk2bhnmeVDZBUsN1+tdwD+UI+Qc9w8bf0Akbw98zbcU5XY/aCuAxiI=; Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e2XrP-0004RY-0H for openvpn-devel@lists.sourceforge.net; Thu, 12 Oct 2017 07:24:55 +0000 Received: from SR5.amebis.doma (sr5.amebis.doma [192.168.100.81]) by amebis01.amebis.si (Postfix) with ESMTP id 1D9F0407BD; Thu, 12 Oct 2017 09:24:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507793082; bh=z4yWOQsAOM+D1yE8nWIQd7tq2uj11TBy7ZEUD8yX9mk=; h=From:To:Cc:Subject:Date:Message-Id; b=NNCA4IkYFegSfQUHjnlUXPzisrIkWtm2AJearQprcyH4pOfkvWXBPkUMa3bAuMLE6 dq2YkVpu733F6CXVKtAkA8aj07jxCOscUi95Jev+s+hcI/Zs5aupMhl0QiLQ66bKPT 69JdmjoVBEF6yT+LmzClC89qKEZJk+b33ddHQLYo= From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Oct 2017 09:24:40 +0200 Message-Id: <20171012072440.8704-1-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e2XrP-0004RY-0H Subject: [Openvpn-devel] [PATCH] Uniform snwprintf() across MinGW and MSVC compilers 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 MinGW's snwprintf() is a replacement for ISO C's swprintf() used by MSVC. MSVC also provides _snwprintf(), however using it leads to unportable code. After a discussion with Selva Nair on devel mailing list, an agreement was reached to use swprintf() for MSVC builds. This patch uniforms snwprintf() usage while making it compile using MinGW and MSVC. Assigning _snwprintf() return value to unused variable was also removed at one occasion. --- config-msvc.h | 3 ++- src/openvpn/tun.c | 2 +- src/openvpnserv/interactive.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index 0bb153d..c940d15 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -93,9 +93,10 @@ #define strncasecmp strnicmp #define strcasecmp _stricmp -#if _MSC_VER<1900 +#if _MSC_VER < 1900 #define snprintf _snprintf #endif +#define snwprintf swprintf #if _MSC_VER < 1800 #define strtoull strtoul diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 3639718..9e3ca41 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -4622,7 +4622,7 @@ get_adapter_index_method_1(const char *guid) DWORD index; ULONG aindex; wchar_t wbuf[256]; - _snwprintf(wbuf, SIZE(wbuf), L"\\DEVICE\\TCPIP_%S", guid); + snwprintf(wbuf, SIZE(wbuf), L"\\DEVICE\\TCPIP_%S", guid); wbuf [SIZE(wbuf) - 1] = 0; if (GetAdapterIndex(wbuf, &aindex) != NO_ERROR) { diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 823b25b..a060a06 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -276,7 +276,7 @@ ReturnProcessId(HANDLE pipe, DWORD pid, DWORD count, LPHANDLE events) * Same format as error messages (3 line string) with error = 0 in * 0x%08x format, PID on line 2 and a description "Process ID" on line 3 */ - _snwprintf(buf, _countof(buf), L"0x%08x\n0x%08x\n%s", 0, pid, msg); + snwprintf(buf, _countof(buf), L"0x%08x\n0x%08x\n%s", 0, pid, msg); buf[_countof(buf) - 1] = '\0'; WritePipeAsync(pipe, buf, wcslen(buf) * 2, count, events); @@ -1066,7 +1066,7 @@ RegisterDNS(LPVOID unused) if (GetSystemDirectory(sys_path, MAX_PATH)) { - _snwprintf(ipcfg, MAX_PATH, L"%s\\%s", sys_path, L"ipconfig.exe"); + snwprintf(ipcfg, MAX_PATH, L"%s\\%s", sys_path, L"ipconfig.exe"); ipcfg[MAX_PATH-1] = L'\0'; } @@ -1706,8 +1706,8 @@ RunOpenvpn(LPVOID p) else if (exit_code != 0) { WCHAR buf[256]; - int len = _snwprintf(buf, _countof(buf), - L"OpenVPN exited with error: exit code = %lu", exit_code); + snwprintf(buf, _countof(buf), + L"OpenVPN exited with error: exit code = %lu", exit_code); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_OPENVPN_STARTUP, buf, 1, &exit_event); }