From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXrsE-00049m-Fs for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:21:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXrsD-0001Sh-B5 for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:21:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXrsD-0001Rn-1H for qemu-devel@nongnu.org; Fri, 04 Sep 2015 10:21:49 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id A286EA2C33 for ; Fri, 4 Sep 2015 14:21:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-25.ams2.redhat.com [10.36.116.25]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t84ELkCW029937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 4 Sep 2015 10:21:48 -0400 From: Markus Armbruster Date: Fri, 4 Sep 2015 16:21:30 +0200 Message-Id: <1441376500-14784-24-git-send-email-armbru@redhat.com> In-Reply-To: <1441376500-14784-1-git-send-email-armbru@redhat.com> References: <1441376500-14784-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 23/33] qapi-commands: Inline gen_marshal_output_call() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi-commands.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 3965ca8..6de5229 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -57,19 +57,15 @@ def gen_sync_call(name, args, ret_type): name=c_name(name), args=arglist, retval=retval).rstrip() if ret_type: ret += "\n" + gen_err_check('local_err') - ret += "\n" + mcgen(''' -%(marshal_output_call)s + ret += mcgen(''' + +qmp_marshal_output_%(c_name)s(retval, ret, &local_err); ''', - marshal_output_call=gen_marshal_output_call(name, ret_type)).rstrip() + c_name=c_name(name)) pop_indent() return ret.rstrip() -def gen_marshal_output_call(name, ret_type): - if not ret_type: - return "" - return "qmp_marshal_output_%s(retval, ret, &local_err);" % c_name(name) - def gen_visitor_input_containers_decl(args): ret = "" -- 2.4.3