From nobody Sat Feb 7 04:57:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 154402848491214.03818966097549; Wed, 5 Dec 2018 08:48:04 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 706467F6B3; Wed, 5 Dec 2018 16:48:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35C655D757; Wed, 5 Dec 2018 16:48:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 114293F7D5; Wed, 5 Dec 2018 16:48:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5Glx7h028416 for ; Wed, 5 Dec 2018 11:47:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 32D155D96F; Wed, 5 Dec 2018 16:47:59 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83F6A4F9AB; Wed, 5 Dec 2018 16:47:58 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 17:47:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 02/10] util: error: Fix error message strings to play well with additional info X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 05 Dec 2018 16:48:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Additional information for a string is always in form of a string or empty. Fix two offenders. One used %d as format modifier and second always expected a string. Both are thankfully unused currently. Signed-off-by: Peter Krempa Reviewed-by: Erik Skultety --- src/util/virerror.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index eca6ddf7d1..5d515bde57 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -977,7 +977,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg =3D _("POST operation failed"); break; case VIR_ERR_HTTP_ERROR: - errmsg =3D _("got unknown HTTP error code %d"); + if (info !=3D NULL) + errmsg =3D _("got unknown HTTP error code %s"); + else + errmsg =3D _("got unknown HTTP error code"); break; case VIR_ERR_UNKNOWN_HOST: if (info !=3D NULL) @@ -1004,7 +1007,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg =3D _("could not connect to Xen Store %s"); break; case VIR_ERR_XEN_CALL: - errmsg =3D _("failed Xen syscall %s"); + if (info =3D=3D NULL) + errmsg =3D _("failed Xen syscall"); + else + errmsg =3D _("failed Xen syscall %s"); break; case VIR_ERR_OS_TYPE: if (info =3D=3D NULL) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list