colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmm-glib,helpers: don't warn when trying to read invalid match info index

Browse Source 
We may want to use the mm_get_()_from_match_info() calls to read optional items,
so that the method returns FALSE if the item index doesn't apply. So, avoid the
implicit warning issued by g_return_val_if_fail().
This commit is contained in:
Aleksander Morgado
2016-08-09 08:40:05 +02:00
parent f9e4e6b8f1
commit 7460793caa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libmm-glib/mm-common-helpers.c
View File

@@ -1343,7 +1343,8 @@ mm_get_int_from_match_info (GMatchInfo *match_info,
gboolean ret;
s = g_match_info_fetch (match_info, match_index);
g_return_val_if_fail (s != NULL, FALSE);
if (!s)
return FALSE;
ret = mm_get_int_from_str (s, out);
g_free (s);
@@ -1394,7 +1395,8 @@ mm_get_uint_from_match_info (GMatchInfo *match_info,
gboolean ret;
s = g_match_info_fetch (match_info, match_index);
g_return_val_if_fail (s != NULL, FALSE);
if (!s)
return FALSE;
ret = mm_get_uint_from_str (s, out);
g_free (s);
@@ -1439,7 +1441,8 @@ mm_get_double_from_match_info (GMatchInfo *match_info,
gboolean ret;
s = g_match_info_fetch (match_info, match_index);
g_return_val_if_fail (s != NULL, FALSE);
if (!s)
return FALSE;
ret = mm_get_double_from_str (s, out);
g_free (s);