[PATCH 06/23] virsh: Use NULLSTR_EMPTY instead of ternary operator

Wednesday, 2 March 2022

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt;
---
 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;
         }
-- 
2.35.1


    