diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-09-16 13:06:15 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-21 09:56:48 +0200 |
| commit | 5710153e7310995b5d4127af267e36d8529b3b30 (patch) | |
| tree | ebf4a9fcda67ce87e0217d50328dcb1612266bf8 | |
| parent | 05f43a960877cf941635324b2d0a74c0d0f7128e (diff) | |
| download | focaccia-qemu-5710153e7310995b5d4127af267e36d8529b3b30.tar.gz focaccia-qemu-5710153e7310995b5d4127af267e36d8529b3b30.zip | |
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-13-git-send-email-armbru@redhat.com>
| -rw-r--r-- | scripts/qapi-commands.py | 16 | ||||
| -rw-r--r-- | scripts/qapi.py | 3 |
2 files changed, 5 insertions, 14 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index a68517a83a..cbff3560f4 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; -''', - argname=c_name(memb.name), - argtype=memb.type.c_type()) - else: - ret += mcgen(''' -%(argtype)s %(argname)s = {0}; + ret += mcgen(''' +%(c_type)s %(c_name)s = %(c_null)s; ''', - 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 diff --git a/scripts/qapi.py b/scripts/qapi.py index ba32aace99..0ffd02d8c2 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -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): |