Attachment 122526 Details for Bug 94687 – [PATCH] libmm-glib: fix enum conversion warning/error

[PATCH] libmm-glib: fix enum conversion warning/error

0001-libmm-glib-fix-enum-conversion-warning-error.patch (text/plain), 1.47 KB, created by Brian on 2016-03-24 20:59:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian

Created: 2016-03-24 20:59:13 UTC

Size: 1.47 KB

patch

obsolete

>From ad32c44327804b92fc83a6851eac7dc91f47b65b Mon Sep 17 00:00:00 2001
>From: Brian Norris <computersforpeace@gmail.com>
>Date: Thu, 24 Mar 2016 13:58:35 -0700
>Subject: [PATCH] libmm-glib: fix enum conversion warning/error
>
>mm-modem-oma.c:400:51: error: implicit conversion from enumeration type 'MMOmaSessionType' to different enumeration type 'MMOmaFeature'
>      [-Werror,-Wenum-conversion]
>    g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_SESSION_TYPE_UNKNOWN);
>    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>/usr/include/glib-2.0/glib/gmessages.h:382:11: note: expanded from macro 'g_return_val_if_fail'
>         return (val);                                                  \
>         ~~~~~~  ^~~
>
>This should be MMOmaFeature, not MMOmaSessionType. The end result is the same,
>as both are 0.
>---
> libmm-glib/mm-modem-oma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/libmm-glib/mm-modem-oma.c b/libmm-glib/mm-modem-oma.c
>index 380bb08c37c4..77c682d91041 100644
>--- a/libmm-glib/mm-modem-oma.c
>+++ b/libmm-glib/mm-modem-oma.c
>@@ -397,7 +397,7 @@ mm_modem_oma_cancel_session_sync (MMModemOma *self,
> MMOmaFeature
> mm_modem_oma_get_features  (MMModemOma *self)
> {
>-    g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_SESSION_TYPE_UNKNOWN);
>+    g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_FEATURE_NONE);
> 
>     return (MMOmaFeature) mm_gdbus_modem_oma_get_features (MM_GDBUS_MODEM_OMA (self));
> }
>-- 
>2.8.0.rc3.226.g39d4020
>

Actions: View

Attachments on bug 94687: 122526

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.