From nobody Tue Apr 30 15:25:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558967212; cv=none; d=zoho.com; s=zohoarc; b=bfP1xECxfD1vUiYKIDN6CdyJmbahTE700OFFV7XvEXCnOAQxduyRbpFiA9VwiL83hIVtTcX+7bzyUZQhouExNZ6jhMWohtj7zwa1QMCASnIZJ1dFaX0BB8/1/agGW4uzo8UX0hwYBkBWDskI3ZkxQCrt5V3ZkBUZTjFBjU2CVY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558967212; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=af64ZIsHJsMMujKlg1H10dm2Q/CTo0T1dBxmAb9/TR4=; b=Gulv1pM6TMs0+ajydrmpqLZYn85pcWsR5YxJv0NHXCX+WMB+PYBvlcFfhXwZOr7pAwogMwa+QZw9QAf/pd7uBSG8N10Hit7fN3c4nf3APb4a/ZBe2l+JZk8o1e9n9PwUoVr+5comxwD0px2yQAAjc0FqZnNnlmNasyFvyYY4Ak4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558967212935952.248594972697; Mon, 27 May 2019 07:26:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:46633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVGaJ-0003rJ-Ha for importer@patchew.org; Mon, 27 May 2019 10:26:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVGZV-0003Uf-61 for qemu-devel@nongnu.org; Mon, 27 May 2019 10:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVGZU-0005f7-7M for qemu-devel@nongnu.org; Mon, 27 May 2019 10:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVGZT-0005dR-Va for qemu-devel@nongnu.org; Mon, 27 May 2019 10:25:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 412FE307D860 for ; Mon, 27 May 2019 14:25:45 +0000 (UTC) Received: from localhost (unknown [10.40.205.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99DB010027B6; Mon, 27 May 2019 14:25:42 +0000 (UTC) From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 27 May 2019 16:25:40 +0200 Message-Id: <20190527142540.23255-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 27 May 2019 14:25:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] ui/curses: Fix build with -m32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" wchar_t may resolve to be an unsigned long on 32-bit architectures. Using the %x conversion specifier will then give a compiler warning: ui/curses.c: In function =E2=80=98get_ucs=E2=80=99: ui/curses.c:492:49: error: format =E2=80=98%x=E2=80=99 expects argument of = type =E2=80=98unsigned int=E2=80=99, but argument 3 has type =E2=80=98wchar= _t=E2=80=99 {aka =E2=80=98long int=E2=80=99} [-Werror=3Dformat=3D] 492 | fprintf(stderr, "Could not convert 0x%04x " | ~~~^ | | | unsigned int | %04lx 493 | "from wchar_t to a multibyte character: %s\= n", 494 | wch, strerror(errno)); | ~~~ | | | wchar_t {aka long int} ui/curses.c:504:49: error: format =E2=80=98%x=E2=80=99 expects argument of = type =E2=80=98unsigned int=E2=80=99, but argument 3 has type =E2=80=98wchar= _t=E2=80=99 {aka =E2=80=98long int=E2=80=99} [-Werror=3Dformat=3D] 504 | fprintf(stderr, "Could not convert 0x%04x " | ~~~^ | | | unsigned int | %04lx 505 | "from a multibyte character to UCS-2 : %s\n= ", 506 | wch, strerror(errno)); | ~~~ | | | wchar_t {aka long int} Fix this by casting the wchar_t value to an unsigned long and using %lx as the conversion specifier. Fixes: b7b664a4fe9a955338f2e11a0f7433b29c8cbad0 Signed-off-by: Max Reitz Reviewed-by: Samuel Thibault --- ui/curses.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/curses.c b/ui/curses.c index 1f3fcabb00..e9319eb8ae 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -489,9 +489,9 @@ static uint16_t get_ucs(wchar_t wch, iconv_t conv) memset(&ps, 0, sizeof(ps)); ret =3D wcrtomb(mbch, wch, &ps); if (ret =3D=3D -1) { - fprintf(stderr, "Could not convert 0x%04x " + fprintf(stderr, "Could not convert 0x%04lx " "from wchar_t to a multibyte character: %s\n", - wch, strerror(errno)); + (unsigned long)wch, strerror(errno)); return 0xFFFD; } =20 @@ -501,9 +501,9 @@ static uint16_t get_ucs(wchar_t wch, iconv_t conv) such =3D sizeof(uch); =20 if (iconv(conv, &pmbch, &smbch, &puch, &such) =3D=3D (size_t) -1) { - fprintf(stderr, "Could not convert 0x%04x " + fprintf(stderr, "Could not convert 0x%04lx " "from a multibyte character to UCS-2 : %s\n", - wch, strerror(errno)); + (unsigned long)wch, strerror(errno)); return 0xFFFD; } =20 --=20 2.21.0