qapi: Use c_enum_const() in generate_alternate_qtypes()

Missed in commit b0b5819.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-05-14 06:50:52 -06:00
parent 02e20c7e59
commit b42e91484d
2 changed files with 2 additions and 15 deletions

View File

@ -180,11 +180,9 @@ const int %(name)s_qtypes[QTYPE_MAX] = {
assert qtype, "Invalid alternate member" assert qtype, "Invalid alternate member"
ret += mcgen(''' ret += mcgen('''
[ %(qtype)s ] = %(abbrev)s_KIND_%(enum)s, [ %(qtype)s ] = %(enum_const)s,
''', ''',
qtype = qtype, qtype = qtype, enum_const = c_enum_const(name + 'Kind', key))
abbrev = de_camel_case(name).upper(),
enum = c_name(de_camel_case(key),False).upper())
ret += mcgen(''' ret += mcgen('''
}; };

View File

@ -729,17 +729,6 @@ def parse_args(typeinfo):
# value of an optional argument. # value of an optional argument.
yield (argname, argentry, optional) yield (argname, argentry, optional)
def de_camel_case(name):
new_name = ''
for ch in name:
if ch.isupper() and new_name:
new_name += '_'
if ch == '-':
new_name += '_'
else:
new_name += ch.lower()
return new_name
def camel_case(name): def camel_case(name):
new_name = '' new_name = ''
first = True first = True