diff mbox series

[2/2] qom: Correct error values in two contracts

Message ID 20200917125540.597786-3-armbru@redhat.com
State New
Headers show
Series qpm: Minor error value corrections | expand

Commit Message

Markus Armbruster Sept. 17, 2020, 12:55 p.m. UTC
object_property_get_bool()'s contract claims it returns NULL on error.
Pasto; it returns false.

object_property_get_int()'s contract claims it returns "negative".  It
actually returns -1.  All the other object_property_get_FOO()
contracts specify the exact error value, so do the same here.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/qom/object.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel P. Berrangé Sept. 17, 2020, 12:59 p.m. UTC | #1
On Thu, Sep 17, 2020 at 02:55:40PM +0200, Markus Armbruster wrote:
> object_property_get_bool()'s contract claims it returns NULL on error.

> Pasto; it returns false.

> 

> object_property_get_int()'s contract claims it returns "negative".  It

> actually returns -1.  All the other object_property_get_FOO()

> contracts specify the exact error value, so do the same here.

> 

> Signed-off-by: Markus Armbruster <armbru@redhat.com>

> ---

>  include/qom/object.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Greg Kurz Sept. 17, 2020, 1:31 p.m. UTC | #2
On Thu, 17 Sep 2020 14:55:40 +0200
Markus Armbruster <armbru@redhat.com> wrote:

> object_property_get_bool()'s contract claims it returns NULL on error.

> Pasto; it returns false.

> 

> object_property_get_int()'s contract claims it returns "negative".  It

> actually returns -1.  All the other object_property_get_FOO()

> contracts specify the exact error value, so do the same here.

> 

> Signed-off-by: Markus Armbruster <armbru@redhat.com>

> ---


Reviewed-by: Greg Kurz <groug@kaod.org>


>  include/qom/object.h | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/include/qom/object.h b/include/qom/object.h

> index f75547a3fe..d0a3332c1f 100644

> --- a/include/qom/object.h

> +++ b/include/qom/object.h

> @@ -1624,7 +1624,7 @@ bool object_property_set_bool(Object *obj, const char *name,

>   * @name: the name of the property

>   * @errp: returns an error if this function fails

>   *

> - * Returns: the value of the property, converted to a boolean, or NULL if

> + * Returns: the value of the property, converted to a boolean, or false if

>   * an error occurs (including when the property value is not a bool).

>   */

>  bool object_property_get_bool(Object *obj, const char *name,

> @@ -1649,7 +1649,7 @@ bool object_property_set_int(Object *obj, const char *name,

>   * @name: the name of the property

>   * @errp: returns an error if this function fails

>   *

> - * Returns: the value of the property, converted to an integer, or negative if

> + * Returns: the value of the property, converted to an integer, or -1 if

>   * an error occurs (including when the property value is not an integer).

>   */

>  int64_t object_property_get_int(Object *obj, const char *name,
diff mbox series

Patch

diff --git a/include/qom/object.h b/include/qom/object.h
index f75547a3fe..d0a3332c1f 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1624,7 +1624,7 @@  bool object_property_set_bool(Object *obj, const char *name,
  * @name: the name of the property
  * @errp: returns an error if this function fails
  *
- * Returns: the value of the property, converted to a boolean, or NULL if
+ * Returns: the value of the property, converted to a boolean, or false if
  * an error occurs (including when the property value is not a bool).
  */
 bool object_property_get_bool(Object *obj, const char *name,
@@ -1649,7 +1649,7 @@  bool object_property_set_int(Object *obj, const char *name,
  * @name: the name of the property
  * @errp: returns an error if this function fails
  *
- * Returns: the value of the property, converted to an integer, or negative if
+ * Returns: the value of the property, converted to an integer, or -1 if
  * an error occurs (including when the property value is not an integer).
  */
 int64_t object_property_get_int(Object *obj, const char *name,