qapi: Rename identical c_fun()/c_var() into c_name()

Now that the two functions are identical, we only need one of them,
and we might as well give it a more descriptive name.  Basically,
the function serves as the translation from a QAPI name into a
(portion of a) C identifier, without regards to whether it is a
variable or function name.

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-05-14 06:50:48 -06:00 committed by Markus Armbruster
parent 47299262de
commit 18df515ebb
5 changed files with 36 additions and 38 deletions

View file

@ -17,17 +17,17 @@ import getopt
import errno
def _generate_event_api_name(event_name, params):
api_name = "void qapi_event_send_%s(" % c_fun(event_name).lower();
api_name = "void qapi_event_send_%s(" % c_name(event_name).lower();
l = len(api_name)
if params:
for argname, argentry, optional in parse_args(params):
if optional:
api_name += "bool has_%s,\n" % c_var(argname)
api_name += "bool has_%s,\n" % c_name(argname)
api_name += "".ljust(l)
api_name += "%s %s,\n" % (c_type(argentry, is_param=True),
c_var(argname))
c_name(argname))
api_name += "".ljust(l)
api_name += "Error **errp)"
@ -98,7 +98,7 @@ def generate_event_implement(api_name, event_name, params):
ret += mcgen("""
if (has_%(var)s) {
""",
var = c_var(argname))
var = c_name(argname))
push_indent()
if argentry == "str":
@ -113,7 +113,7 @@ def generate_event_implement(api_name, event_name, params):
}
""",
var_type = var_type,
var = c_var(argname),
var = c_name(argname),
type = type_name(argentry),
name = argname)