[Openvpn-devel,02/13] Mixing wide and regular strings in concatenations is not allowed in MSVC.
| Message ID | 20171010231130.6832-2-simon@rozman.si |
|---|---|
| State | Accepted |
| Headers |
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director4.mail.ord1d.rsapps.net ([172.30.157.10]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id n6aAFs1T3Vn8EAAAgoeIoA for <patchwork@openvpn.net>; Tue, 10 Oct 2017 19:12:13 -0400 Received: from director7.mail.ord1c.rsapps.net ([172.28.128.196]) by director4.mail.ord1d.rsapps.net (Dovecot) with LMTP id p2wvAM1T3Vn2OgAAHDmxtw ; Tue, 10 Oct 2017 19:12:13 -0400 Received: from smtp13.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director7.mail.ord1c.rsapps.net (Dovecot) with LMTP id NyGCKcRT3VlfQwAAqdfm7w ; Tue, 10 Oct 2017 19:12:13 -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-1204-w 0-298-1001-1568-w 0-298-0-6935-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=ZYtfDYdA 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=lZ4cS7aGu6OMoeGOBXgA: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: smtp13.gate.ord1c.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: 7200edac-ae10-11e7-8c5f-bc305bf03494-1-1 Received: from [216.34.181.88] ([216.34.181.88:58390] helo=lists.sourceforge.net) by smtp13.gate.ord1c.rsapps.net (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 0F/CB-14234-BC35DD95; Tue, 10 Oct 2017 19:12:11 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) id 1e23gi-0000WS-DX; Tue, 10 Oct 2017 23:11:48 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from <simon@rozman.si>) id 1e23ge-0000WF-7m for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +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; bh=iluGW8KibaAqPT77AMh2Q8h7ia7nvME5GjPWf/SyYaI=; b=HaiLeCv7mq68i2N9lm/U9gxI1GuLfS95elyqIe2tlEfIhPfBuXmMhFhNVKV9iX1Kkv1drSkZQfeJf4UaizBirplfsTwwbx0+is6hrPkFF8luVWw4EoPzALJDxxKYXqFz06/beLAqqG+EJkKwwFeUUCmTi6ea+6QIgIniLqnAKfU=; 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; bh=iluGW8KibaAqPT77AMh2Q8h7ia7nvME5GjPWf/SyYaI=; b=HDHAMkRRjGN0BMgl4UVg2K3vhNJn4WfQy4A77rxmWAzzqxhtSnH2cGr3j4NcF986bjmayGGJhh0dPokOeFbiBzmAMHP+YQWQB6azt6rm4Q3/PCIL6OyInXK962Ujx7aYHsb6UVGPKJUEvIz+V/NhZuRUvHKgfX4y6kHc9Pnwamk=; Received-SPF: pass (sog-mx-2.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-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0006sV-Gw for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 36E04405EF; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=22XRN5o1fNwaT8Ln+LpfB3nLa431l/ulR9ICJsX4PDU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=RjErdrrh2I9hrPt7Ie30vLXE2e3i1x9IiZhFj2jjm/ajiplOx47pqkxSPNpnOYPia rsWoD6WDPaa0EvspLYAHUklrM80jNyiS2K/l54oNE4++WBTv8HltdJZcOOtdrxNcfF SXGG1buGl3siInx3wQlS6fvNjQT/pfdg1dFb6B9c= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:19 +0200 Message-Id: <20171010231130.6832-2-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -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] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -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: 1e23gb-0006sV-Gw Subject: [Openvpn-devel] [PATCH 02/13] Mixing wide and regular strings in concatenations is not allowed in MSVC. X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openvpn-devel.lists.sourceforge.net> List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe> List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel> List-Post: <mailto:openvpn-devel@lists.sourceforge.net> List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox |
| Series |
[Openvpn-devel,01/13] snwprintf() => _snwprintf()
|
|
Commit Message
Simon Rozman
Oct. 10, 2017, 12:11 p.m. UTC
From: Simon Rozman <simon@rozman.si>
---
src/openvpnserv/interactive.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
Hi, On Tue, Oct 10, 2017 at 7:11 PM, <simon@rozman.si> wrote: > From: Simon Rozman <simon@rozman.si> > > --- > src/openvpnserv/interactive.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c > index 9d473e4..4b08086 100644 > --- a/src/openvpnserv/interactive.c > +++ b/src/openvpnserv/interactive.c > @@ -370,12 +370,12 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, > const WCHAR *options) > BOOL ret = FALSE; > int i; > const WCHAR *msg1 = L"You have specified a config file location (%s > relative to %s)" > - " that requires admin approval. This error may be > avoided" > - " by adding your account to the \"%s\" group"; > + L" that requires admin approval. This error may > be avoided" > + L" by adding your account to the \"%s\" group"; > > const WCHAR *msg2 = L"You have specified an option (%s) that may be > used" > - " only with admin approval. This error may be > avoided" > - " by adding your account to the \"%s\" group"; > + L" only with admin approval. This error may be > avoided" > + L" by adding your account to the \"%s\" group"; > > argv = CommandLineToArgvW(options, &argc); > This one is easy, though the original is valid C99, MSVC does not support concatenating non-identically prefixed strings. ACK. <div dir="ltr"><div class="gmail_extra">Hi,</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 10, 2017 at 7:11 PM, <span dir="ltr"><<a href="mailto:simon@rozman.si" target="_blank">simon@rozman.si</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Simon Rozman <<a href="mailto:simon@rozman.si" target="_blank">simon@rozman.si</a>><br> <br> ---<br> src/openvpnserv/interactive.c | 8 ++++----<br> 1 file changed, 4 insertions(+), 4 deletions(-)<br> <br> diff --git a/src/openvpnserv/interactive.<wbr>c b/src/openvpnserv/interactive.<wbr>c<br> index 9d473e4..4b08086 100644<br> --- a/src/openvpnserv/interactive.<wbr>c<br> +++ b/src/openvpnserv/interactive.<wbr>c<br> @@ -370,12 +370,12 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options)<br> BOOL ret = FALSE;<br> int i;<br> const WCHAR *msg1 = L"You have specified a config file location (%s relative to %s)"<br> - " that requires admin approval. This error may be avoided"<br> - " by adding your account to the \"%s\" group";<br> + L" that requires admin approval. This error may be avoided"<br> + L" by adding your account to the \"%s\" group";<br> <br> const WCHAR *msg2 = L"You have specified an option (%s) that may be used"<br> - " only with admin approval. This error may be avoided"<br> - " by adding your account to the \"%s\" group";<br> + L" only with admin approval. This error may be avoided"<br> + L" by adding your account to the \"%s\" group";<br> <br> argv = CommandLineToArgvW(options, &argc);<br></blockquote><div><br></div><div>This one is easy, though the original is valid C99, MSVC does not support concatenating non-identically prefixed strings.</div><div><br></div><div>ACK.</div><div><br></div></div></div></div> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Your patch has been applied to the master and release/2.4 branch.
commit d6e0917922793315b06aba395ed0666e17c5b44c (master)
commit 6e9da5a55673fe01ae7b780f0c438c81773109d5 (release/2.4)
Author: Simon Rozman
Date: Wed Oct 11 01:11:19 2017 +0200
Mixing wide and regular strings in concatenations is not allowed in MSVC.
Acked-by: Selva Nair <selva.nair@gmail.com>
Message-Id: <20171010231130.6832-2-simon@rozman.si>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15579.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 9d473e4..4b08086 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -370,12 +370,12 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) BOOL ret = FALSE; int i; const WCHAR *msg1 = L"You have specified a config file location (%s relative to %s)" - " that requires admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" that requires admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; const WCHAR *msg2 = L"You have specified an option (%s) that may be used" - " only with admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" only with admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; argv = CommandLineToArgvW(options, &argc);