diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-04 12:15:49 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-08 16:35:09 +0200 |
| commit | 105cb31e8cb423ff9b1e4bbeffce0124006be5fd (patch) | |
| tree | 1b22e1433a83989862e22c8fac35bf3cbedd336e /src | |
| parent | ecd766796a4bb3cd1962bfe0b42d187931dd12f6 (diff) | |
modem-helpers: port ccwa service query parser to use object logging
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 5 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 1 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 5d5a219a..21600d77 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -8311,7 +8311,7 @@ modem_voice_call_waiting_query_finish (MMIfaceModemVoice *self, if (!response) return FALSE; - return mm_3gpp_parse_ccwa_service_query_response (response, status, error); + return mm_3gpp_parse_ccwa_service_query_response (response, self, status, error); } static void diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 36f3dfb4..e7ee6e20 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -2846,6 +2846,7 @@ mm_3gpp_parse_cemode_query_response (const gchar *response, gboolean mm_3gpp_parse_ccwa_service_query_response (const gchar *response, + gpointer log_object, gboolean *status, GError **error) { @@ -2881,10 +2882,10 @@ mm_3gpp_parse_ccwa_service_query_response (const gchar *response, guint class; if (!mm_get_uint_from_match_info (match_info, 2, &class)) - mm_warn ("couldn't parse class from +CCWA line"); + mm_obj_warn (log_object, "couldn't parse class from +CCWA line"); else if (class == 1 || class == 255) { if (!mm_get_uint_from_match_info (match_info, 1, &st)) - mm_warn ("couldn't parse status from +CCWA line"); + mm_obj_warn (log_object, "couldn't parse status from +CCWA line"); else { class_1_status = st; break; diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index d2c1a5a6..316b26d3 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -415,6 +415,7 @@ gboolean mm_3gpp_parse_cemode_query_response (const gchar *r /* CCWA service query response parser */ gboolean mm_3gpp_parse_ccwa_service_query_response (const gchar *response, + gpointer log_object, gboolean *status, GError **error); diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index 8b39f90e..a01b0fd9 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -4133,7 +4133,7 @@ common_test_ccwa_response (const gchar *response, GError *error = NULL; gboolean result; - result = mm_3gpp_parse_ccwa_service_query_response (response, &status, &error); + result = mm_3gpp_parse_ccwa_service_query_response (response, NULL, &status, &error); if (expected_error) { g_assert (!result); |