[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/18] qom: make object_ref/unref use a void * instead of Obje
From: |
Eduardo Habkost |
Subject: |
[PATCH v4 01/18] qom: make object_ref/unref use a void * instead of Object *. |
Date: |
Mon, 31 Aug 2020 17:07:23 -0400 |
From: Daniel P. Berrangé <berrange@redhat.com>
The object_ref/unref methods are intended for use with any subclass of
the base Object. Using "Object *" in the signature is not adding any
meaningful level of type safety, since callers simply use "OBJECT(ptr)"
and this expands to an unchecked cast "(Object *)".
By using "void *" we enable the object_unref() method to be used to
provide support for g_autoptr() with any subclass.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200723181410.3145233-2-berrange@redhat.com>
---
Changes v3 -> v4: none
Changes v2 -> v3: none
Changes v1 -> v2: none
---
include/qom/object.h | 4 ++--
qom/object.c | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 0f3a60617c..1f8aa2d48e 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1035,7 +1035,7 @@ GSList *object_class_get_list_sorted(const char
*implements_type,
* as its reference count is greater than zero.
* Returns: @obj
*/
-Object *object_ref(Object *obj);
+Object *object_ref(void *obj);
/**
* object_unref:
@@ -1044,7 +1044,7 @@ Object *object_ref(Object *obj);
* Decrease the reference count of a object. A object cannot be freed as long
* as its reference count is greater than zero.
*/
-void object_unref(Object *obj);
+void object_unref(void *obj);
/**
* object_property_try_add:
diff --git a/qom/object.c b/qom/object.c
index 00fdf89b3b..b1822a2ef4 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1124,8 +1124,9 @@ GSList *object_class_get_list_sorted(const char
*implements_type,
object_class_cmp);
}
-Object *object_ref(Object *obj)
+Object *object_ref(void *objptr)
{
+ Object *obj = OBJECT(objptr);
if (!obj) {
return NULL;
}
@@ -1133,8 +1134,9 @@ Object *object_ref(Object *obj)
return obj;
}
-void object_unref(Object *obj)
+void object_unref(void *objptr)
{
+ Object *obj = OBJECT(objptr);
if (!obj) {
return;
}
--
2.26.2
- [PATCH v4 00/18] qom: Automated conversion of type checking boilerplate, Eduardo Habkost, 2020/08/31
- [PATCH v4 03/18] qom: Allow class type name to be specified in OBJECT_DECLARE*, Eduardo Habkost, 2020/08/31
- [PATCH v4 01/18] qom: make object_ref/unref use a void * instead of Object *.,
Eduardo Habkost <=
- [PATCH v4 07/18] [automated] Delete duplicate QOM typedefs, Eduardo Habkost, 2020/08/31
- [PATCH v4 04/18] qom: DECLARE_*_CHECKERS macros, Eduardo Habkost, 2020/08/31
- [PATCH v4 05/18] qom: Make type checker functions accept const pointers, Eduardo Habkost, 2020/08/31
- [PATCH v4 02/18] qom: provide convenient macros for declaring and defining types, Eduardo Habkost, 2020/08/31
- [PATCH v4 06/18] codeconverter: script for automating QOM code cleanups, Eduardo Habkost, 2020/08/31
- [PATCH v4 09/18] [automated] Move QOM typedefs and add missing includes (pass 2), Eduardo Habkost, 2020/08/31
- [PATCH v4 10/18] [automated] Move QOM typedefs and add missing includes (pass 3), Eduardo Habkost, 2020/08/31
- [PATCH v4 08/18] [automated] Move QOM typedefs and add missing includes, Eduardo Habkost, 2020/08/31
- [PATCH v4 12/18] [automated] Use DECLARE_*CHECKER* macros (pass 2), Eduardo Habkost, 2020/08/31
- [PATCH v4 14/18] [semi-automated] Use DECLARE_*CHECKER* when possible (--force mode), Eduardo Habkost, 2020/08/31