[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 46/46] hmp: Ignore Error objects where the return value suffices
From: |
Markus Armbruster |
Subject: |
[PATCH 46/46] hmp: Ignore Error objects where the return value suffices |
Date: |
Wed, 24 Jun 2020 18:43:44 +0200 |
qdev_print_props() receives and throws away Error objects just to
check for object_property_get_str() and object_property_print()
failure. Unnecessary, both return suitable values, so use those
instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qdev-monitor.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 2db38b18af..7ebb97cf0d 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -695,22 +695,22 @@ static void qdev_print_props(Monitor *mon, DeviceState
*dev, Property *props,
if (!props)
return;
for (; props->name; props++) {
- Error *err = NULL;
char *value;
char *legacy_name = g_strdup_printf("legacy-%s", props->name);
+
if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {
- value = object_property_get_str(OBJECT(dev), legacy_name, &err);
+ value = object_property_get_str(OBJECT(dev), legacy_name, NULL);
} else {
- value = object_property_print(OBJECT(dev), props->name, true,
&err);
+ value = object_property_print(OBJECT(dev), props->name, true,
+ NULL);
}
g_free(legacy_name);
- if (err) {
- error_free(err);
+ if (!value) {
continue;
}
qdev_printf("%s = %s\n", props->name,
- value && *value ? value : "<null>");
+ *value ? value : "<null>");
g_free(value);
}
}
--
2.26.2
- Re: [PATCH 43/46] qdev: Smooth error checking manually, (continued)
- [PATCH 46/46] hmp: Ignore Error objects where the return value suffices,
Markus Armbruster <=
- [PATCH 22/46] qapi: Make visitor functions taking Error ** return bool, not void, Markus Armbruster, 2020/06/24
- [PATCH 40/46] qom: Make functions taking Error ** return bool, not 0/-1, Markus Armbruster, 2020/06/24
- [PATCH 45/46] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24
- [PATCH 35/46] qom: Use return values to check for error where that's simpler, Markus Armbruster, 2020/06/24