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

libmm-glib,helpers: skip quotes when reading numbers from match infos

Browse Source 
Useful when the regex applied to the parseable strings don't have an
special ignore rule for the quotes.
This commit is contained in:
Aleksander Morgado
2020-03-24 06:17:34 +01:00
parent 44ace9642c
commit 539562af01
1 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1356,17 +1356,10 @@ mm_get_int_from_match_info (GMatchInfo *match_info,
guint32 match_index,
gint *out)
{
gchar *s;
gboolean ret;
g_autofree gchar *s = NULL;
s = g_match_info_fetch (match_info, match_index);
if (!s)
return FALSE;
ret = mm_get_int_from_str (s, out);
g_free (s);
return ret;
s = mm_get_string_unquoted_from_match_info (match_info, match_index);
return (s ? mm_get_int_from_str (s, out) : FALSE);
}
gboolean
@@ -1492,17 +1485,10 @@ mm_get_u64_from_match_info (GMatchInfo *match_info,
guint32 match_index,
guint64 *out)
{
gchar *s;
gboolean ret;
g_autofree gchar *s = NULL;
s = g_match_info_fetch (match_info, match_index);
if (!s)
return FALSE;
ret = mm_get_u64_from_str (s, out);
g_free (s);
return ret;
s = mm_get_string_unquoted_from_match_info (match_info, match_index);
return (s ? mm_get_u64_from_str (s, out) : FALSE);
}
gboolean
@@ -1549,17 +1535,10 @@ mm_get_double_from_match_info (GMatchInfo *match_info,
guint32 match_index,
gdouble *out)
{
gchar *s;
gboolean ret;
g_autofree gchar *s = NULL;
s = g_match_info_fetch (match_info, match_index);
if (!s)
return FALSE;
ret = mm_get_double_from_str (s, out);
g_free (s);
return ret;
s = mm_get_string_unquoted_from_match_info (match_info, match_index);
return (s ? mm_get_double_from_str (s, out) : FALSE);
}
gchar *