Skip to content

Commit

Permalink
qapi: add const prefix to 'char *' insider c_type()
Browse files Browse the repository at this point in the history
It's ugly to add const prefix for parameter type by an if statement
outside c_type(). This patch adds a parameter to do it.

Signed-off-by: Amos Kong <akong@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
  • Loading branch information
amoskong authored and Luiz Capitulino committed Jun 23, 2014
1 parent 638ca8a commit 0d14eeb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 1 addition & 3 deletions scripts/qapi-commands.py
Expand Up @@ -29,9 +29,7 @@ def type_visitor(name):
def generate_command_decl(name, args, ret_type):
arglist=""
for argname, argtype, optional, structured in parse_args(args):
argtype = c_type(argtype)
if argtype == "char *":
argtype = "const char *"
argtype = c_type(argtype, is_param=True)
if optional:
arglist += "bool has_%s, " % c_var(argname)
arglist += "%s %s, " % (argtype, c_var(argname))
Expand Down
4 changes: 3 additions & 1 deletion scripts/qapi.py
Expand Up @@ -470,8 +470,10 @@ def find_enum(name):
def is_enum(name):
return find_enum(name) != None

def c_type(name):
def c_type(name, is_param=False):
if name == 'str':
if is_param:
return 'const char *'
return 'char *'
elif name == 'int':
return 'int64_t'
Expand Down

0 comments on commit 0d14eeb

Please sign in to comment.