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

Add and modify string getters 

Add a getter for latin ASCII only tags, and change the alpha tag
getter. Turns out not all alpha tags in ISI are of the length-value
variety.
This commit is contained in:
Aki Niemi 2009-09-14 16:21:06 +03:00
parent d7459f45fc
commit a1ca8a9afa
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gisi/iter.c
View File

@ -113,25 +113,45 @@ bool g_isi_sb_iter_get_oper_code(GIsiSubBlockIter *iter, char *mcc,
}
bool g_isi_sb_iter_get_alpha_tag(GIsiSubBlockIter *iter, char **utf8,
int pos)
size_t len, int pos)
{
uint8_t *ucs2 = NULL;
int len = 0;
if (pos > iter->start[1])
return false;
len = iter->start[pos] * 2; /* Alpha tags are UCS-2 */
if (!utf8 || len == 0 || pos + 1 + len > iter->start[1])
if (!utf8 || len == 0 || pos + len > iter->start[1])
return false;
ucs2 = iter->start + pos;
if (ucs2 + len > iter->end)
return false;
ucs2 = iter->start + pos + 1;
*utf8 = g_convert((const char *)ucs2, len, "UTF-8//TRANSLIT", "UCS-2BE",
NULL, NULL, NULL);
return utf8 != NULL;
}
bool g_isi_sb_iter_get_latin_tag(GIsiSubBlockIter *iter, char **latin,
size_t len, int pos)
{
uint8_t *str = NULL;
if (pos > iter->start[1])
return false;
if (!latin || len == 0 || pos + len > iter->start[1])
return false;
str = iter->start + pos;
if (str + len > iter->end)
return false;
*latin = g_strndup((char *)str, len);
return latin != NULL;
}
bool g_isi_sb_iter_init(const void restrict *data, size_t len, GIsiSubBlockIter *iter)
{
if (!iter || !data || len == 0)

6
gisi/iter.h
View File

@ -48,7 +48,11 @@ bool g_isi_sb_iter_get_word(GIsiSubBlockIter *iter, uint16_t *word, int pos);
bool g_isi_sb_iter_get_dword(GIsiSubBlockIter *iter, uint32_t *dword, int pos);
bool g_isi_sb_iter_get_oper_code(GIsiSubBlockIter *iter, char *mcc,
char *mnc, int pos);
bool g_isi_sb_iter_get_alpha_tag(GIsiSubBlockIter *iter, char **utf8, int pos);
bool g_isi_sb_iter_get_alpha_tag(GIsiSubBlockIter *iter, char **utf8,
size_t len, int pos);
bool g_isi_sb_iter_get_latin_tag(GIsiSubBlockIter *iter, char **ascii,
size_t len, int pos);
bool g_isi_sb_iter_init(const void restrict *data, size_t len,
GIsiSubBlockIter *iter);