diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-19 11:21:27 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-19 11:21:27 +0200 |
| commit | 4db3ccf2af1f00f848af105910e75581383f0db4 (patch) | |
| tree | 973baa59075ac9a1a6c692cfcf1a85b3c765986e | |
| parent | 7ff5e30dce22bbe636d8f9dfafaad477bf844003 (diff) | |
helpers: +CNUM parser doesn't return any error
| -rw-r--r-- | plugins/novatel/mm-broadband-modem-novatel-lte.c | 2 | ||||
| -rw-r--r-- | src/mm-broadband-modem.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 3 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 3 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 4 |
5 files changed, 5 insertions, 9 deletions
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.c b/plugins/novatel/mm-broadband-modem-novatel-lte.c index 94030a97..f968885a 100644 --- a/plugins/novatel/mm-broadband-modem-novatel-lte.c +++ b/plugins/novatel/mm-broadband-modem-novatel-lte.c @@ -223,7 +223,7 @@ response_processor_cnum_ignore_at_errors (MMBaseModem *self, return FALSE; } - own_numbers = mm_3gpp_parse_cnum_exec_response (response, result_error); + own_numbers = mm_3gpp_parse_cnum_exec_response (response); if (!own_numbers) return FALSE; diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 78c36bae..d3d349e9 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1161,7 +1161,7 @@ modem_load_own_numbers_done (MMIfaceModem *self, } g_task_return_error (task, error); } else { - numbers = mm_3gpp_parse_cnum_exec_response (result, NULL); + numbers = mm_3gpp_parse_cnum_exec_response (result); g_task_return_pointer (task, numbers, (GDestroyNotify)g_strfreev); } g_object_unref (task); diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 3af3f2d5..83a48648 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -2817,8 +2817,7 @@ mm_3gpp_parse_clck_write_response (const gchar *reply, /*************************************************************************/ GStrv -mm_3gpp_parse_cnum_exec_response (const gchar *reply, - GError **error) +mm_3gpp_parse_cnum_exec_response (const gchar *reply) { GArray *array = NULL; GRegex *r; diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 5abaffd7..524f05ae 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -226,8 +226,7 @@ gboolean mm_3gpp_parse_clck_write_response (const gchar *reply, gboolean *enabled); /* AT+CNUM (Own numbers) response parser */ -GStrv mm_3gpp_parse_cnum_exec_response (const gchar *reply, - GError **error); +GStrv mm_3gpp_parse_cnum_exec_response (const gchar *reply); /* AT+CMER=? (Mobile Equipment Event Reporting) response parser */ typedef enum { /*< underscore_name=mm_3gpp_cmer_mode >*/ diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index e0e15ebd..ca3202ab 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -2690,14 +2690,12 @@ test_cnum_results (const gchar *desc, const GStrv expected) { GStrv results; - GError *error = NULL; guint i; trace ("\nTesting +CNUM response (%s)...\n", desc); - results = mm_3gpp_parse_cnum_exec_response (reply, &error); + results = mm_3gpp_parse_cnum_exec_response (reply); g_assert (results); - g_assert_no_error (error); g_assert_cmpuint (g_strv_length (results), ==, g_strv_length (expected)); for (i = 0; results[i]; i++) { |