[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT d559ba1] QObject: Accept NULL
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT d559ba1] QObject: Accept NULL |
Date: |
Fri, 09 Oct 2009 02:21:59 -0000 |
From: Luiz Capitulino <address@hidden>
It is convenient that QDECREF() and QINCREF() accept the QObject
parameter to be NULL, so that we don't duplicate 'if' tests in
the callers.
Patchworks-ID: 35332
Signed-off-by: Luiz Capitulino <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/qobject.h b/qobject.h
index 39b8649..dcc8c63 100644
--- a/qobject.h
+++ b/qobject.h
@@ -63,12 +63,10 @@ typedef struct QObject {
/* High-level interface for qobject_incref() */
#define QINCREF(obj) \
- assert(obj != NULL); \
qobject_incref(QOBJECT(obj))
/* High-level interface for qobject_decref() */
#define QDECREF(obj) \
- assert(obj != NULL); \
qobject_decref(QOBJECT(obj))
/* Initialize an object to default values */
@@ -81,7 +79,8 @@ typedef struct QObject {
*/
static inline void qobject_incref(QObject *obj)
{
- obj->refcnt++;
+ if (obj)
+ obj->refcnt++;
}
/**
@@ -90,7 +89,7 @@ static inline void qobject_incref(QObject *obj)
*/
static inline void qobject_decref(QObject *obj)
{
- if (--obj->refcnt == 0) {
+ if (obj && --obj->refcnt == 0) {
assert(obj->type != NULL);
assert(obj->type->destroy != NULL);
obj->type->destroy(obj);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT d559ba1] QObject: Accept NULL,
Anthony Liguori <=