Signed-off-by: Eric Blake <ebl...@redhat.com>
---
I noticed a couple more places that could use the c_name() function;
I'll be squashing this into 7/14 if I need to do a v8 spin.
scripts/qapi-commands.py | 4 ++--
scripts/qapi.py | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index ff52ca9..53a79ab 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -32,8 +32,8 @@ def gen_call(name, arg_type, ret_type):
if arg_type:
for memb in arg_type.members:
if memb.optional:
- argstr += 'has_%s, ' % memb.c_name()
- argstr += '%s, ' % memb.c_name()
+ argstr += 'has_' + memb.c_name() + ', '
+ argstr += memb.c_name() + ', '
lhs = ''
if ret_type:
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f5040da..37b38b0 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1572,8 +1572,8 @@ def gen_params(arg_type, extra):
ret += sep
sep = ', '
if memb.optional:
- ret += 'bool has_%s, ' % c_name(memb.name)
- ret += '%s %s' % (memb.type.c_type(is_param=True), c_name(memb.name))
+ ret += 'bool has_' + memb.c_name() + sep
+ ret += '%s %s' % (memb.type.c_type(is_param=True), memb.c_name())
if extra:
ret += sep + extra
return ret
@@ -1602,13 +1602,13 @@ def gen_visit_fields(members, prefix='',
need_cast=False, skiperr=False):
ret += mcgen('''
visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s", %(errp)s);
''',
- prefix=prefix, c_name=c_name(memb.name),
+ prefix=prefix, c_name=memb.c_name(),
name=memb.name, errp=errparg)
ret += gen_err_check(skiperr=skiperr)
ret += mcgen('''
if (%(prefix)shas_%(c_name)s) {
''',
- prefix=prefix, c_name=c_name(memb.name))
+ prefix=prefix, c_name=memb.c_name())
push_indent()
# Ugly: sometimes we need to cast away const
@@ -1621,7 +1621,7 @@ def gen_visit_fields(members, prefix='', need_cast=False,
skiperr=False):
visit_type_%(c_type)s(v, %(cast)s&%(prefix)s%(c_name)s, "%(name)s",
%(errp)s);
''',
c_type=memb.type.c_name(), prefix=prefix, cast=cast,
- c_name=c_name(memb.name), name=memb.name,
+ c_name=memb.c_name(), name=memb.name,
errp=errparg)
ret += gen_err_check(skiperr=skiperr)
--
2.4.3
