[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/14] tests/qapi-schema: Drop superfluous error_
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 08/14] tests/qapi-schema: Drop superfluous error_is_set() |
Date: |
Fri, 2 May 2014 13:26:36 +0200 |
visit_type_TestStruct() does nothing when called with an error set.
Callers shouldn't do that, and no caller does. Drop the superfluous
test.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
---
tests/test-qmp-input-visitor.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 1ebafc5..a58a3e6 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -196,21 +196,20 @@ static void visit_type_TestStruct(Visitor *v, TestStruct
**obj,
const char *name, Error **errp)
{
Error *err = NULL;
- if (!error_is_set(errp)) {
- visit_start_struct(v, (void **)obj, "TestStruct", name,
sizeof(TestStruct),
- &err);
- if (!err) {
- visit_type_int(v, &(*obj)->integer, "integer", &err);
- visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
- visit_type_str(v, &(*obj)->string, "string", &err);
-
- /* Always call end_struct if start_struct succeeded. */
- error_propagate(errp, err);
- err = NULL;
- visit_end_struct(v, &err);
- }
+
+ visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
+ &err);
+ if (!err) {
+ visit_type_int(v, &(*obj)->integer, "integer", &err);
+ visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
+ visit_type_str(v, &(*obj)->string, "string", &err);
+
+ /* Always call end_struct if start_struct succeeded. */
error_propagate(errp, err);
+ err = NULL;
+ visit_end_struct(v, &err);
}
+ error_propagate(errp, err);
}
static void test_visitor_in_struct(TestInputVisitorData *data,
--
1.8.1.4
- [Qemu-devel] [PATCH v3 04/14] error: Consistently name Error ** objects errp, and not err, (continued)
[Qemu-devel] [PATCH v3 02/14] qga: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 07/14] qapi: Drop redundant, unclean error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 08/14] tests/qapi-schema: Drop superfluous error_is_set(),
Markus Armbruster <=
[Qemu-devel] [PATCH v3 13/14] dump: Drop pointless error_is_set(), DumpState member errp, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 09/14] qapi: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 06/14] hmp: Guard against misuse of hmp_handle_error(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 11/14] qga: Drop superfluous error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 01/14] qmp hmp: Consistently name Error * objects err, and not errp, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 05/14] qga: Use return values instead of error_is_set(errp), Markus Armbruster, 2014/05/02
Re: [Qemu-devel] [PATCH v3 00/14] qmp qga: Purge error_is_set(), Eric Blake, 2014/05/02
Re: [Qemu-devel] [PATCH v3 00/14] qmp qga: Purge error_is_set(), Luiz Capitulino, 2014/05/07