david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qapi: Clean up shadowing of parameters and locals in inner scopes

Browse Source 
By un-inlining the visit of nested complex types.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-07 09:53:48 +02:00 committed by Luiz Capitulino
parent 468866b816
commit 4fa953f20d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/qapi-visit.py
View File

@ -35,6 +35,19 @@ def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base =
nested_field_prefix = "%s%s." % (field_prefix, argname) nested_field_prefix = "%s%s." % (field_prefix, argname)
ret += generate_visit_struct_fields(name, nested_field_prefix, ret += generate_visit_struct_fields(name, nested_field_prefix,
nested_fn_prefix, argentry) nested_fn_prefix, argentry)
ret += mcgen('''
static void visit_type_%(full_name)s_field_%(c_name)s(Visitor *m, %(name)s **obj, Error **errp)
{
Error *err = NULL;
''',
name=name, full_name=full_name, c_name=c_var(argname))
push_indent()
ret += generate_visit_struct_body(full_name, argname, argentry)
pop_indent()
ret += mcgen('''
}
''')
ret += mcgen(''' ret += mcgen('''
@ -69,7 +82,10 @@ if ((*obj)->%(prefix)shas_%(c_name)s) {
push_indent() push_indent()
if structured: if structured:
ret += generate_visit_struct_body(full_name, argname, argentry) ret += mcgen('''
visit_type_%(full_name)s_field_%(c_name)s(m, obj, &err);
''',
full_name=full_name, c_name=c_var(argname))
else: else:
ret += mcgen(''' ret += mcgen('''
visit_type_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, "%(name)s", &err); visit_type_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, "%(name)s", &err);
@ -106,8 +122,6 @@ if (!error_is_set(errp)) {
if len(field_prefix): if len(field_prefix):
ret += mcgen(''' ret += mcgen('''
Error **errp = &err; /* from outer scope */
Error *err = NULL;
visit_start_struct(m, NULL, "", "%(name)s", 0, &err); visit_start_struct(m, NULL, "", "%(name)s", 0, &err);
''', ''',
name=name) name=name)