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

Simplify function logic

This commit is contained in:
Denis Kenzior 2009-09-17 12:18:48 -05:00
parent ee33bc6ab7
commit ef5eb6139a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sim.c
View File

@ -631,24 +631,24 @@ static void sim_efli_read_cb(int ok,
/* Detect whether the file is in EFli format, as opposed to 51.011 EFlp */ /* Detect whether the file is in EFli format, as opposed to 51.011 EFlp */
static gboolean sim_efli_format(const unsigned char *ef, int length) static gboolean sim_efli_format(const unsigned char *ef, int length)
{ {
int i;
if (length & 1) if (length & 1)
return FALSE; return FALSE;
while (length) { for (i = 0; i < length; i += 2) {
if (ef[0] != ef[1] && (ef[0] == 0xff || ef[1] == 0xff)) if (ef[i] == 0xff && ef[i+1] == 0xff)
return FALSE; continue;
/* ISO 639 country codes are each two lower-case SMS 7-bit /* ISO 639 country codes are each two lower-case SMS 7-bit
* characters while CB DCS language codes are in ranges * characters while CB DCS language codes are in ranges
* (0 - 15) or (32 - 47), so the ranges don't overlap * (0 - 15) or (32 - 47), so the ranges don't overlap
*/ */
if (ef[0] != 0xff && (ef[0] < 'a' || ef[0] > 'z')) if (g_ascii_isalpha(ef[i]) == 0)
return FALSE;
if (ef[1] != 0xff && (ef[1] < 'a' || ef[1] > 'z'))
return FALSE; return FALSE;
ef += 2; if (g_ascii_isalpha(ef[i+1]) == 0)
length -= 2; return FALSE;
} }
return TRUE; return TRUE;