From 8500571466d4eca676b205e02c25311582ea3a36 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Feb 2022 15:02:41 +0100
Subject: [PATCH] virsh: Use NULLSTR_EMPTY instead of ternary operator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
tools/virsh-domain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 73f05ce7f9..25097627ac 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7601,7 +7601,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd)
ignore_value(pinInfo = virBitmapDataFormat(info[i]->cpumap, info[i]->cpumaplen));
- if (vshTableRowAppend(table, iothreadIdStr, pinInfo ? pinInfo : "", NULL) < 0)
+ if (vshTableRowAppend(table, iothreadIdStr, NULLSTR_EMPTY(pinInfo), NULL) < 0)
goto cleanup;
}
@@ -14211,7 +14211,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
info[i]->mountpoint,
info[i]->name,
info[i]->fstype,
- targets ? targets : "",
+ NULLSTR_EMPTY(targets),
NULL) < 0)
goto cleanup;
}