From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWv-0003Ql-Bo for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAOWr-00066L-KF for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWr-000668-Ci for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:45 -0400 From: Markus Armbruster Date: Wed, 1 Jul 2015 22:22:17 +0200 Message-Id: <1435782155-31412-30-git-send-email-armbru@redhat.com> In-Reply-To: <1435782155-31412-1-git-send-email-armbru@redhat.com> References: <1435782155-31412-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v2 29/47] qapi: Replace dirty is_c_ptr() by method c_null() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com is_c_ptr() looks whether the end of the C text for the type looks like a pointer. Works, but is fragile. We now have a better tool: use QAPISchemaType method c_null(). The initializers for non-pointers become prettier: 0, false or the enumeration constant with the value 0 instead of {0}. One place looks suspicious: we initialize pointers, but not non-pointers. Either the initialization is superfluous and should be deleted, or the non-pointers need it as well, or something subtle is going on and needs a comment. Since I lack the time to figure it out now, mark it FIXME. Signed-off-by: Markus Armbruster --- scripts/qapi-commands.py | 19 +++++++------------ scripts/qapi.py | 3 --- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index a225bdd..d3bddb6 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -91,18 +91,12 @@ def gen_visitor_input_vars_decl(args): bool has_%(argname)s = false; ''', argname=c_name(memb.name)) - if is_c_ptr(memb.type.c_type()): - ret += mcgen(''' -%(argtype)s %(argname)s = NULL; + ret += mcgen(''' +%(c_type)s %(c_name)s = %(c_null)s; ''', - argname=c_name(memb.name), - argtype=memb.type.c_type()) - else: - ret += mcgen(''' -%(argtype)s %(argname)s = {0}; -''', - argname=c_name(memb.name), - argtype=memb.type.c_type()) + c_name=c_name(memb.name), + c_type=memb.type.c_type(), + c_null=memb.type.c_null()) pop_indent() return ret @@ -214,7 +208,8 @@ def gen_marshal_input(name, args, ret_type, middle_mode): header=hdr) if ret_type: - if is_c_ptr(ret_type.c_type()): + # FIXME fishy: only pointers are initialized + if ret_type.c_null() == 'NULL': retval = " %s retval = NULL;" % ret_type.c_type() else: retval = " %s retval;" % ret_type.c_type() diff --git a/scripts/qapi.py b/scripts/qapi.py index 98488be..dd77a30 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1365,9 +1365,6 @@ def c_type(value, is_param=False): assert isinstance(value, str) and value != "" return c_name(value) + pointer_suffix -def is_c_ptr(value): - return value.endswith(pointer_suffix) - def genindent(count): ret = "" for i in range(count): -- 1.9.3