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:
parent
57f5262868
commit
77908cfcda
@ -240,11 +240,6 @@
|
|||||||
*/
|
*/
|
||||||
# define NULLSTR(s) ((s) ? (s) : "<null>")
|
# 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
|
* Turn a NULL string into an empty string
|
||||||
*/
|
*/
|
||||||
|
@ -1398,11 +1398,11 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd)
|
|||||||
|
|
||||||
if (vshTableRowAppend(table,
|
if (vshTableRowAppend(table,
|
||||||
expirytime,
|
expirytime,
|
||||||
EMPTYSTR(lease->mac),
|
NULLSTR_MINUS(lease->mac),
|
||||||
EMPTYSTR(typestr),
|
NULLSTR_MINUS(typestr),
|
||||||
EMPTYSTR(cidr_format),
|
NULLSTR_MINUS(cidr_format),
|
||||||
EMPTYSTR(lease->hostname),
|
NULLSTR_MINUS(lease->hostname),
|
||||||
EMPTYSTR(lease->clientid),
|
NULLSTR_MINUS(lease->clientid),
|
||||||
NULL) < 0)
|
NULL) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user