From: Ján Tomko Date: Tue, 12 Feb 2019 16:15:17 +0000 (+0100) Subject: Remove EMPTY_STR macro X-Git-Tag: v5.1.0-rc1~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=375f5317b7e674e61912a7d941e2d3359f0865c9;p=thirdparty%2Flibvirt.git Remove EMPTY_STR macro Another misleadingly named macro. Deprecate in favor of NULLSTR_STAR. Signed-off-by: Ján Tomko Reviewed-by: Andrea Bolognani --- 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) -/* - * 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, "hostname")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "hostname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "client-id"))); } } @@ -200,8 +193,8 @@ virLeasePrintLeases(virJSONValuePtr leases_array_new, expirytime, virJSONValueObjectGetString(lease_tmp, "iaid"), virJSONValueObjectGetString(lease_tmp, "ip-address"), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), - EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "hostname")), + NULLSTR_STAR(virJSONValueObjectGetString(lease_tmp, "client-id"))); } } }