[Qemu-devel] [PATCH] qapi: Drop dead genlist parameter

[Qemu-devel] [PATCH] qapi: Drop dead genlist parameter

[Eric Blake]

Defaulting a parameter to True, then having all callers omit
or pass an explicit True for that parameter, is pointless.
Looks like it has been dead since introduction in commit 06d64c6.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 scripts/qapi-visit.py | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index f5d4355..6156162 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -369,34 +369,31 @@ out:

     return ret

-def generate_declaration(name, members, genlist=True, builtin_type=False):
+def generate_declaration(name, members, builtin_type=False):
     ret = ""
     if not builtin_type:
         ret += mcgen('''

 void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **errp);
 ''',
-                    name=name)
-
-    if genlist:
-        ret += mcgen('''
-void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp);
-''',
-                 name=name)
-
-    return ret
-
-def generate_enum_declaration(name, members, genlist=True):
-    ret = ""
-    if genlist:
-        ret += mcgen('''
-void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp);
-''',
                      name=name)

+    ret += mcgen('''
+void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp);
+''',
+                 name=name)
+
+    return ret
+
+def generate_enum_declaration(name, members):
+    ret = mcgen('''
+void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp);
+''',
+                name=name)
+
     return ret

-def generate_decl_enum(name, members, genlist=True):
+def generate_decl_enum(name, members):
     return mcgen('''

 void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **errp);
@@ -510,8 +507,7 @@ exprs = parse_schema(input_file)
 # for built-in types in our header files and simply guard them
 fdecl.write(guardstart("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
 for typename in builtin_types.keys():
-    fdecl.write(generate_declaration(typename, None, genlist=True,
-                                     builtin_type=True))
+    fdecl.write(generate_declaration(typename, None, builtin_type=True))
 fdecl.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DECL"))

 # ...this doesn't work for cases where we link in multiple objects that
-- 
2.1.0

Re: [Qemu-devel] [PATCH] qapi: Drop dead genlist parameter

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

On 04/10/2015 02:59 PM, Eric Blake wrote:
> Defaulting a parameter to True, then having all callers omit
> or pass an explicit True for that parameter, is pointless.
> Looks like it has been dead since introduction in commit 06d64c6.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>  scripts/qapi-visit.py | 36 ++++++++++++++++--------------------
>  1 file changed, 16 insertions(+), 20 deletions(-)

> @@ -510,8 +507,7 @@ exprs = parse_schema(input_file)
>  # for built-in types in our header files and simply guard them
>  fdecl.write(guardstart("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
>  for typename in builtin_types.keys():

Sorry; this doesn't apply to current master.  I'll send a v2 that
doesn't depend on my pending qapi nested struct series.

> -    fdecl.write(generate_declaration(typename, None, genlist=True,
> -                                     builtin_type=True))
> +    fdecl.write(generate_declaration(typename, None, builtin_type=True))
>  fdecl.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
> 
>  # ...this doesn't work for cases where we link in multiple objects that
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]