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

modem-helpers: port ccwa service query parser to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-08 16:35:09 +02:00
parent ecd766796a
commit 105cb31e8c
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+1 -1
View File
@@ -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
src/mm-modem-helpers.c
+3 -2
View File
@@ -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;
src/mm-modem-helpers.h
+1
View File
@@ -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);
src/tests/test-modem-helpers.c
+1 -1
View File
@@ -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);