modem-helpers: port clcc list parser to use object logging
This commit is contained in:
@@ -79,13 +79,14 @@ mm_simtech_get_clcc_urc_regex (void)
|
||||
|
||||
gboolean
|
||||
mm_simtech_parse_clcc_list (const gchar *str,
|
||||
gpointer log_object,
|
||||
GList **out_list,
|
||||
GError **error)
|
||||
{
|
||||
/* Parse the URC contents as a plain +CLCC response, but make sure to skip first
|
||||
* EOL in the string because the plain +CLCC response would never have that.
|
||||
*/
|
||||
return mm_3gpp_parse_clcc_response (mm_strip_tag (str, "\r\n"), out_list, error);
|
||||
return mm_3gpp_parse_clcc_response (mm_strip_tag (str, "\r\n"), log_object, out_list, error);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -32,6 +32,7 @@ gboolean mm_simtech_parse_clcc_test (const gchar *response,
|
||||
|
||||
GRegex *mm_simtech_get_clcc_urc_regex (void);
|
||||
gboolean mm_simtech_parse_clcc_list (const gchar *str,
|
||||
gpointer log_object,
|
||||
GList **out_list,
|
||||
GError **error);
|
||||
void mm_simtech_call_info_list_free (GList *call_info_list);
|
||||
|
||||
@@ -781,7 +781,7 @@ clcc_urc_received (MMPortSerialAt *port,
|
||||
|
||||
full = g_match_info_fetch (match_info, 0);
|
||||
|
||||
if (!mm_simtech_parse_clcc_list (full, &call_info_list, &error)) {
|
||||
if (!mm_simtech_parse_clcc_list (full, self, &call_info_list, &error)) {
|
||||
mm_warn ("couldn't parse +CLCC list in URC: %s", error->message);
|
||||
g_error_free (error);
|
||||
} else
|
||||
|
||||
@@ -52,7 +52,7 @@ common_test_clcc_urc (const gchar *urc,
|
||||
str = g_match_info_fetch (match_info, 0);
|
||||
g_assert (str);
|
||||
|
||||
result = mm_simtech_parse_clcc_list (str, &call_info_list, &error);
|
||||
result = mm_simtech_parse_clcc_list (str, NULL, &call_info_list, &error);
|
||||
g_assert_no_error (error);
|
||||
g_assert (result);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user