[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next] qom: Introduce object_property_is_{child,
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next] qom: Introduce object_property_is_{child, link}() |
Date: |
Sun, 27 May 2012 01:19:10 +0200 |
Avoids hardcoding partial string comparisons.
Signed-off-by: Alexander Barabash <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qom/object.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 173835b..00bb3b0 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -305,6 +305,16 @@ void object_initialize(void *data, const char *typename)
object_initialize_with_type(data, type);
}
+static inline bool object_property_is_child(ObjectProperty *prop)
+{
+ return strstart(prop->type, "child<", NULL);
+}
+
+static inline bool object_property_is_link(ObjectProperty *prop)
+{
+ return strstart(prop->type, "link<", NULL);
+}
+
static void object_property_del_all(Object *obj)
{
while (!QTAILQ_EMPTY(&obj->properties)) {
@@ -327,7 +337,7 @@ static void object_property_del_child(Object *obj, Object
*child, Error **errp)
ObjectProperty *prop;
QTAILQ_FOREACH(prop, &obj->properties, node) {
- if (strstart(prop->type, "child<", NULL) && prop->opaque == child) {
+ if (object_property_is_child(prop) && prop->opaque == child) {
object_property_del(obj, prop->name, errp);
break;
}
@@ -600,7 +610,7 @@ int object_child_foreach(Object *obj, int (*fn)(Object
*child, void *opaque),
int ret = 0;
QTAILQ_FOREACH(prop, &obj->properties, node) {
- if (strstart(prop->type, "child<", NULL)) {
+ if (object_property_is_child(prop)) {
ret = fn(prop->opaque, opaque);
if (ret != 0) {
break;
@@ -1022,7 +1032,7 @@ gchar *object_get_canonical_path(Object *obj)
g_assert(obj->parent != NULL);
QTAILQ_FOREACH(prop, &obj->parent->properties, node) {
- if (!strstart(prop->type, "child<", NULL)) {
+ if (!object_property_is_child(prop)) {
continue;
}
@@ -1056,9 +1066,9 @@ Object *object_resolve_path_component(Object *parent,
gchar *part)
return NULL;
}
- if (strstart(prop->type, "link<", NULL)) {
+ if (object_property_is_link(prop)) {
return *(Object **)prop->opaque;
- } else if (strstart(prop->type, "child<", NULL)) {
+ } else if (object_property_is_child(prop)) {
return prop->opaque;
} else {
return NULL;
@@ -1101,7 +1111,7 @@ static Object *object_resolve_partial_path(Object *parent,
QTAILQ_FOREACH(prop, &parent->properties, node) {
Object *found;
- if (!strstart(prop->type, "child<", NULL)) {
+ if (!object_property_is_child(prop)) {
continue;
}
--
1.7.7
- [Qemu-devel] [PATCH qom-next] qom: Introduce object_property_is_{child, link}(),
Andreas Färber <=