From nobody Mon Feb 9 01:49:19 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 1549989637082140.13904070760668; Tue, 12 Feb 2019 08:40:37 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7C49C0669CF; Tue, 12 Feb 2019 16:40:33 +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 9F6295D970; 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 26AA81819AF9; 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 x1CGeU4N004095 for ; Tue, 12 Feb 2019 11:40:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 42C329CD6; Tue, 12 Feb 2019 16:40:30 +0000 (UTC) Received: from lpt.brq.redhat.com (unknown [10.43.2.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE0C5600C6 for ; Tue, 12 Feb 2019 16:40:29 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 12 Feb 2019 17:40:37 +0100 Message-Id: <750739c5641caf4a6ed83919ee406955bd6c2327.1549989584.git.jtomko@redhat.com> 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 3/6] Remove EMPTYSTR macro 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 12 Feb 2019 16:40:35 +0000 (UTC) This macro neither takes nor produces an empty string. Remove it in favor of NULLSTR_MINUS. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/internal.h | 5 ----- tools/virsh-network.c | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/internal.h b/src/internal.h index 7c11f57e33..cf03a82105 100644 --- a/src/internal.h +++ b/src/internal.h @@ -240,11 +240,6 @@ */ # define NULLSTR(s) ((s) ? (s) : "") =20 -/* - * Similar to NULLSTR, but print '-' to make it more user friendly. - */ -# define EMPTYSTR(s) ((s) ? (s) : "-") - /* * Turn a NULL string into an empty string */ diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 94adbabff7..9b86ef8071 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1398,11 +1398,11 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd = *cmd) =20 if (vshTableRowAppend(table, expirytime, - EMPTYSTR(lease->mac), - EMPTYSTR(typestr), - EMPTYSTR(cidr_format), - EMPTYSTR(lease->hostname), - EMPTYSTR(lease->clientid), + NULLSTR_MINUS(lease->mac), + NULLSTR_MINUS(typestr), + NULLSTR_MINUS(cidr_format), + NULLSTR_MINUS(lease->hostname), + NULLSTR_MINUS(lease->clientid), NULL) < 0) goto cleanup; } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list