Remove EMPTYSTR macro

This macro neither takes nor produces an empty string.
Remove it in favor of NULLSTR_MINUS.

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:11:11 +01:00
parent 57f5262868
commit 77908cfcda
2 changed files with 5 additions and 10 deletions

View File

@ -240,11 +240,6 @@
*/
# define NULLSTR(s) ((s) ? (s) : "<null>")
/*
* Similar to NULLSTR, but print '-' to make it more user friendly.
*/
# define EMPTYSTR(s) ((s) ? (s) : "-")
/*
* Turn a NULL string into an empty string
*/

View File

@ -1398,11 +1398,11 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd)
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;
}