qapi: Fix build_params() for empty parameter list

build_params() returns '' instead of 'void' when there are no parameters. Can't happen now, but the next commit will change that. Signed-off-by: Markus Armbruster <[email protected]> [peterx: compose the patch from email replies] Signed-off-by: Peter Xu <[email protected]> Message-Id: <[email protected]>
openSUSE · Aug 28, 2018 · bdd2d42 · bdd2d42
1 parent 19b599f
commit bdd2d42
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
@@ -2070,16 +2070,14 @@ def gen_enum(name, values, prefix=None):
     return ret
 
 
-def build_params(arg_type, boxed, extra):
-    if not arg_type:
-        assert not boxed
-        return extra
+def build_params(arg_type, boxed, extra=None):
     ret = ''
     sep = ''
     if boxed:
+        assert arg_type
         ret += '%s arg' % arg_type.c_param_type()
         sep = ', '
-    else:
+    elif arg_type:
         assert not arg_type.variants
         for memb in arg_type.members:
             ret += sep
@@ -2090,7 +2088,7 @@ def build_params(arg_type, boxed, extra):
                               c_name(memb.name))
     if extra:
         ret += sep + extra
-    return ret
+    return ret if ret else 'void'
 
 
 #