From 80ed1b408a784c32d1149e3c32885f33aeaf57f8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 15 Jun 2007 08:18:55 +0000
Subject: Fri Jun 15 08:53:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

        * src/internal.h, src/virsh.c: Replace _N with N_ so that
          Solaris builds work (Mark Johnson).
        * src/virsh.c: Add a couple of missing error messages (Mark
          Johnson).
        * python/types.c: Fix NULL pointer deref on DEBUG build
          (Mark Johnson).
        * src/virsh.c: Spelling fix (Mark Johnson).
---
 types.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/types.c b/types.c
index 4672e1c..cc0f2b1 100644
--- a/types.c
+++ b/types.c
@@ -62,13 +62,13 @@ libvirt_charPtrWrap(char *str)
 {
     PyObject *ret;
 
-#ifdef DEBUG
-    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
-#endif
     if (str == NULL) {
         Py_INCREF(Py_None);
         return (Py_None);
     }
+#ifdef DEBUG
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
+#endif
     ret = PyString_FromString(str);
     free(str);
     return (ret);
@@ -79,13 +79,13 @@ libvirt_constcharPtrWrap(const char *str)
 {
     PyObject *ret;
 
-#ifdef DEBUG
-    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
-#endif
     if (str == NULL) {
         Py_INCREF(Py_None);
         return (Py_None);
     }
+#ifdef DEBUG
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
+#endif
     ret = PyString_FromString(str);
     return (ret);
 }
@@ -95,13 +95,13 @@ libvirt_charPtrConstWrap(const char *str)
 {
     PyObject *ret;
 
-#ifdef DEBUG
-    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
-#endif
     if (str == NULL) {
         Py_INCREF(Py_None);
         return (Py_None);
     }
+#ifdef DEBUG
+    printf("libvirt_xmlcharPtrWrap: str = %s\n", str);
+#endif
     ret = PyString_FromString(str);
     return (ret);
 }
-- 
cgit