| Message ID | 1438703896-12553-19-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/04/2015 09:58 AM, Markus Armbruster wrote: > 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. Dead paragraph. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > scripts/qapi-commands.py | 16 +++++----------- > scripts/qapi.py | 3 --- > 2 files changed, 5 insertions(+), 14 deletions(-) > With fixed commit message, Reviewed-by: Eric Blake <eblake@redhat.com>
Eric Blake <eblake@redhat.com> writes: > On 08/04/2015 09:58 AM, Markus Armbruster wrote: >> 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. > > Dead paragraph. The pre KVM Forum time crunch shows %-} Will drop. >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> scripts/qapi-commands.py | 16 +++++----------- >> scripts/qapi.py | 3 --- >> 2 files changed, 5 insertions(+), 14 deletions(-) >> > > With fixed commit message, > Reviewed-by: Eric Blake <eblake@redhat.com> Thanks!
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 1c363c2..577b514 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 diff --git a/scripts/qapi.py b/scripts/qapi.py index 8f1fb66..855ca97 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1374,9 +1374,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):
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 <armbru@redhat.com> --- scripts/qapi-commands.py | 16 +++++----------- scripts/qapi.py | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-)