From d20f616e8f8f8f8fdb04da850d9ce92880199db7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 17 Sep 2020 14:55:39 +0200 Subject: qom: Clean up object_property_get_enum()'s error value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit object_property_get_enum() is the only object_property_FOO() that is documented to return an undefined value on error. It does no such thing, actually: it returns 0 on some errors, and -1 on others. Needlessly complicated. Always return -1 on error, and adjust the contract. Signed-off-by: Markus Armbruster Reviewed-by: Greg Kurz Reviewed-by: Daniel P. Berrangé Message-Id: <20200917125540.597786-2-armbru@redhat.com> Signed-off-by: Eduardo Habkost --- qom/object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qom/object.c') diff --git a/qom/object.c b/qom/object.c index 387efb2..cecad35 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1564,21 +1564,21 @@ int object_property_get_enum(Object *obj, const char *name, EnumProperty *enumprop; if (prop == NULL) { - return 0; + return -1; } if (!g_str_equal(prop->type, typename)) { error_setg(errp, "Property %s on %s is not '%s' enum type", name, object_class_get_name( object_get_class(obj)), typename); - return 0; + return -1; } enumprop = prop->opaque; str = object_property_get_str(obj, name, errp); if (!str) { - return 0; + return -1; } ret = qapi_enum_parse(enumprop->lookup, str, -1, errp); -- cgit v1.1