[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after visit_start_struct() fails |
Date: |
Wed, 7 May 2014 09:53:53 +0200 |
When visit_start_struct() fails, visit_end_struct() must not be
called. Three out of four visit_type_TestStruct() call it anyway. As
far as I can tell, visit_start_struct() doesn't actually fail there.
Fix them anyway.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/test-qmp-input-strict.c | 18 +++++++++++++-----
tests/test-qmp-output-visitor.c | 18 +++++++++++++-----
tests/test-visitor-serialization.c | 18 +++++++++++++-----
3 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index 449d285..ec798c2 100644
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -72,14 +72,22 @@ typedef struct TestStruct
static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
const char *name, Error **errp)
{
+ Error *err = NULL;
+
visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
- errp);
+ &err);
+ if (err) {
+ goto out;
+ }
+
+ visit_type_int(v, &(*obj)->integer, "integer", &err);
+ visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
+ visit_type_str(v, &(*obj)->string, "string", &err);
- visit_type_int(v, &(*obj)->integer, "integer", errp);
- visit_type_bool(v, &(*obj)->boolean, "boolean", errp);
- visit_type_str(v, &(*obj)->string, "string", errp);
+ visit_end_struct(v, &err);
- visit_end_struct(v, errp);
+out:
+ error_propagate(errp, err);
}
static void test_validate_struct(TestInputVisitorData *data,
diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index 2580f3d..dfd597c 100644
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -176,14 +176,22 @@ typedef struct TestStruct
static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
const char *name, Error **errp)
{
+ Error *err = NULL;
+
visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
- errp);
+ &err);
+ if (err) {
+ goto out;
+ }
+
+ visit_type_int(v, &(*obj)->integer, "integer", &err);
+ visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
+ visit_type_str(v, &(*obj)->string, "string", &err);
- visit_type_int(v, &(*obj)->integer, "integer", errp);
- visit_type_bool(v, &(*obj)->boolean, "boolean", errp);
- visit_type_str(v, &(*obj)->string, "string", errp);
+ visit_end_struct(v, &err);
- visit_end_struct(v, errp);
+out:
+ error_propagate(errp, err);
}
static void test_visitor_out_struct(TestOutputVisitorData *data,
diff --git a/tests/test-visitor-serialization.c
b/tests/test-visitor-serialization.c
index 8166cf1..85170e5 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -195,13 +195,21 @@ typedef struct TestStruct
static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
const char *name, Error **errp)
{
- visit_start_struct(v, (void **)obj, NULL, name, sizeof(TestStruct), errp);
+ Error *err= NULL;
- visit_type_int(v, &(*obj)->integer, "integer", errp);
- visit_type_bool(v, &(*obj)->boolean, "boolean", errp);
- visit_type_str(v, &(*obj)->string, "string", errp);
+ visit_start_struct(v, (void **)obj, NULL, name, sizeof(TestStruct), &err);
+ if (err) {
+ goto out;
+ }
+
+ visit_type_int(v, &(*obj)->integer, "integer", &err);
+ visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
+ visit_type_str(v, &(*obj)->string, "string", &err);
+
+ visit_end_struct(v, &err);
- visit_end_struct(v, errp);
+out:
+ error_propagate(errp, err);
}
static TestStruct *struct_create(void)
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 01/12] qapi: Update qapi-code-gen.txt example to match current code, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 03/12] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 02/12] qapi: Normalize marshalling's visitor initialization and cleanup, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 07/12] qapi-visit.py: Clean up a sloppy use of field prefix, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 04/12] qapi: Replace start_optional()/end_optional() by optional(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 12/12] qapi: Replace uncommon use of the error API by the common one, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after visit_start_struct() fails,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and locals in inner scopes, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 08/12] qapi: Un-inline visit of implicit struct, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 10/12] hw: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_start_struct() succeeds, Markus Armbruster, 2014/05/07
- Re: [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Luiz Capitulino, 2014/05/15