External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove EMPTY_STR macro

Browse Source 
Another misleadingly named macro.
Deprecate in favor of NULLSTR_STAR.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2019-02-12 17:15:17 +01:00
parent 77908cfcda
commit 375f5317b7
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/virlease.c
View File

@ -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")));
}
}
}