[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/40] qapi: add const prefix to 'char *' insider c_t
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 02/40] qapi: add const prefix to 'char *' insider c_type() |
Date: |
Thu, 19 Jun 2014 15:39:14 -0400 |
From: Amos Kong <address@hidden>
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 <address@hidden>
Suggested-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi-commands.py | 4 +---
scripts/qapi.py | 4 +++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 7d93d01..34f200a 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 86e9608..dc690bb 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'
--
1.9.3
- [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 01/40] qapi: fix coding style in parameters list, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 02/40] qapi: add const prefix to 'char *' insider c_type(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 03/40] qapi: Suppress unwanted space between type and identifier, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 06/40] qapi: Add includes from qapi/ as dependencies, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 08/40] qapi script: add event support, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 05/40] os-posix: include sys/time.h, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 09/40] test: add test cases for qapi event, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 04/40] json-lexer: fix escaped backslash in single-quoted string, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 07/40] qapi: add event helper functions, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 11/40] monitor: add an implemention of qapi event emit method, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 10/40] qapi: adjust existing defines, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 14/40] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/19