aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_sms.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-01-14 14:01:03 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2014-01-14 14:01:03 +0000
commitb0d4e7a34bcabbdad0be1d958d4febaa8a52f03f (patch)
tree6f4136cb0f3f09af8f4eabe4651befe9f664144c /epan/dissectors/packet-gsm_sms.c
parentb01a99c385bc80566cff9134f93b5d4680dd5a58 (diff)
UCS2 encoded SMS is directly read from data -> remove PROTO_ITEM_SET_GENERATED()
svn path=/trunk/; revision=54783
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
-rw-r--r--epan/dissectors/packet-gsm_sms.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 527f4a9ea4..f84ea809b3 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -2491,7 +2491,6 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset
fragment_head *fd_sm = NULL;
guint8 fill_bits;
guint32 total_sms_len, len_sms, length_ucs2, i;
- proto_item *ucs2_item;
gchar *utf8_text = NULL;
gchar save_byte = 0, save_byte2 = 0;
@@ -2665,9 +2664,8 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset
if (!(reassembled && pinfo->fd->num == reassembled_in))
{
/* Show unreassembled SMS */
- ucs2_item = proto_tree_add_item(subtree, hf_gsm_sms_text, sm_tvb,
- 0, rep_len, ENC_UCS_2|ENC_BIG_ENDIAN);
- PROTO_ITEM_SET_GENERATED(ucs2_item);
+ proto_tree_add_item(subtree, hf_gsm_sms_text, sm_tvb,
+ 0, rep_len, ENC_UCS_2|ENC_BIG_ENDIAN);
} else {
/* Show reassembled SMS. We show each fragment separately
* so that the text doesn't get truncated when we add it to
@@ -2695,10 +2693,9 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset
} else
length_ucs2 = len_sms % MAX_SMS_FRAG_LEN;
- ucs2_item = proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb,
- i * MAX_SMS_FRAG_LEN, length_ucs2,
- &utf8_text[i * MAX_SMS_FRAG_LEN]);
- PROTO_ITEM_SET_GENERATED(ucs2_item);
+ proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb,
+ i * MAX_SMS_FRAG_LEN, length_ucs2,
+ &utf8_text[i * MAX_SMS_FRAG_LEN]);
/* return the save byte to utf8 buffer*/
if(i * MAX_SMS_FRAG_LEN < len_sms) {