External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Create common error path for invalid object

Browse Source 
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@redhat.com>
This commit is contained in:
John Ferlan 2017-07-28 11:09:31 -04:00
parent 045d712c4b
commit 19f4395230
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/util/virobject.c
View File

@ -47,6 +47,17 @@ struct _virClass {
virObjectDisposeCallback dispose; 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 virObjectClass;
static virClassPtr virObjectLockableClass; static virClassPtr virObjectLockableClass;
static virClassPtr virObjectRWLockableClass; static virClassPtr virObjectRWLockableClass;
@ -370,15 +381,10 @@ virObjectRef(void *anyobj)
static virObjectLockablePtr static virObjectLockablePtr
virObjectGetLockableObj(void *anyobj) virObjectGetLockableObj(void *anyobj)
{ {
virObjectPtr obj;
if (virObjectIsClass(anyobj, virObjectLockableClass)) if (virObjectIsClass(anyobj, virObjectLockableClass))
return anyobj; return anyobj;
obj = anyobj; VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, virObjectLockable);
VIR_WARN("Object %p (%s) is not a virObjectLockable instance",
anyobj, obj ? obj->klass->name : "(unknown)");
return NULL; return NULL;
} }
@ -386,15 +392,10 @@ virObjectGetLockableObj(void *anyobj)
static virObjectRWLockablePtr static virObjectRWLockablePtr
virObjectGetRWLockableObj(void *anyobj) virObjectGetRWLockableObj(void *anyobj)
{ {
virObjectPtr obj;
if (virObjectIsClass(anyobj, virObjectRWLockableClass)) if (virObjectIsClass(anyobj, virObjectRWLockableClass))
return anyobj; return anyobj;
obj = anyobj; VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, virObjectRWLockable);
VIR_WARN("Object %p (%s) is not a virObjectRWLockable instance",
anyobj, obj ? obj->klass->name : "(unknown)");
return NULL; return NULL;
} }