diff options
| author | Yang Gu <yang.gu@intel.com> | 2010-11-30 18:44:49 +0800 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-12-08 07:53:30 -0600 |
| commit | f6b037661b297ccafddae03af61c9b5c3ea79bd9 (patch) | |
| tree | ea1cda27ca15df637a56a4fa6d088ce9f38e87b3 /src/stkutil.c | |
| parent | 7784c5ed62a2b98051d69c3ac05b62d4f529141b (diff) | |
| download | ofono-f6b037661b297ccafddae03af61c9b5c3ea79bd9.tar.bz2 | |
smsutil: Make timezone an optional field
Diffstat (limited to 'src/stkutil.c')
| -rw-r--r-- | src/stkutil.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/stkutil.c b/src/stkutil.c index a2114620..01a00212 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -4548,7 +4548,6 @@ static gboolean build_dataobj_datetime_timezone(struct stk_tlv_builder *tlv, const void *data, gboolean cr) { const struct sms_scts *scts = data; - struct sms_scts timestamp; unsigned char value[7]; int offset = 0; unsigned char tag = STK_DATA_OBJECT_TYPE_DATETIME_TIMEZONE; @@ -4556,16 +4555,8 @@ static gboolean build_dataobj_datetime_timezone(struct stk_tlv_builder *tlv, if (scts->month == 0 && scts->day == 0) return TRUE; - /* Time zone information is optional */ - if (scts->timezone == (gint8) 0xff) { - memcpy(×tamp, scts, sizeof(timestamp)); - timestamp.timezone = 0; - if (sms_encode_scts(×tamp, value, &offset) != TRUE) - return FALSE; - value[6] = 0xff; - } else - if (sms_encode_scts(scts, value, &offset) != TRUE) - return FALSE; + if (sms_encode_scts(scts, value, &offset) != TRUE) + return FALSE; return stk_tlv_builder_open_container(tlv, cr, tag, FALSE) && stk_tlv_builder_append_bytes(tlv, value, 7) && |