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

stkutil: Fix style in build_dataobj_location_info

This commit is contained in:
Denis Kenzior 2010-05-28 10:57:37 -05:00
parent a597318b78
commit 5588433ad4
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/stkutil.c
View File

@ -3413,18 +3413,33 @@ static gboolean build_dataobj_location_info(struct stk_tlv_builder *tlv,
sim_encode_mcc_mnc(mccmnc, li->mcc, li->mnc);
return stk_tlv_builder_open_container(tlv, cr, tag, FALSE) &&
stk_tlv_builder_append_bytes(tlv, mccmnc, 3) &&
stk_tlv_builder_append_short(tlv, li->lac_tac) &&
(li->has_ci == FALSE ||
stk_tlv_builder_append_short(tlv, li->ci)) &&
(li->has_ext_ci == FALSE ||
stk_tlv_builder_append_short(tlv, li->ext_ci)) &&
(li->has_eutran_ci == FALSE ||
(stk_tlv_builder_append_short(tlv, li->eutran_ci >> 12) &&
stk_tlv_builder_append_short(tlv,
(li->eutran_ci << 4) | 0xf))) &&
stk_tlv_builder_close_container(tlv);
if (stk_tlv_builder_open_container(tlv, cr, tag, FALSE) == FALSE)
return FALSE;
if (stk_tlv_builder_append_bytes(tlv, mccmnc, 3) == FALSE)
return FALSE;
if (stk_tlv_builder_append_short(tlv, li->lac_tac) == FALSE)
return FALSE;
if (li->has_ci && stk_tlv_builder_append_short(tlv, li->ci) == FALSE)
return FALSE;
if (li->has_ext_ci &&
stk_tlv_builder_append_short(tlv, li->ext_ci) == FALSE)
return FALSE;
if (li->has_eutran_ci) {
if (stk_tlv_builder_append_short(tlv,
li->eutran_ci >> 12) == FALSE)
return FALSE;
if (stk_tlv_builder_append_short(tlv,
(li->eutran_ci << 4) | 0xf) == FALSE)
return FALSE;
}
return stk_tlv_builder_close_container(tlv);
}
/* Described in TS 102.223 Section 8.20