diff options
| author | Amos Kong <akong@redhat.com> | 2014-06-10 19:25:52 +0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-23 11:01:24 -0400 |
| commit | 0d14eeb23325b6b1f0f9adce8baf7d1b415cba81 (patch) | |
| tree | db23b14f933bea5acae35ff75018a5790b0a96f7 | |
| parent | 638ca8ad983e22202091e3d486e7101f7da804c5 (diff) | |
qapi: add const prefix to 'char *' insider c_type()
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>
| -rw-r--r-- | scripts/qapi-commands.py | 4 | ||||
| -rw-r--r-- | scripts/qapi.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 7d93d01ed2..34f200a11c 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -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)) diff --git a/scripts/qapi.py b/scripts/qapi.py index 86e96089af..dc690bbf0e 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -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' |