yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 04:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

string-input-visitor: Favor new visit_free() function

Browse source 
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.

Backports commit 7a0525c7be6b38d32d586e3fd12e7377ded21faa from qemu
This commit is contained in:
Eric Blake 2018-02-25 01:08:00 -05:00 committed by Lioncash
parent 7f741a6c9b
commit e88a7e260b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/include/qapi/string-input-visitor.h
View file

@ -22,9 +22,6 @@ typedef struct StringInputVisitor StringInputVisitor;
* QAPI structs, alternates, null, or arbitrary QTypes. It also
* requires a non-null list argument to visit_start_list().
*/
StringInputVisitor *string_input_visitor_new(const char *str);
void string_input_visitor_cleanup(StringInputVisitor *v);
Visitor *string_input_get_visitor(StringInputVisitor *v);
Visitor *string_input_visitor_new(const char *str);
#endif

20
qemu/qapi/string-input-visitor.c
View file

@ -304,26 +304,16 @@ static void parse_optional(Visitor *v, const char *name, bool *present)
*present = true;
}
Visitor *string_input_get_visitor(StringInputVisitor *v)
{
return &v->visitor;
}
static void string_input_free(Visitor *v)
{
StringInputVisitor *siv = to_siv(v);
string_input_visitor_cleanup(siv);
g_list_foreach(siv->ranges, free_range, NULL);
g_list_free(siv->ranges);
g_free(siv);
}
void string_input_visitor_cleanup(StringInputVisitor *v)
{
g_list_foreach(v->ranges, free_range, NULL);
g_list_free(v->ranges);
g_free(v);
}
StringInputVisitor *string_input_visitor_new(const char *str)
Visitor *string_input_visitor_new(const char *str)
{
StringInputVisitor *v;
@ -343,5 +333,5 @@ StringInputVisitor *string_input_visitor_new(const char *str)
v->visitor.free = string_input_free;
v->string = str;
return v;
return &v->visitor;
}

8
qemu/qom/object.c
View file

@ -1099,11 +1099,9 @@ int64_t object_property_get_int(struct uc_struct *uc, Object *obj, const char *n
void object_property_parse(struct uc_struct *uc, Object *obj, const char *string,
const char *name, Error **errp)
{
StringInputVisitor *siv;
siv = string_input_visitor_new(string);
object_property_set(uc, obj, string_input_get_visitor(siv), name, errp);
string_input_visitor_cleanup(siv);
Visitor *v = string_input_visitor_new(string);
object_property_set(uc, obj, v, name, errp);
visit_free(v);
}
const char *object_property_get_type(struct uc_struct *uc, Object *obj,