From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPTNJ-0001ZA-PR for qemu-devel@nongnu.org; Tue, 19 Jul 2016 07:39:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPTNH-0001ur-KC for qemu-devel@nongnu.org; Tue, 19 Jul 2016 07:39:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPTNH-0001uT-E7 for qemu-devel@nongnu.org; Tue, 19 Jul 2016 07:39:43 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F039715555 for ; Tue, 19 Jul 2016 11:39:42 +0000 (UTC) From: Markus Armbruster Date: Tue, 19 Jul 2016 13:39:30 +0200 Message-Id: <1468928377-20384-9-git-send-email-armbru@redhat.com> In-Reply-To: <1468928377-20384-1-git-send-email-armbru@redhat.com> References: <1468928377-20384-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL for-2.7 08/15] qapi: Drop useless gen_err_check() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Blake Ever since commit 12f254f removed the last parameterization of gen_err_check(), it no longer makes sense to hide the three lines of generated C code behind a macro call. Just inline it into the remaining users. No change to generated code. Signed-off-by: Eric Blake Message-Id: <1468468228-27827-7-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi-commands.py | 4 +++- scripts/qapi-visit.py | 8 ++++++-- scripts/qapi.py | 8 -------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c93470c..333a46f 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -46,8 +46,10 @@ def gen_call(name, arg_type, ret_type): ''', c_name=c_name(name), args=argstr, lhs=lhs) if ret_type: - ret += gen_err_check() ret += mcgen(''' + if (err) { + goto out; + } qmp_marshal_output_%(c_name)s(retval, ret, &err); ''', diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 0b9e298..96f2491 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -47,9 +47,11 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp) if base: ret += mcgen(''' visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err); + if (err) { + goto out; + } ''', c_type=base.c_name()) - ret += gen_err_check() for memb in members: if memb.optional: @@ -60,10 +62,12 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp) push_indent() ret += mcgen(''' visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, &err); + if (err) { + goto out; + } ''', c_type=memb.type.c_name(), name=memb.name, c_name=c_name(memb.name)) - ret += gen_err_check() if memb.optional: pop_indent() ret += mcgen(''' diff --git a/scripts/qapi.py b/scripts/qapi.py index 27284be..9c48f6d 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1656,14 +1656,6 @@ def gen_params(arg_type, extra): return ret -def gen_err_check(): - return mcgen(''' - if (err) { - goto out; - } -''') - - # # Common command line parsing # -- 2.5.5