From nobody Sun Feb 8 12:20:43 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 1549989636925706.8582921874292; Tue, 12 Feb 2019 08:40:36 -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 6A121C02833D; Tue, 12 Feb 2019 16:40:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF54F5B682; Tue, 12 Feb 2019 16:40:33 +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 5AB741819AFB; Tue, 12 Feb 2019 16:40:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1CGeT0V004085 for ; Tue, 12 Feb 2019 11:40:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6B353600C9; Tue, 12 Feb 2019 16:40:29 +0000 (UTC) Received: from lpt.brq.redhat.com (unknown [10.43.2.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id E58976019F for ; Tue, 12 Feb 2019 16:40:28 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 12 Feb 2019 17:40:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] tools: use NULLSTR_MINUS 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-Type: text/plain; charset="utf-8" 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.31]); Tue, 12 Feb 2019 16:40:35 +0000 (UTC) Use the newly introduced macro in the few places that open-code it. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-snapshot.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 1897a626d5..49de81af8c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -643,11 +643,11 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) "|./source/@volume)", ctxt); if (details) { if (vshTableRowAppend(table, type, device, target, - source ? source : "-", NULL) < 0) + NULLSTR_MINUS(source), NULL) < 0) goto cleanup; } else { if (vshTableRowAppend(table, target, - source ? source : "-", NULL) < 0) + NULLSTR_MINUS(source), NULL) < 0) goto cleanup; } =20 diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6d8e2b299b..90000ef1aa 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -945,7 +945,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) /* Since we already have the XML, there's no need to call * virDomainSnapshotGetParent */ parent =3D virXPathString("string(/domainsnapshot/parent/name)", ctxt); - vshPrint(ctl, "%-15s %s\n", _("Parent:"), parent ? parent : "-"); + vshPrint(ctl, "%-15s %s\n", _("Parent:"), NULLSTR_MINUS(parent)); =20 /* Children, Descendants. After this point, the fallback to * compute children is too expensive, so we gracefully quit if the --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list