diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-12-08 20:03:15 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-12-08 20:03:15 +0000 |
| commit | 93398e794e9afb2e304d27d86287db3054724755 (patch) | |
| tree | b28073e4314ca33a4058bfd392df1642576a1f40 /epan/dissectors/packet-gsm_sms.c | |
| parent | 2dd25c2c482e573a26db19db995dd171c7667cea (diff) | |
Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors
svn path=/trunk/; revision=53867
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 07a43a6b91..edfabf3377 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2790,9 +2790,8 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset (udl > SMS_MAX_MESSAGE_SIZE ? SMS_MAX_MESSAGE_SIZE : udl), tvb_get_ptr(tvb , offset , length) , messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, tvb, offset, - length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + proto_tree_add_string(subtree, hf_gsm_sms_text, tvb, offset, length, + gsm_sms_chars_to_utf8(messagebuf, out_len)); } else { @@ -2813,9 +2812,9 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset tvb_get_ptr(sm_tvb, total_sms_len, p_frag_params->length), messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, sm_tvb, - total_sms_len, p_frag_params->length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb, + total_sms_len, p_frag_params->length, + gsm_sms_chars_to_utf8(messagebuf, out_len)); total_sms_len += p_frag_params->length; } @@ -2850,8 +2849,8 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset /* Show unreassembled SMS */ utf8_text = g_convert_with_iconv(tvb_get_ptr(sm_tvb, 0, rep_len), rep_len , cd , NULL , NULL , &l_conv_error); if(!l_conv_error) { - ucs2_item = proto_tree_add_unicode_string(subtree, hf_gsm_sms_text, tvb, - offset, length, utf8_text); + ucs2_item = proto_tree_add_string(subtree, hf_gsm_sms_text, tvb, + offset, length, utf8_text); } else { ucs2_item = proto_tree_add_text(subtree, tvb, offset, length, "Failed to decode UCS2!"); } @@ -2882,9 +2881,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_unicode_string(subtree, hf_gsm_sms_text, sm_tvb, - i * MAX_SMS_FRAG_LEN, length_ucs2, - &utf8_text[i * 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); /* return the save byte to utf8 buffer*/ @@ -3767,7 +3766,7 @@ proto_register_gsm_sms(void) }, { &hf_gsm_sms_text, { "SMS text", "gsm_sms.sms_text", - FT_STRING, BASE_NONE, NULL, 0x00, + FT_STRING, STR_UNICODE, NULL, 0x00, "The text of the SMS", HFILL } }, { &hf_gsm_sms_tp_fail_cause, |