diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-12-21 21:01:45 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-12-21 21:01:45 +0000 |
| commit | aae3c27307ae9b67d2a26da304a96e68e7a66324 (patch) | |
| tree | ac6f8c4bf676363ba8c2efa44035afdcd111ba9f /epan/dissectors/packet-gmr1_rr.c | |
| parent | 092d8f21ef79a79c56b2ae0878d5d31630f973a1 (diff) | |
Include packet-gsm_sms.h and remove extern declarations
svn path=/trunk/; revision=46686
Diffstat (limited to 'epan/dissectors/packet-gmr1_rr.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_rr.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index ec2ca4e357..b59f8bb575 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -38,7 +38,7 @@ #include <epan/packet.h> #include "packet-gmr1_common.h" - +#include "packet-gsm_sms.h" /* GMR-1 RR and CCCH proto */ static int proto_gmr1_rr = -1; @@ -610,14 +610,6 @@ static const value_string rr_pos_display_flag_vals[] = { { 0, NULL } }; -extern int -gsm_sms_char_7bit_unpack( - unsigned int offset, unsigned int in_length, unsigned int out_length, - const guint8 *input, unsigned char *output); - -extern gchar * -gsm_sms_chars_to_utf8(const unsigned char* src, int len); - GMR1_IE_FUNC(gmr1_ie_rr_pos_display) { const unsigned char *txt_raw; @@ -638,8 +630,8 @@ GMR1_IE_FUNC(gmr1_ie_rr_pos_display) out_len = gsm_sms_char_7bit_unpack(0, 11, 12, txt_packed, txt_unpacked); /* Display it */ - proto_tree_add_string(tree, hf_rr_pos_display_text, - tvb, offset, 11, gsm_sms_chars_to_utf8(txt_unpacked, out_len)); + proto_tree_add_unicode_string(tree, hf_rr_pos_display_text, + tvb, offset, 11, gsm_sms_chars_to_utf8(txt_unpacked, out_len)); return 11; } |