From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGPqF-0007TD-Mc for qemu-devel@nongnu.org; Mon, 02 Sep 2013 04:50:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGPq9-0005Eq-U8 for qemu-devel@nongnu.org; Mon, 02 Sep 2013 04:50:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGPq9-0005Eb-Ma for qemu-devel@nongnu.org; Mon, 02 Sep 2013 04:50:29 -0400 From: Kevin Wolf Date: Mon, 2 Sep 2013 10:49:29 +0200 Message-Id: <1378111792-20436-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1378111792-20436-1-git-send-email-kwolf@redhat.com> References: <1378111792-20436-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL v2 03/26] qapi-types.py: Split off generate_struct_fields() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- scripts/qapi-types.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5ee46ea..86de980 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -57,12 +57,8 @@ typedef struct %(name)sList ''', name=name) -def generate_struct(structname, fieldname, members): - ret = mcgen(''' -struct %(name)s -{ -''', - name=structname) +def generate_struct_fields(members): + ret = '' for argname, argentry, optional, structured in parse_args(members): if optional: @@ -80,6 +76,17 @@ struct %(name)s ''', c_type=c_type(argentry), c_name=c_var(argname)) + return ret + +def generate_struct(structname, fieldname, members): + ret = mcgen(''' +struct %(name)s +{ +''', + name=structname) + + ret += generate_struct_fields(members) + if len(fieldname): fieldname = " " + fieldname ret += mcgen(''' -- 1.8.1.4