From 64b4afa960e7440505dfb1f18ca9c20506d7e16e Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 7 Nov 2016 19:46:40 +0100 Subject: kernel-device: return G_MAXUINT when get_property_as_int_hex() fails --- src/kerneldevice/mm-kernel-device-generic.c | 2 +- src/kerneldevice/mm-kernel-device-udev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c index c4cfd9a0..3860e424 100644 --- a/src/kerneldevice/mm-kernel-device-generic.c +++ b/src/kerneldevice/mm-kernel-device-generic.c @@ -880,7 +880,7 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *self, const gchar *value; guint aux = 0; - g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1); + g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), G_MAXUINT); value = g_object_get_data (G_OBJECT (self), property); return ((value && mm_get_uint_from_hex_str (value, &aux)) ? aux : 0); diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c index 7ad9b29c..432832f4 100644 --- a/src/kerneldevice/mm-kernel-device-udev.c +++ b/src/kerneldevice/mm-kernel-device-udev.c @@ -587,12 +587,12 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *_self, const gchar *s; guint out = 0; - g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1); + g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), G_MAXUINT); self = MM_KERNEL_DEVICE_UDEV (_self); if (!self->priv->device) - return -1; + return G_MAXUINT; s = g_udev_device_get_property (self->priv->device, property); return ((s && mm_get_uint_from_hex_str (s, &out)) ? out : 0); -- cgit v1.2.3-70-g09d2