Commit 5710153e authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Replace dirty is_c_ptr() by method c_null() 



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}.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-13-git-send-email-armbru@redhat.com>
parent 05f43a96

scripts/qapi-commands.py

+5 −11
Original line number Diff line number Diff line
@@ -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;

%(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

scripts/qapi.py

+0 −3
Original line number Diff line number Diff line
@@ -1441,9 +1441,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):