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

modem-helpers: minor coding style fixes

Browse Source
This commit is contained in:
Ben Chan
2017-07-14 01:06:39 -07:00
committed by Aleksander Morgado
parent 45682aa7ee
commit 94a289a1b3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-modem-helpers.c
View File

@@ -2619,7 +2619,7 @@ mm_3gpp_parse_cpms_query_response (const gchar *reply,
r = g_regex_new (CPMS_QUERY_REGEX, G_REGEX_RAW, 0, NULL); r = g_regex_new (CPMS_QUERY_REGEX, G_REGEX_RAW, 0, NULL);
g_assert(r); g_assert (r);
if (!g_regex_match (r, reply, 0, &match_info)) { if (!g_regex_match (r, reply, 0, &match_info)) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
@@ -2627,7 +2627,7 @@ mm_3gpp_parse_cpms_query_response (const gchar *reply,
goto end; goto end;
} }
if (!g_match_info_matches(match_info)) { if (!g_match_info_matches (match_info)) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Could not find matches in CPMS query reply '%s'", reply); "Could not find matches in CPMS query reply '%s'", reply);
goto end; goto end;
@@ -2662,7 +2662,7 @@ mm_3gpp_get_cpms_storage_match (GMatchInfo *match_info,
gboolean ret = TRUE; gboolean ret = TRUE;
gchar *str = NULL; gchar *str = NULL;
str = g_match_info_fetch_named(match_info, match_name); str = g_match_info_fetch_named (match_info, match_name);
if (str == NULL || str[0] == '\0') { if (str == NULL || str[0] == '\0') {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Could not find '%s' from CPMS reply", match_name); "Could not find '%s' from CPMS reply", match_name);

6
src/mm-modem-helpers.h
View File

@@ -91,9 +91,9 @@ GArray *mm_filter_supported_capabilities (MMModemCapability all,
/*****************************************************************************/ /*****************************************************************************/
/* VOICE specific helpers and utilities */ /* VOICE specific helpers and utilities */
/*****************************************************************************/ /*****************************************************************************/
GRegex *mm_voice_ring_regex_get (void); GRegex *mm_voice_ring_regex_get (void);
GRegex *mm_voice_cring_regex_get(void); GRegex *mm_voice_cring_regex_get (void);
GRegex *mm_voice_clip_regex_get (void); GRegex *mm_voice_clip_regex_get (void);
/*****************************************************************************/ /*****************************************************************************/
/* SERIAL specific helpers and utilities */ /* SERIAL specific helpers and utilities */

4
src/tests/test-modem-helpers.c
View File

@@ -2674,7 +2674,7 @@ test_cpms_query_response (void *f, gpointer d) {
&mem1, &mem1,
&mem2, &mem2,
&error); &error);
g_assert(ret); g_assert (ret);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpuint (cpms_query_test[i].mem1_want, ==, mem1); g_assert_cmpuint (cpms_query_test[i].mem1_want, ==, mem1);
g_assert_cmpuint (cpms_query_test[i].mem2_want, ==, mem2); g_assert_cmpuint (cpms_query_test[i].mem2_want, ==, mem2);
@@ -3297,7 +3297,7 @@ test_crsm_response (void)
g_assert_cmpstr (crsm_tests[i].hex, ==, hex); g_assert_cmpstr (crsm_tests[i].hex, ==, hex);
g_free(hex); g_free (hex);
} }
} }