From 03b4367a556179e3e59affa535493427bd009e9d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 16 Sep 2015 13:06:20 +0200 Subject: qapi: De-duplicate parameter list generation Generated qapi-event.[ch] lose line breaks. No change otherwise. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Daniel P. Berrange Message-Id: <1442401589-24189-18-git-send-email-armbru@redhat.com> --- scripts/qapi-commands.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scripts/qapi-commands.py') diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c68659a7b1..833768ef0e 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -17,19 +17,12 @@ import re def gen_command_decl(name, arg_type, ret_type): - argstr = '' - if arg_type: - for memb in arg_type.members: - if memb.optional: - argstr += 'bool has_%s, ' % c_name(memb.name) - argstr += '%s %s, ' % (memb.type.c_type(is_param=True), - c_name(memb.name)) return mcgen(''' -%(c_type)s qmp_%(c_name)s(%(args)sError **errp); +%(c_type)s qmp_%(c_name)s(%(params)s); ''', c_type=(ret_type and ret_type.c_type()) or 'void', c_name=c_name(name), - args=argstr) + params=gen_params(arg_type, 'Error **errp')) def gen_err_check(err): -- cgit 1.4.1