From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMebp-0006zV-Ab for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMebn-0005ji-2R for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMebm-0005jO-RP for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:30 -0400 From: Markus Armbruster Date: Tue, 4 Aug 2015 17:58:04 +0200 Message-Id: <1438703896-12553-21-git-send-email-armbru@redhat.com> In-Reply-To: <1438703896-12553-1-git-send-email-armbru@redhat.com> References: <1438703896-12553-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v3 20/32] qapi-visit: Rearrange code a bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com Move gen_visit_decl() to a better place. Inline generate_visit_struct_body(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi-visit.py | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index ab7da81..9cfd2ff 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -18,6 +18,15 @@ import re implicit_structs_seen = set() struct_fields_seen = set() +def gen_visit_decl(name, scalar=False): + c_type = c_name(name) + ' *' + if not scalar: + c_type += '*' + return mcgen(''' +void visit_type_%(c_name)s(Visitor *m, %(c_type)sobj, const char *name, Error **errp); +''', + c_name=c_name(name), c_type=c_type) + def gen_visit_implicit_struct(typ): if typ in implicit_structs_seen: return '' @@ -114,12 +123,17 @@ out: ''') return ret -def gen_visit_struct_body(name): +def gen_visit_struct(name, base, members): + ret = gen_visit_struct_fields(name, base, members) + # FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to # *obj, but then visit_type_FOO_fields() fails, we should clean up *obj # rather than leaving it non-NULL. As currently written, the caller must # call qapi_free_FOO() to avoid a memory leak of the partial FOO. - ret = mcgen(''' + ret += mcgen(''' + +void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error **errp) +{ Error *err = NULL; visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); @@ -130,24 +144,10 @@ def gen_visit_struct_body(name): visit_end_struct(m, &err); } error_propagate(errp, err); +} ''', name=name, c_name=c_name(name)) - return ret -def gen_visit_struct(name, base, members): - ret = gen_visit_struct_fields(name, base, members) - ret += mcgen(''' - -void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error **errp) -{ -''', - c_name=c_name(name)) - - ret += gen_visit_struct_body(name) - - ret += mcgen(''' -} -''') return ret def gen_visit_list(name, element_type): @@ -329,15 +329,6 @@ out: return ret -def gen_visit_decl(name, scalar=False): - c_type = c_name(name) + ' *' - if not scalar: - c_type += '*' - return mcgen(''' -void visit_type_%(c_name)s(Visitor *m, %(c_type)sobj, const char *name, Error **errp); -''', - c_name=c_name(name), c_type=c_type) - class QAPISchemaGenVisitVisitor(QAPISchemaVisitor): def __init__(self): self.decl = None -- 2.4.3