From patchwork Wed Feb 17 16:47:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 8341381 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3BACCC0553 for ; Wed, 17 Feb 2016 16:48:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98DD4203DB for ; Wed, 17 Feb 2016 16:48:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE7AC2039D for ; Wed, 17 Feb 2016 16:48:19 +0000 (UTC) Received: from localhost ([::1]:59465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW5H1-0002Bt-BG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 11:48:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW5Gl-00023g-Ce for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW5Gk-0003tL-Bp for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW5Gk-0003t7-6A for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:02 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C4C8080502; Wed, 17 Feb 2016 16:48:01 +0000 (UTC) Received: from localhost (ovpn-113-100.phx2.redhat.com [10.3.113.100]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1HGm0Wx015992; Wed, 17 Feb 2016 11:48:01 -0500 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 17:47:53 +0100 Message-Id: <1455727675-20625-4-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1455727675-20625-1-git-send-email-marcandre.lureau@redhat.com> References: <1455727675-20625-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , lersek@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 3/5] qga: use wide-chars constants for wchar_t comparisons X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Reported-by: Laszlo Ersek Signed-off-by: Marc-André Lureau Reviewed-by: Michael Roth --- qga/commands-win32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index e5afc5d..b20f107 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1266,8 +1266,10 @@ get_net_error_message(gint error) if (msg != NULL) { nchars = wcslen(msg); - if (nchars > 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r') { - msg[nchars-2] = '\0'; + if (nchars > 2 && + msg[nchars - 1] == L'\n' && + msg[nchars - 2] == L'\r') { + msg[nchars - 2] = L'\0'; } retval = g_utf16_to_utf8(msg, -1, NULL, NULL, NULL);