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

telit: minor coding style fixes

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 01:03:39 -07:00
committed by Aleksander Morgado
parent 39ddd34898
commit 4fbdee1e6d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/telit/mm-modem-helpers-telit.c
View File

@@ -44,7 +44,7 @@ mm_telit_get_band_flag (GArray *bands_array,
guint i; guint i;
for (i = 0; i < bands_array->len; i++) { for (i = 0; i < bands_array->len; i++) {
MMModemBand band = g_array_index(bands_array, MMModemBand, i); MMModemBand band = g_array_index (bands_array, MMModemBand, i);
if (flag2g != NULL && if (flag2g != NULL &&
band > MM_MODEM_BAND_UNKNOWN && band <= MM_MODEM_BAND_G850) { band > MM_MODEM_BAND_UNKNOWN && band <= MM_MODEM_BAND_G850) {
@@ -284,7 +284,7 @@ mm_telit_parse_bnd_response (const gchar *response,
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 response '%s'", response); "Could not find matches in response '%s'", response);
goto end; goto end;
@@ -298,7 +298,7 @@ mm_telit_parse_bnd_response (const gchar *response,
if (modem_is_3g && !mm_telit_get_3g_mm_bands (match_info, &bands, error)) if (modem_is_3g && !mm_telit_get_3g_mm_bands (match_info, &bands, error))
goto end; goto end;
if(modem_is_4g && !mm_telit_get_4g_mm_bands (match_info, &bands, error)) if (modem_is_4g && !mm_telit_get_4g_mm_bands (match_info, &bands, error))
goto end; goto end;
*supported_bands = bands; *supported_bands = bands;
@@ -438,7 +438,7 @@ end:
} }
gboolean gboolean
mm_telit_get_4g_mm_bands(GMatchInfo *match_info, mm_telit_get_4g_mm_bands (GMatchInfo *match_info,
GArray **bands, GArray **bands,
GError **error) GError **error)
{ {
@@ -458,7 +458,7 @@ mm_telit_get_4g_mm_bands(GMatchInfo *match_info,
goto end; goto end;
} }
if (strstr(match_str, "-")) { if (strstr (match_str, "-")) {
tokens = g_strsplit (match_str, "-", -1); tokens = g_strsplit (match_str, "-", -1);
if (tokens == NULL) { if (tokens == NULL) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
@@ -473,7 +473,6 @@ mm_telit_get_4g_mm_bands(GMatchInfo *match_info,
sscanf (match_str, "%d", &value); sscanf (match_str, "%d", &value);
} }
for (i = 0; value > 0; i++) { for (i = 0; value > 0; i++) {
if (value % 2 != 0) { if (value % 2 != 0) {
band = MM_MODEM_BAND_EUTRAN_1 + i; band = MM_MODEM_BAND_EUTRAN_1 + i;
@@ -481,6 +480,7 @@ mm_telit_get_4g_mm_bands(GMatchInfo *match_info,
} }
value = value >> 1; value = value >> 1;
} }
end: end:
g_free (match_str); g_free (match_str);
@@ -555,19 +555,19 @@ mm_telit_get_band_flags_from_string (const gchar *flag_str,
for (i = 0; tokens[i]; i++) { for (i = 0; tokens[i]; i++) {
/* check whether tokens[i] defines a /* check whether tokens[i] defines a
* single band value or a range of bands */ * single band value or a range of bands */
if (!strstr(tokens[i], "-")) { if (!strstr (tokens[i], "-")) {
sscanf(tokens[i], "%d", &flag); sscanf (tokens[i], "%d", &flag);
g_array_append_val (*band_flags, flag); g_array_append_val (*band_flags, flag);
} else { } else {
gint range_start; gint range_start;
gint range_end; gint range_end;
range = g_strsplit(tokens[i], "-", 2); range = g_strsplit (tokens[i], "-", 2);
sscanf(range[0], "%d", &range_start); sscanf (range[0], "%d", &range_start);
sscanf(range[1], "%d", &range_end); sscanf (range[1], "%d", &range_end);
for (flag=range_start; flag <= range_end; flag++) { for (flag = range_start; flag <= range_end; flag++) {
g_array_append_val (*band_flags, flag); g_array_append_val (*band_flags, flag);
} }