yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-28 09:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Drop string input visitor method optional()

Browse source 
visit_optional() is to be called only between visit_start_struct() and
visit_end_struct(). Visitors that don't support struct visits,
i.e. don't implement start_struct(), end_struct(), have no use for it.
Clarify documentation.

The string input visitor doesn't support struct visits. Its
parse_optional() is therefore useless. Drop it.

Backports commit a8aec6de2ac1a5e36989fdfba29067b361009b75 from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 12:07:50 -05:00 committed by Lioncash
parent 84e5261cdf
commit 50e3cda49a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/include/qapi/visitor-impl.h
View file

@ -103,8 +103,8 @@ struct Visitor
/* Must be set to visit explicit null values. */
void (*type_null)(Visitor *v, const char *name, Error **errp);
/* Must be set for input visitors, optional otherwise. The core
* takes care of the return type in the public interface. */
/* Must be set for input visitors to visit structs, optional otherwise.
The core takes care of the return type in the public interface. */
void (*optional)(Visitor *v, const char *name, bool *present);
/* Must be set */

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

@ -292,18 +292,6 @@ static void parse_type_number(Visitor *v, const char *name, double *obj,
*obj = val;
}
static void parse_optional(Visitor *v, const char *name, bool *present)
{
StringInputVisitor *siv = to_siv(v);
if (!siv->string) {
*present = false;
return;
}
*present = true;
}
static void string_input_free(Visitor *v)
{
StringInputVisitor *siv = to_siv(v);
@ -329,7 +317,6 @@ Visitor *string_input_visitor_new(const char *str)
v->visitor.start_list = start_list;
v->visitor.next_list = next_list;
v->visitor.end_list = end_list;
v->visitor.optional = parse_optional;
v->visitor.free = string_input_free;
v->string = str;