qom: remove index from object_resolve_abs_path()
PATCH 1/1 qom: remove index from object_resolve_abs_path()
You can advance 'parts' to track the current path fragment. The 'index' parameter is unneeded.
Signed-off-by Masahiro Yamada <[email protected]>
---
qom/object.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
qom/object.c +8 -9
@@ -2012,25 +2012,24 @@ Object *object_resolve_path_component(Object *parent, const gchar *part)static Object *object_resolve_abs_path (Object *parent,gchar **parts, -const char *typename, -int index) +const char *typename) {Object *child; -if (parts[index] ==NULL ) { +if (*parts ==NULL ) {return object_dynamic_cast (parent, typename); } -if (strcmp (parts[index],"" ) ==0 ) { -return object_resolve_abs_path (parent, parts, typename, index +1 ); +if (strcmp (*parts,"" ) ==0 ) { +return object_resolve_abs_path (parent, parts +1 , typename); } - child =object_resolve_path_component (parent, parts[index]); + child =object_resolve_path_component (parent, *parts);if (!child) {return NULL ; } -return object_resolve_abs_path (child, parts, typename, index +1 ); +return object_resolve_abs_path (child, parts +1 , typename); } static Object *object_resolve_partial_path(Object *parent,
@@ -2042,7 +2041,7 @@ static Object *object_resolve_partial_path(Object *parent,GHashTableIter iter;ObjectProperty *prop; - obj =object_resolve_abs_path (parent, parts, typename,0 ); + obj =object_resolve_abs_path (parent, parts, typename);g_hash_table_iter_init (&iter, parent->properties);while (g_hash_table_iter_next (&iter,NULL , (gpointer *)&prop)) {
@@ -2087,7 +2086,7 @@ Object *object_resolve_path_type(const char *path, const char *typename, *ambiguousp = ambiguous; } }else { - obj =object_resolve_abs_path (object_get_root (), parts, typename,1 ); + obj =object_resolve_abs_path (object_get_root (), parts +1 , typename); }g_strfreev (parts);
Signature · 1 line
2.25.1
Paolo Bonzini
AppliedQuoted 56 lines · Masahiro Yamada
You can advance 'parts' to track the current path fragment. The 'index' parameter is unneeded.
Signed-off-by Masahiro Yamada <[email protected]>---
qom/object.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)qom/object.c +7
-8@@ -2012,25 +2012,24 @@ Object *object_resolve_path_component(Object *parent, const gchar *part)static Object *object_resolve_abs_path (Object *parent,gchar **parts, -const char *typename, -int index) +const char *typename) {Object *child; -if (parts[index] ==NULL ) { +if (*parts ==NULL ) {return object_dynamic_cast (parent, typename); } -if (strcmp (parts[index],"" ) ==0 ) { -return object_resolve_abs_path (parent, parts, typename, index +1 ); +if (strcmp (*parts,"" ) ==0 ) { +return object_resolve_abs_path (parent, parts +1 , typename); } - child =object_resolve_path_component (parent, parts[index]); + child =object_resolve_path_component (parent, *parts);if (!child) {return NULL ; } -return object_resolve_abs_path (child, parts, typename, index +1 ); +return object_resolve_abs_path (child, parts +1 , typename); } static Object *object_resolve_partial_path(Object *parent,@@ -2042,7 +2041,7 @@ static Object *object_resolve_partial_path(Object *parent,GHashTableIter iter;ObjectProperty *prop; - obj =object_resolve_abs_path (parent, parts, typename,0 ); + obj =object_resolve_abs_path (parent, parts, typename);g_hash_table_iter_init (&iter, parent->properties);while (g_hash_table_iter_next (&iter,NULL , (gpointer *)&prop)) {
qom/object.c Object *object_resolve_path_type(const char *path, const char *typename, · line 2092
Quoted 8 lines
qom/object.c +1
-1@@ -2087,7 +2086,7 @@ Object *object_resolve_path_type(const char *path, const char *typename, *ambiguousp = ambiguous; } }else { - obj =object_resolve_abs_path (object_get_root (), parts, typename,1 ); + obj =object_resolve_abs_path (object_get_root (), parts +1 , typename); }g_strfreev (parts);
Queued, thanks.
Paolo