[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and locals in inner scopes |
Date: |
Wed, 7 May 2014 09:53:48 +0200 |
By un-inlining the visit of nested complex types.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-visit.py | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 3eeb435..222ce62 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -35,6 +35,19 @@ def generate_visit_struct_fields(name, field_prefix,
fn_prefix, members, base =
nested_field_prefix = "%s%s." % (field_prefix, argname)
ret += generate_visit_struct_fields(name, nested_field_prefix,
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('''
@@ -69,7 +82,10 @@ if ((*obj)->%(prefix)shas_%(c_name)s) {
push_indent()
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:
ret += mcgen('''
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):
ret += mcgen('''
-Error **errp = &err; /* from outer scope */
-Error *err = NULL;
visit_start_struct(m, NULL, "", "%(name)s", 0, &err);
''',
name=name)
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 01/12] qapi: Update qapi-code-gen.txt example to match current code, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 03/12] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 02/12] qapi: Normalize marshalling's visitor initialization and cleanup, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 07/12] qapi-visit.py: Clean up a sloppy use of field prefix, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 04/12] qapi: Replace start_optional()/end_optional() by optional(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 12/12] qapi: Replace uncommon use of the error API by the common one, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and locals in inner scopes,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 08/12] qapi: Un-inline visit of implicit struct, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 10/12] hw: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_start_struct() succeeds, Markus Armbruster, 2014/05/07
- Re: [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Luiz Capitulino, 2014/05/15