[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 40/46] qom: Make functions taking Error ** return bool, not 0/-1
From: |
Markus Armbruster |
Subject: |
[PATCH 40/46] qom: Make functions taking Error ** return bool, not 0/-1 |
Date: |
Wed, 24 Jun 2020 18:43:38 +0200 |
Just for consistency. Also fix the example in object_set_props()'s
documentation.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qom/object.h | 28 +++++++++++-----------------
qom/object.c | 14 +++++++-------
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index b2d2558245..d74ede4eac 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -729,15 +729,13 @@ void object_apply_compat_props(Object *obj);
* Error *err = NULL;
* Object *obj = ...get / create object...;
*
- * obj = object_set_props(obj,
- * &err,
- * "share", "yes",
- * "mem-path", "/dev/shm/somefile",
- * "prealloc", "yes",
- * "size", "1048576",
- * NULL);
- *
- * if (!obj) {
+ * if (!object_set_props(obj,
+ * &err,
+ * "share", "yes",
+ * "mem-path", "/dev/shm/somefile",
+ * "prealloc", "yes",
+ * "size", "1048576",
+ * NULL)) {
* error_reportf_err(err, "Cannot set properties: ");
* }
* </programlisting>
@@ -746,11 +744,9 @@ void object_apply_compat_props(Object *obj);
* The returned object will have one stable reference maintained
* for as long as it is present in the object hierarchy.
*
- * Returns: -1 on error, 0 on success
+ * Returns: %true on success, %false on error.
*/
-int object_set_props(Object *obj,
- Error **errp,
- ...) QEMU_SENTINEL;
+bool object_set_props(Object *obj, Error **errp, ...) QEMU_SENTINEL;
/**
* object_set_propv:
@@ -760,11 +756,9 @@ int object_set_props(Object *obj,
*
* See object_set_props() for documentation.
*
- * Returns: -1 on error, 0 on success
+ * Returns: %true on success, %false on error.
*/
-int object_set_propv(Object *obj,
- Error **errp,
- va_list vargs);
+bool object_set_propv(Object *obj, Error **errp, va_list vargs);
/**
* object_initialize:
diff --git a/qom/object.c b/qom/object.c
index 684540a09f..9b479621e4 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -554,7 +554,7 @@ bool object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type);
obj = OBJECT(childobj);
- if (object_set_propv(obj, errp, vargs) < 0) {
+ if (!object_set_propv(obj, errp, vargs)) {
goto out;
}
@@ -746,7 +746,7 @@ Object *object_new_with_propv(const char *typename,
}
obj = object_new_with_type(klass->type);
- if (object_set_propv(obj, errp, vargs) < 0) {
+ if (!object_set_propv(obj, errp, vargs)) {
goto error;
}
@@ -773,12 +773,12 @@ Object *object_new_with_propv(const char *typename,
}
-int object_set_props(Object *obj,
+bool object_set_props(Object *obj,
Error **errp,
...)
{
va_list vargs;
- int ret;
+ bool ret;
va_start(vargs, errp);
ret = object_set_propv(obj, errp, vargs);
@@ -788,7 +788,7 @@ int object_set_props(Object *obj,
}
-int object_set_propv(Object *obj,
+bool object_set_propv(Object *obj,
Error **errp,
va_list vargs)
{
@@ -800,12 +800,12 @@ int object_set_propv(Object *obj,
g_assert(value != NULL);
if (!object_property_parse(obj, propname, value, errp)) {
- return -1;
+ return false;
}
propname = va_arg(vargs, char *);
}
- return 0;
+ return true;
}
--
2.26.2
- [PATCH 34/46] qom: Don't handle impossible object_property_get_link() failure, (continued)
- [PATCH 46/46] hmp: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24
- [PATCH 22/46] qapi: Make visitor functions taking Error ** return bool, not void, Markus Armbruster, 2020/06/24
- [PATCH 40/46] qom: Make functions taking Error ** return bool, not 0/-1,
Markus Armbruster <=
- [PATCH 45/46] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24
- [PATCH 35/46] qom: Use return values to check for error where that's simpler, Markus Armbruster, 2020/06/24
- [PATCH 21/46] hmp: Eliminate a variable in hmp_migrate_set_parameter(), Markus Armbruster, 2020/06/24
- [PATCH 38/46] qom: Smooth error checking with Coccinelle, Markus Armbruster, 2020/06/24
- [PATCH 36/46] qom: Put name parameter before value / visitor parameter, Markus Armbruster, 2020/06/24