mirror of https://gitee.com/openkylin/qemu.git
tests/qapi-schema: Drop superfluous error_is_set()
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 <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
4af8be1f88
commit
196857f8bf
|
@ -196,21 +196,20 @@ static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
|
||||||
const char *name, Error **errp)
|
const char *name, Error **errp)
|
||||||
{
|
{
|
||||||
Error *err = NULL;
|
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. */
|
visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
|
||||||
error_propagate(errp, err);
|
&err);
|
||||||
err = NULL;
|
if (!err) {
|
||||||
visit_end_struct(v, &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);
|
error_propagate(errp, err);
|
||||||
|
err = NULL;
|
||||||
|
visit_end_struct(v, &err);
|
||||||
}
|
}
|
||||||
|
error_propagate(errp, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_visitor_in_struct(TestInputVisitorData *data,
|
static void test_visitor_in_struct(TestInputVisitorData *data,
|
||||||
|
|
Loading…
Reference in New Issue