From patchwork Tue Aug 18 14:19:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 508344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B18C2140293 for ; Wed, 19 Aug 2015 00:27:45 +1000 (AEST) Received: from localhost ([::1]:57504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRhrb-0001Y6-Rt for incoming@patchwork.ozlabs.org; Tue, 18 Aug 2015 10:27:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRhl5-0002ld-4Y for qemu-devel@nongnu.org; Tue, 18 Aug 2015 10:21:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRhl1-0005kp-2C for qemu-devel@nongnu.org; Tue, 18 Aug 2015 10:20:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRhl0-0005ki-MA for qemu-devel@nongnu.org; Tue, 18 Aug 2015 10:20:54 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 5EB12344F74; Tue, 18 Aug 2015 14:20:54 +0000 (UTC) Received: from red.redhat.com (ovpn-113-180.phx2.redhat.com [10.3.113.180]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7IEKBPh029844; Tue, 18 Aug 2015 10:20:51 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 18 Aug 2015 07:19:51 -0700 Message-Id: <1439907602-11414-10-git-send-email-eblake@redhat.com> In-Reply-To: <1439907602-11414-1-git-send-email-eblake@redhat.com> References: <1439907602-11414-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: armbru@redhat.com, Michael Roth Subject: [Qemu-devel] [PATCH RFC v3 09/20] qapi: Use consistent generated code patterns X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We had a pointless difference in label names, and on whether the generated code used: if (*obj) { stuff; ... } vs. if (!*obj) { goto out_obj; } stuff; ... Pick a single style, as it will make it easier for later patches to uniformly apply any updates to generated code. No change in semantics to the generated code. Signed-off-by: Eric Blake --- scripts/qapi-visit.py | 53 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index cea0414..58afb2d 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -208,7 +208,7 @@ void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error } visit_get_next_type(m, &(*obj)->type, %(promote_int)s, name, &err); if (err) { - goto out_end; + goto out_obj; } switch ((*obj)->type) { ''', @@ -229,7 +229,7 @@ void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", "%(name)s"); } -out_end: +out_obj: visit_end_implicit_struct(m, err ? NULL : &err); out: error_propagate(errp, err); @@ -261,33 +261,35 @@ void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error if (err) { goto out; } - if (*obj) { + if (!*obj) { + goto out_obj; + } ''', c_name=c_name(name), name=name) tag_key = variants.tag_member.name if base: ret += mcgen(''' - visit_type_%(c_name)s_fields(m, (%(c_name)s **)obj, &err); - if (err) { - goto out_obj; - } + visit_type_%(c_name)s_fields(m, (%(c_name)s **)obj, &err); + if (err) { + goto out_obj; + } ''', c_name=c_name(base.name)) else: ret += mcgen(''' - visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "%(name)s", &err); - if (err) { - goto out_obj; - } + visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "%(name)s", &err); + if (err) { + goto out_obj; + } ''', c_type=variants.tag_member.type.c_name(), c_name=c_name(tag_key), name=tag_key) ret += mcgen(''' - if (!visit_start_union(m, !!(*obj)->data, &err) || err) { - goto out_obj; - } - switch ((*obj)->%(c_name)s) { + if (!visit_start_union(m, !!(*obj)->data, &err) || err) { + goto out_obj; + } + switch ((*obj)->%(c_name)s) { ''', c_name=c_name(tag_key)) @@ -295,34 +297,33 @@ void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error # TODO ugly special case for simple union simple_union_type = var.simple_union_type() ret += mcgen(''' - case %(case)s: + case %(case)s: ''', case=c_enum_const(variants.tag_member.type.name, var.name)) if simple_union_type: ret += mcgen(''' - visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "data", &err); + visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "data", &err); ''', c_type=simple_union_type.c_name(), c_name=c_name(var.name)) else: ret += mcgen(''' - visit_type_implicit_%(c_type)s(m, &(*obj)->%(c_name)s, &err); + visit_type_implicit_%(c_type)s(m, &(*obj)->%(c_name)s, &err); ''', c_type=var.type.c_name(), c_name=c_name(var.name)) ret += mcgen(''' - break; + break; ''') ret += mcgen(''' - default: - abort(); - } -out_obj: - error_propagate(errp, err); - err = NULL; - visit_end_union(m, !!(*obj)->data, &err); + default: + abort(); } +out_obj: + error_propagate(errp, err); + err = NULL; + visit_end_union(m, !!(*obj)->data, &err); visit_end_struct(m, err ? NULL : &err); out: error_propagate(errp, err);