From nobody Sun Feb 8 06:22:32 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 1549989698799266.1961786049336; Tue, 12 Feb 2019 08:41:38 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60C6D8763B; Tue, 12 Feb 2019 16:41:35 +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 EBD3F5C226; Tue, 12 Feb 2019 16:41:34 +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 9B2873F602; Tue, 12 Feb 2019 16:41:34 +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 x1CGeVrM004102 for ; Tue, 12 Feb 2019 11:40:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1769B600C9; Tue, 12 Feb 2019 16:40:31 +0000 (UTC) Received: from lpt.brq.redhat.com (unknown [10.43.2.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91548600C6 for ; Tue, 12 Feb 2019 16:40:30 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 12 Feb 2019 17:40:38 +0100 Message-Id: <72d02744e2c90d4e142d1177f2233605c2a026ed.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 4/6] Remove EMPTY_STR 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 12 Feb 2019 16:41:37 +0000 (UTC) Another misleadingly named macro. Deprecate in favor of NULLSTR_STAR. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/util/virlease.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/util/virlease.c b/src/util/virlease.c index 7c6c37ec9d..93ca72e3af 100644 --- a/src/util/virlease.c +++ b/src/util/virlease.c @@ -42,13 +42,6 @@ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) =20 =20 -/* - * Use this when passing possibly-NULL strings to printf-a-likes. - * Required for unknown parameters during init call. - */ -#define EMPTY_STR(s) ((s) ? (s) : "*") - - int virLeaseReadCustomLeaseFile(virJSONValuePtr leases_array_new, const char *custom_lease_file, @@ -176,8 +169,8 @@ virLeasePrintLeases(virJSONValuePtr leases_array_new, expirytime, virJSONValueObjectGetString(lease_tmp, "mac-address"), virJSONValueObjectGetString(lease_tmp, "ip-address"), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostn= ame")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "clien= t-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "ho= stname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "cl= ient-id"))); } } =20 @@ -200,8 +193,8 @@ virLeasePrintLeases(virJSONValuePtr leases_array_new, expirytime, virJSONValueObjectGetString(lease_tmp, "iaid"), virJSONValueObjectGetString(lease_tmp, "ip-address"= ), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "h= ostname")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "c= lient-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp,= "hostname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp,= "client-id"))); } } } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list