[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/38] tests/qapi-schema: Drop superfluous error_is_s
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 29/38] tests/qapi-schema: Drop superfluous error_is_set() |
Date: |
Thu, 8 May 2014 14:52:53 -0400 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Luiz Capitulino <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.9.0
- [Qemu-devel] [PULL 20/38] pci-assign: propagate errors from assign_intx(), (continued)
- [Qemu-devel] [PULL 20/38] pci-assign: propagate errors from assign_intx(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 21/38] pci-assign: assigned_initfn(): set monitor error in common error handler, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 23/38] qga: Consistently name Error ** objects errp, and not err, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 22/38] qmp hmp: Consistently name Error * objects err, and not errp, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 24/38] qmp: Consistently name Error ** objects errp, and not err, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 25/38] error: Consistently name Error ** objects errp, and not err, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 27/38] hmp: Guard against misuse of hmp_handle_error(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 26/38] qga: Use return values instead of error_is_set(errp), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 28/38] qapi: Drop redundant, unclean error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 30/38] qapi: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 29/38] tests/qapi-schema: Drop superfluous error_is_set(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 31/38] qga: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 34/38] dump: Drop pointless error_is_set(), DumpState member errp, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 38/38] Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()", Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 35/38] qmp: Don't use error_is_set() to suppress additional errors, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 33/38] qemu-option: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 36/38] qmp: use valid JSON in transaction example, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 32/38] qga: Drop superfluous error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 37/38] qapi: Document optional arguments' backwards compatibility, Luiz Capitulino, 2014/05/08
- Re: [Qemu-devel] [PULL 00/38] QMP queue, Peter Maydell, 2014/05/09