[PATCH v3 01/16] util: Generate a common internal only error print

[John Ferlan <jferlan@xxxxxxxxxx>]

If virObjectIsClass fails "internally" to virobject.c, create a macro to
generate the VIR_WARN describing what the problem is. Also improve the
checks and message a bit to indicate which was the failure - whether the
obj was NULL or just not the right class

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/util/virobject.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/util/virobject.c b/src/util/virobject.c
index 34805d3..ff9385b 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -47,6 +47,16 @@ struct _virClass {
     virObjectDisposeCallback dispose;
 };
 
+#define VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, objclass)                    \
+    do {                                                                    \
+        virObjectPtr obj = anyobj;                                          \
+        if (!obj)                                                           \
+            VIR_WARN("Object cannot be NULL");                              \
+        else                                                                \
+            VIR_WARN("Object %p (%s) is not a %s instance",                 \
+                      anyobj, obj->klass->name, #objclass);                 \
+    } while (0)
+
 static virClassPtr virObjectClass;
 static virClassPtr virObjectLockableClass;
 
@@ -312,14 +322,10 @@ virObjectRef(void *anyobj)
 static virObjectLockablePtr
 virObjectGetLockableObj(void *anyobj)
 {
-    virObjectPtr obj;
-
     if (virObjectIsClass(anyobj, virObjectLockableClass))
         return anyobj;
 
-    obj = anyobj;
-    VIR_WARN("Object %p (%s) is not a virObjectLockable instance",
-              anyobj, obj ? obj->klass->name : "(unknown)");
+    VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, virObjectLockableClass);
 
     return NULL;
 }
-- 
2.9.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list