diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-generic-cdma.c | 4 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 10 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index 63c92e19..2f451704 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -1431,11 +1431,13 @@ reg_query_speri_done (MMAtSerialPort *port, { MMCallbackInfo *info = user_data; gboolean roam = FALSE; + const char *p; if (error) goto done; - if (!mm_cdma_parse_speri_response (response->str, &roam, NULL)) + p = mm_strip_tag (response->str, "$SPERI:"); + if (!p || !mm_cdma_parse_eri (p, &roam, NULL)) goto done; /* Change the 1x and EVDO registration states to roaming if they were diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 325d39d9..c3a3b4ac 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -686,11 +686,10 @@ static const EriItem eris[] = { }; gboolean -mm_cdma_parse_speri_response (const char *reply, - gboolean *out_roaming, - const char **out_desc) +mm_cdma_parse_eri (const char *reply, + gboolean *out_roaming, + const char **out_desc) { - const char *p; long int ind; const EriItem *iter = &eris[0]; gboolean found = FALSE; @@ -698,9 +697,8 @@ mm_cdma_parse_speri_response (const char *reply, g_return_val_if_fail (reply != NULL, FALSE); g_return_val_if_fail (out_roaming != NULL, FALSE); - p = mm_strip_tag (reply, "$SPERI:"); errno = 0; - ind = strtol (p, NULL, 10); + ind = strtol (reply, NULL, 10); if (errno == 0) { while (iter->num != -1) { if (iter->num == ind) { diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 63eecfbb..19caf950 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -49,9 +49,9 @@ gboolean mm_cdma_parse_spservice_response (const char *reply, MMModemCdmaRegistrationState *out_cdma_1x_state, MMModemCdmaRegistrationState *out_evdo_state); -gboolean mm_cdma_parse_speri_response (const char *reply, - gboolean *out_roaming, - const char **out_desc); +gboolean mm_cdma_parse_eri (const char *reply, + gboolean *out_roaming, + const char **out_desc); gboolean mm_gsm_parse_cscs_support_response (const char *reply, MMModemCharset *out_charsets); |