[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/13] qapi: Clean up null checking in generated
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 11/13] qapi: Clean up null checking in generated visitors |
Date: |
Mon, 10 Feb 2014 15:20:43 +0100 |
Visitors get passed a pointer to the visited object. The generated
visitors try to cope with this pointer being null in some places, for
instance like this:
visit_start_optional(m, obj ? &(*obj)->has_name : NULL, "name", &err);
visit_start_optional() passes its second argument to Visitor method
start_optional. Three out of three methods dereference it
unconditionally.
I fail to see how hits pointer could legitimately be null.
All this useless null checking is highly redundant, which Coverity
duly reports. About 200 times.
Remove the useless null checks.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-visit.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 97e9b11..c6de9ae 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -47,9 +47,9 @@ static void visit_type_%(full_name)s_fields(Visitor *m,
%(name)s ** obj, Error *
if base:
ret += mcgen('''
-visit_start_implicit_struct(m, obj ? (void**) &(*obj)->%(c_name)s : NULL,
sizeof(%(type)s), &err);
+visit_start_implicit_struct(m, (void**) &(*obj)->%(c_name)s, sizeof(%(type)s),
&err);
if (!err) {
- visit_type_%(type)s_fields(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s :
NULL, &err);
+ visit_type_%(type)s_fields(m, &(*obj)->%(c_prefix)s%(c_name)s, &err);
error_propagate(errp, err);
err = NULL;
visit_end_implicit_struct(m, &err);
@@ -61,8 +61,8 @@ if (!err) {
for argname, argentry, optional, structured in parse_args(members):
if optional:
ret += mcgen('''
-visit_start_optional(m, obj ? &(*obj)->%(c_prefix)shas_%(c_name)s : NULL,
"%(name)s", &err);
-if (obj && (*obj)->%(prefix)shas_%(c_name)s) {
+visit_start_optional(m, &(*obj)->%(c_prefix)shas_%(c_name)s, "%(name)s", &err);
+if ((*obj)->%(prefix)shas_%(c_name)s) {
''',
c_prefix=c_var(field_prefix), prefix=field_prefix,
c_name=c_var(argname), name=argname)
@@ -72,7 +72,7 @@ if (obj && (*obj)->%(prefix)shas_%(c_name)s) {
ret += generate_visit_struct_body(full_name, argname, argentry)
else:
ret += mcgen('''
-visit_type_%(type)s(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s : NULL,
"%(name)s", &err);
+visit_type_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, "%(name)s", &err);
''',
c_prefix=c_var(field_prefix), prefix=field_prefix,
type=type_name(argentry), c_name=c_var(argname),
@@ -121,7 +121,7 @@ visit_start_struct(m, (void **)obj, "%(name)s", name,
sizeof(%(name)s), &err);
ret += mcgen('''
if (!err) {
- if (!obj || *obj) {
+ if (*obj) {
visit_type_%(name)s_fields(m, obj, &err);
error_propagate(errp, err);
err = NULL;
@@ -273,7 +273,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const
char *name, Error **
if (!error_is_set(errp)) {
visit_start_struct(m, (void **)obj, "%(name)s", name,
sizeof(%(name)s), &err);
if (!err) {
- if (obj && *obj) {
+ if (*obj) {
''',
name=name)
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/13] qapi: Test coverage & clean up generated code, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 08/13] qapi: Fix licensing of scripts, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 10/13] qapi: Drop unused code in qapi-commands.py, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 02/13] tests/qapi-schema: Cover optional command arguments, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 06/13] tests/qapi-schema: Cover union types with base, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 05/13] tests/qapi-schema: Cover complex types with base, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 07/13] tests/qapi-schema: Cover flat union types, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 01/13] tests/qapi-schema: Actually check successful QMP command response, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 03/13] tests/qapi-schema: Cover simple argument types, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 11/13] qapi: Clean up null checking in generated visitors,
Markus Armbruster <=
- [Qemu-devel] [PATCH 13/13] qapi: Add missing null check to opts_start_struct(), Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 04/13] tests/qapi-schema: Cover anonymous union types, Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH 12/13] qapi: Clean up superfluous null check in qapi_dealloc_type_str(), Markus Armbruster, 2014/02/10
- [Qemu-devel] [PATCH v2 09/13] qapi: Drop nonsensical header guard in generated qapi-visit.c, Markus Armbruster, 2014/02/10
- Re: [Qemu-devel] [PATCH v2 00/13] qapi: Test coverage & clean up generated code, Paolo Bonzini, 2014/02/13