diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2014-04-10 10:04:12 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2014-04-10 10:04:12 -0500 |
| commit | b37f5e842d7de5d19538b8abf8369320cfbd82c6 (patch) | |
| tree | 8b2dcd213058f1c6d6c702e4651d32244004b0e4 /drivers/hfpmodem | |
| parent | e7f055385f2e905a0d28be5c13f56a0f60ee5689 (diff) | |
| download | ofono-b37f5e842d7de5d19538b8abf8369320cfbd82c6.tar.bz2 | |
handsfree: Simplify logic
Diffstat (limited to 'drivers/hfpmodem')
| -rw-r--r-- | drivers/hfpmodem/handsfree.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/drivers/hfpmodem/handsfree.c b/drivers/hfpmodem/handsfree.c index 81baaa19..1ad7db37 100644 --- a/drivers/hfpmodem/handsfree.c +++ b/drivers/hfpmodem/handsfree.c @@ -43,8 +43,6 @@ #include "hfp.h" #include "slc.h" -#define OFONO_HANDSFREE_CNUM_SERVICE_VOICE 4 - static const char *binp_prefix[] = { "+BINP:", NULL }; static const char *bvra_prefix[] = { "+BVRA:", NULL }; @@ -149,19 +147,15 @@ static void cnum_query_cb(gboolean ok, GAtResult *result, gpointer user_data) if (num == 0) goto out; - list = g_new(struct ofono_phone_number, num); + list = g_new0(struct ofono_phone_number, num); g_at_result_iter_init(&iter, result); for (num = 0; g_at_result_iter_next(&iter, "+CNUM:"); ) { const char *number; - int len; int service; int type; - list[num].number[0] = '\0'; - list[num].type = 129; - if (!g_at_result_iter_skip_next(&iter)) continue; @@ -177,17 +171,17 @@ static void cnum_query_cb(gboolean ok, GAtResult *result, gpointer user_data) if (!g_at_result_iter_next_number(&iter, &service)) continue; - if (service == OFONO_HANDSFREE_CNUM_SERVICE_VOICE) { - len = strlen(number); - if (len > OFONO_MAX_PHONE_NUMBER_LENGTH) - len = OFONO_MAX_PHONE_NUMBER_LENGTH; - strncpy(list[num].number, number, len); - list[num].number[len] = '\0'; - list[num].type = type; - - DBG("cnum_notify:%s", list[num].number); - num++; - } + /* We are only interested in Voice services */ + if (service != 4) + continue; + + strncpy(list[num].number, number, + OFONO_MAX_PHONE_NUMBER_LENGTH); + list[num].number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0'; + list[num].type = type; + + DBG("cnum_notify:%s", list[num].number); + num++; } out: |