[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/34] tests: Clean up initialization of Error *err variables
From: |
Markus Armbruster |
Subject: |
[PULL 05/34] tests: Clean up initialization of Error *err variables |
Date: |
Tue, 17 Dec 2019 07:26:22 +0100 |
Declaring a local Error *err without initializer looks suspicious.
Fuse the declaration with the initialization to avoid that.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
tests/test-qobject-output-visitor.c | 8 ++++----
tests/test-string-output-visitor.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/test-qobject-output-visitor.c
b/tests/test-qobject-output-visitor.c
index 3e993e5ba8..d7761ebf84 100644
--- a/tests/test-qobject-output-visitor.c
+++ b/tests/test-qobject-output-visitor.c
@@ -145,10 +145,10 @@ static void
test_visitor_out_enum_errors(TestOutputVisitorData *data,
const void *unused)
{
EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 };
- Error *err;
for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {
- err = NULL;
+ Error *err = NULL;
+
visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err);
error_free_or_abort(&err);
visitor_reset(data);
@@ -240,11 +240,11 @@ static void
test_visitor_out_struct_errors(TestOutputVisitorData *data,
EnumOne bad_values[] = { ENUM_ONE__MAX, -1 };
UserDefOne u = {0};
UserDefOne *pu = &u;
- Error *err;
int i;
for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {
- err = NULL;
+ Error *err = NULL;
+
u.has_enum1 = true;
u.enum1 = bad_values[i];
visit_type_UserDefOne(data->ov, "unused", &pu, &err);
diff --git a/tests/test-string-output-visitor.c
b/tests/test-string-output-visitor.c
index 02766c0f65..1be1540767 100644
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -207,10 +207,10 @@ static void
test_visitor_out_enum_errors(TestOutputVisitorData *data,
const void *unused)
{
EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 };
- Error *err;
for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {
- err = NULL;
+ Error *err = NULL;
+
visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err);
error_free_or_abort(&err);
}
--
2.21.0
- [PULL 00/34] Error reporting patches for 2019-12-16, Markus Armbruster, 2019/12/17
- [PULL 14/34] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/17
- [PULL 01/34] error: Fix -msg timestamp default, Markus Armbruster, 2019/12/17
- [PULL 04/34] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/17
- [PULL 02/34] crypto: Fix certificate file error handling crash bug, Markus Armbruster, 2019/12/17
- [PULL 11/34] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/17
- [PULL 08/34] hw/core: Fix fit_load_fdt() error API violations, Markus Armbruster, 2019/12/17
- [PULL 03/34] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/17
- [PULL 13/34] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(), Markus Armbruster, 2019/12/17
- [PULL 05/34] tests: Clean up initialization of Error *err variables,
Markus Armbruster <=
- [PULL 07/34] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/17
- [PULL 26/34] monitor/qmp-cmds: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 33/34] hw/vfio/ap: drop local_err from vfio_ap_realize, Markus Armbruster, 2019/12/17
- [PULL 09/34] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/17
- [PULL 29/34] hw/tpm: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 10/34] qga: Fix guest-get-fsinfo error API violations, Markus Armbruster, 2019/12/17
- [PULL 06/34] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/17
- [PULL 15/34] net/net: Clean up variable shadowing in net_client_init(), Markus Armbruster, 2019/12/17
- [PULL 16/34] error: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 28/34] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/17