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

stkutil: Make the code more readable

This commit is contained in:
Denis Kenzior 2010-05-24 16:02:34 -05:00
parent 4dcce0304a
commit 60cab4354c
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/stkutil.c
View File

@ -3039,14 +3039,21 @@ static gboolean build_dataobj_result(struct stk_tlv_builder *tlv,
const void *data, gboolean cr) const void *data, gboolean cr)
{ {
const struct stk_result *result = data; const struct stk_result *result = data;
unsigned char tag = STK_DATA_OBJECT_TYPE_RESULT;
return stk_tlv_open_container(tlv, cr, STK_DATA_OBJECT_TYPE_RESULT, if (stk_tlv_open_container(tlv, cr, tag, FALSE) == FALSE)
FALSE) && return FALSE;
stk_tlv_append_byte(tlv, result->type) &&
(result->additional_len == 0 || if (stk_tlv_append_byte(tlv, result->type) == FALSE)
stk_tlv_append_bytes(tlv, result->additional, return FALSE;
result->additional_len)) &&
stk_tlv_close_container(tlv); if (result->additional_len > 0)
if (stk_tlv_append_bytes(tlv, result->additional,
result->additional_len) == FALSE)
return FALSE;
if (stk_tlv_close_container(tlv) == FALSE)
return FALSE;
} }
unsigned int stk_pdu_from_response(const struct stk_response *response, unsigned int stk_pdu_from_response(const struct stk_response *response,
@ -3054,6 +3061,7 @@ unsigned int stk_pdu_from_response(const struct stk_response *response,
{ {
struct stk_tlv_builder builder; struct stk_tlv_builder builder;
gboolean ok = TRUE; gboolean ok = TRUE;
unsigned char tag;
stk_tlv_builder_init(&builder, pdu, size); stk_tlv_builder_init(&builder, pdu, size);
@ -3062,13 +3070,20 @@ unsigned int stk_pdu_from_response(const struct stk_response *response,
* Command Details TLV first, followed by Device Identities TLV * Command Details TLV first, followed by Device Identities TLV
* and the Result TLV. Comprehension required everywhere. * and the Result TLV. Comprehension required everywhere.
*/ */
if ((stk_tlv_open_container(&builder, TRUE, tag = STK_DATA_OBJECT_TYPE_COMMAND_DETAILS;
STK_DATA_OBJECT_TYPE_COMMAND_DETAILS, if (stk_tlv_open_container(&builder, TRUE, tag, FALSE) == FALSE)
FALSE) && return 0;
stk_tlv_append_byte(&builder, response->number) &&
stk_tlv_append_byte(&builder, response->type) && if (stk_tlv_append_byte(&builder, response->number) == FALSE)
stk_tlv_append_byte(&builder, response->qualifier) && return 0;
stk_tlv_close_container(&builder)) != TRUE)
if (stk_tlv_append_byte(&builder, response->type) == FALSE)
return 0;
if (stk_tlv_append_byte(&builder, response->qualifier) == FALSE)
return 0;
if (stk_tlv_close_container(&builder) == FALSE)
return 0; return 0;
/* TS 102 223 section 6.8 states: /* TS 102 223 section 6.8 states:
@ -3081,12 +3096,17 @@ unsigned int stk_pdu_from_response(const struct stk_response *response,
* TS 102 384 conformace tests so we set it per command and per * TS 102 384 conformace tests so we set it per command and per
* data object type. * data object type.
*/ */
if ((stk_tlv_open_container(&builder, TRUE, tag = STK_DATA_OBJECT_TYPE_DEVICE_IDENTITIES;
STK_DATA_OBJECT_TYPE_DEVICE_IDENTITIES, if (stk_tlv_open_container(&builder, TRUE, tag, FALSE) == FALSE)
FALSE) && return 0;
stk_tlv_append_byte(&builder, response->src) &&
stk_tlv_append_byte(&builder, response->dst) && if (stk_tlv_append_byte(&builder, response->src) == FALSE)
stk_tlv_close_container(&builder)) != TRUE) return 0;
if (stk_tlv_append_byte(&builder, response->dst) == FALSE)
return 0;
if (stk_tlv_close_container(&builder) == FALSE)
return 0; return 0;
if (build_dataobj_result(&builder, &response->result, TRUE) != TRUE) if (build_dataobj_result(&builder, &response->result, TRUE) != TRUE)