sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ifxmodem: Remove another usage g_utf8_validate

This commit is contained in:
Marcel Holtmann 2012-02-10 09:42:54 +01:00
parent 9d666ccce0
commit b88a621528
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/ifxmodem/voicecall.c
View File

@ -852,7 +852,8 @@ static void xlema_read(gboolean ok, GAtResult *result, gpointer user_data)
GAtResultIter iter; GAtResultIter iter;
int num = 0; int num = 0;
int index, total_cnt; int index, total_cnt;
const char *number, *end; const char *number;
int len;
if (!ok) { if (!ok) {
DBG("Emergency number list read failed"); DBG("Emergency number list read failed");
@ -879,12 +880,12 @@ static void xlema_read(gboolean ok, GAtResult *result, gpointer user_data)
if (!g_at_result_iter_next_string(&iter, &number)) if (!g_at_result_iter_next_string(&iter, &number))
continue; continue;
if (g_utf8_validate(number, -1, &end) == FALSE) { len = strspn(number, "0123456789");
vd->en_list[num] = g_strndup(number, end - number); vd->en_list[num++] = g_strndup(number, len);
ofono_warn("Malformed emergency number: %s",
vd->en_list[num++]); if (number[len] != '\0')
} else ofono_warn("Malformed emergency number: %.*s",
vd->en_list[num++] = g_strdup(number); len, number);
} }
ofono_voicecall_en_list_notify(vc, vd->en_list); ofono_voicecall_en_list_notify(vc, vd->en_list);