mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-01-10 19:35:32 +00:00
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. Backports commit 7a0525c7be6b38d32d586e3fd12e7377ded21faa from qemu
This commit is contained in:
parent
7f741a6c9b
commit
e88a7e260b
|
@ -22,9 +22,6 @@ typedef struct StringInputVisitor StringInputVisitor;
|
||||||
* QAPI structs, alternates, null, or arbitrary QTypes. It also
|
* QAPI structs, alternates, null, or arbitrary QTypes. It also
|
||||||
* requires a non-null list argument to visit_start_list().
|
* requires a non-null list argument to visit_start_list().
|
||||||
*/
|
*/
|
||||||
StringInputVisitor *string_input_visitor_new(const char *str);
|
Visitor *string_input_visitor_new(const char *str);
|
||||||
void string_input_visitor_cleanup(StringInputVisitor *v);
|
|
||||||
|
|
||||||
Visitor *string_input_get_visitor(StringInputVisitor *v);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -304,26 +304,16 @@ static void parse_optional(Visitor *v, const char *name, bool *present)
|
||||||
*present = true;
|
*present = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Visitor *string_input_get_visitor(StringInputVisitor *v)
|
|
||||||
{
|
|
||||||
return &v->visitor;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void string_input_free(Visitor *v)
|
static void string_input_free(Visitor *v)
|
||||||
{
|
{
|
||||||
StringInputVisitor *siv = to_siv(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)
|
Visitor *string_input_visitor_new(const char *str)
|
||||||
{
|
|
||||||
g_list_foreach(v->ranges, free_range, NULL);
|
|
||||||
g_list_free(v->ranges);
|
|
||||||
g_free(v);
|
|
||||||
}
|
|
||||||
|
|
||||||
StringInputVisitor *string_input_visitor_new(const char *str)
|
|
||||||
{
|
{
|
||||||
StringInputVisitor *v;
|
StringInputVisitor *v;
|
||||||
|
|
||||||
|
@ -343,5 +333,5 @@ StringInputVisitor *string_input_visitor_new(const char *str)
|
||||||
v->visitor.free = string_input_free;
|
v->visitor.free = string_input_free;
|
||||||
|
|
||||||
v->string = str;
|
v->string = str;
|
||||||
return v;
|
return &v->visitor;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,
|
void object_property_parse(struct uc_struct *uc, Object *obj, const char *string,
|
||||||
const char *name, Error **errp)
|
const char *name, Error **errp)
|
||||||
{
|
{
|
||||||
StringInputVisitor *siv;
|
Visitor *v = string_input_visitor_new(string);
|
||||||
siv = string_input_visitor_new(string);
|
object_property_set(uc, obj, v, name, errp);
|
||||||
object_property_set(uc, obj, string_input_get_visitor(siv), name, errp);
|
visit_free(v);
|
||||||
|
|
||||||
string_input_visitor_cleanup(siv);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *object_property_get_type(struct uc_struct *uc, Object *obj,
|
const char *object_property_get_type(struct uc_struct *uc, Object *obj,
|
||||||
|
|
Loading…
Reference in a new issue