diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-05-24 17:20:21 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-05-25 16:52:52 -0500 |
| commit | 7eda56a6b4dfd43555afa075bbbd708d8c049850 (patch) | |
| tree | 2c8d7738cc9c1322cfa08c4ecd386f78e43935f6 /src/stkutil.c | |
| parent | 355b038c6fdea63af67efd1d041afe10603b32d4 (diff) | |
| download | ofono-7eda56a6b4dfd43555afa075bbbd708d8c049850.tar.bz2 | |
stkutil: Various code style issues
Diffstat (limited to 'src/stkutil.c')
| -rw-r--r-- | src/stkutil.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/stkutil.c b/src/stkutil.c index 0535b623..3edf3f50 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -48,7 +48,16 @@ struct stk_file_iter { const unsigned char *file; }; +struct stk_tlv_builder { + struct comprehension_tlv_builder ctlv; + unsigned char *value; + unsigned int len; + unsigned int max_len; +}; + typedef gboolean (*dataobj_handler)(struct comprehension_tlv_iter *, void *); +typedef gboolean (*dataobj_writer)(struct stk_tlv_builder *, + const void *, gboolean); /* * Defined in TS 102.223 Section 8.13 @@ -2851,13 +2860,6 @@ void stk_command_free(struct stk_command *command) g_free(command); } -struct stk_tlv_builder { - struct comprehension_tlv_builder ctlv; - unsigned char *value; - unsigned int len; - unsigned int max_len; -}; - static inline gboolean stk_tlv_builder_init(struct stk_tlv_builder *iter, unsigned char *pdu, unsigned int size) @@ -3041,12 +3043,14 @@ static gboolean build_dataobj_duration(struct stk_tlv_builder *tlv, const void *data, gboolean cr) { const struct stk_duration *duration = data; + unsigned char tag; if (duration->interval == 0x00) return TRUE; - return stk_tlv_open_container(tlv, cr, - STK_DATA_OBJECT_TYPE_DURATION, FALSE) && + tag = STK_DATA_OBJECT_TYPE_DURATION; + + return stk_tlv_open_container(tlv, cr, tag, FALSE) && stk_tlv_append_byte(tlv, duration->unit) && stk_tlv_append_byte(tlv, duration->interval) && stk_tlv_close_container(tlv); @@ -3096,6 +3100,7 @@ static gboolean build_dataobj_text(struct stk_tlv_builder *tlv, */ if (stk_tlv_append_byte(tlv, 0x04) != TRUE) return FALSE; + if (stk_tlv_append_byte(tlv, text->text ? 0x01 : 0x00) != TRUE) return FALSE; } else if (text->packed) { @@ -3109,9 +3114,8 @@ static gboolean build_dataobj_text(struct stk_tlv_builder *tlv, return stk_tlv_close_container(tlv); } -static gboolean build_dataobj(struct stk_tlv_builder *tlv, gboolean - (*builder_func)(struct stk_tlv_builder *, - const void *, gboolean), ...) +static gboolean build_dataobj(struct stk_tlv_builder *tlv, + dataobj_writer builder_func, ...) { va_list args; @@ -3125,9 +3129,7 @@ static gboolean build_dataobj(struct stk_tlv_builder *tlv, gboolean if (builder_func(tlv, data, cr) != TRUE) return FALSE; - builder_func = va_arg(args, gboolean (*)( - struct stk_tlv_builder *, - const void *, gboolean)); + builder_func = va_arg(args, dataobj_writer); } return TRUE; |