[libvirt] [PATCH] Fix more printf("%s", NULL) usage

[john.levon at sun.com]

# HG changeset patch
# User john.levon at sun.com
# Date 1233580871 28800
# Node ID e61a2e486a59394ea422d90e1104f805ceabd0be
# Parent  430096efc257a704fdd6294829686d05f38da68e
Fix more printf("%s", NULL) usage

Signed-off-by: John Levon <john.levon at sun.com>

diff --git a/src/libvirt.c b/src/libvirt.c
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -2871,7 +2871,9 @@ virDomainMigratePrepare (virConnectPtr d
                            const char *dname,
                            unsigned long bandwidth)
 {
-    DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, flags=%lu, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, uri_in, uri_out, flags, dname, bandwidth);
+    VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, "
+        "flags=%lu, dname=%s, bandwidth=%lu", dconn, cookie, cookielen,
+        NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth);
 
     virResetLastError();
 
@@ -2917,7 +2919,9 @@ virDomainMigratePerform (virDomainPtr do
                            unsigned long bandwidth)
 {
     virConnectPtr conn;
-    DEBUG("domain=%p, cookie=%p, cookielen=%d, uri=%s, flags=%lu, dname=%s, bandwidth=%lu", domain, cookie, cookielen, uri, flags, dname, bandwidth);
+    VIR_DEBUG("domain=%p, cookie=%p, cookielen=%d, uri=%s, flags=%lu, "
+        "dname=%s, bandwidth=%lu", domain, cookie, cookielen, uri, flags,
+        NULLSTR(dname), bandwidth);
 
     virResetLastError();
 
@@ -2962,7 +2966,8 @@ virDomainMigrateFinish (virConnectPtr dc
                           const char *uri,
                           unsigned long flags)
 {
-    DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, flags=%lu", dconn, dname, cookie, cookielen, uri, flags);
+    VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, "
+        "flags=%lu", dconn, NULLSTR(dname), cookie, cookielen, uri, flags);
 
     virResetLastError();
 
@@ -3010,7 +3015,9 @@ virDomainMigratePrepare2 (virConnectPtr 
                           unsigned long bandwidth,
                           const char *dom_xml)
 {
-    DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, flags=%lu, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, cookie, cookielen, uri_in, uri_out, flags, dname, bandwidth, dom_xml);
+    VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p,"
+        "flags=%lu, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, cookie,
+        cookielen, uri_in, uri_out, flags, NULLSTR(dname), bandwidth, dom_xml);
 
     virResetLastError();
 
@@ -3056,7 +3063,9 @@ virDomainMigrateFinish2 (virConnectPtr d
                          unsigned long flags,
                          int retcode)
 {
-    DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, flags=%lu, retcode=%d", dconn, dname, cookie, cookielen, uri, flags, retcode);
+    VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, "
+        "flags=%lu, retcode=%d", dconn, NULLSTR(dname), cookie,
+        cookielen, uri, flags, retcode);
 
     virResetLastError();