diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-09 10:48:37 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-06 10:52:04 +0200 |
| commit | 7a0525c7be6b38d32d586e3fd12e7377ded21faa (patch) | |
| tree | 06f7dc1da296b1fea7357044989188c7059b585f /qom/object.c | |
| parent | 09204eac9bb513e56992c00c75f32f9d4766256b (diff) | |
| download | focaccia-qemu-7a0525c7be6b38d32d586e3fd12e7377ded21faa.tar.gz focaccia-qemu-7a0525c7be6b38d32d586e3fd12e7377ded21faa.zip | |
string-input-visitor: Favor new visit_free() function
Now that we have a polymorphic visit_free(), we no longer need string_input_visitor_cleanup(); which in turn means we no longer need to return a subtype from string_input_visitor_new() nor a public upcast function. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1465490926-28625-7-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qom/object.c')
| -rw-r--r-- | qom/object.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/qom/object.c b/qom/object.c index 3d6a95518b..02c0a3a98f 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1222,7 +1222,7 @@ int object_property_get_enum(Object *obj, const char *name, { Error *err = NULL; StringOutputVisitor *sov; - StringInputVisitor *siv; + Visitor *v; char *str; int ret; ObjectProperty *prop = object_property_find(obj, name, errp); @@ -1249,13 +1249,12 @@ int object_property_get_enum(Object *obj, const char *name, return 0; } str = string_output_get_string(sov); - siv = string_input_visitor_new(str); string_output_visitor_cleanup(sov); - visit_type_enum(string_input_get_visitor(siv), name, &ret, - enumprop->strings, errp); + v = string_input_visitor_new(str); + visit_type_enum(v, name, &ret, enumprop->strings, errp); g_free(str); - string_input_visitor_cleanup(siv); + visit_free(v); return ret; } @@ -1265,7 +1264,7 @@ void object_property_get_uint16List(Object *obj, const char *name, { Error *err = NULL; StringOutputVisitor *ov; - StringInputVisitor *iv; + Visitor *v; char *str; ov = string_output_visitor_new(false); @@ -1276,11 +1275,11 @@ void object_property_get_uint16List(Object *obj, const char *name, goto out; } str = string_output_get_string(ov); - iv = string_input_visitor_new(str); - visit_type_uint16List(string_input_get_visitor(iv), NULL, list, errp); + v = string_input_visitor_new(str); + visit_type_uint16List(v, NULL, list, errp); g_free(str); - string_input_visitor_cleanup(iv); + visit_free(v); out: string_output_visitor_cleanup(ov); } @@ -1288,11 +1287,9 @@ out: void object_property_parse(Object *obj, const char *string, const char *name, Error **errp) { - StringInputVisitor *siv; - siv = string_input_visitor_new(string); - object_property_set(obj, string_input_get_visitor(siv), name, errp); - - string_input_visitor_cleanup(siv); + Visitor *v = string_input_visitor_new(string); + object_property_set(obj, v, name, errp); + visit_free(v); } char *object_property_print(Object *obj, const char *name, bool human, |