diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
| commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
| tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-q931.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
Diffstat (limited to 'epan/dissectors/packet-q931.c')
| -rw-r--r-- | epan/dissectors/packet-q931.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 8df37df250..b1fa92a732 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1399,7 +1399,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, if (len < 3) return; proto_tree_add_text(tree, tvb, offset, 3, - "Timer: %.3s", tvb_get_ephemeral_string(tvb, offset, 3)); + "Timer: %.3s", tvb_get_string(wmem_packet_scope(), tvb, offset, 3)); break; default: @@ -2239,7 +2239,7 @@ dissect_q931_number_ie(tvbuff_t *tvb, int offset, int len, if ( number_plan == 1 ) { if ( e164_info.e164_number_type != NONE ){ - e164_info.E164_number_str = tvb_get_ephemeral_string(tvb, offset, len); + e164_info.E164_number_str = tvb_get_string(wmem_packet_scope(), tvb, offset, len); e164_info.E164_number_length = len; dissect_e164_number(tvb, tree, offset, len, e164_info); } @@ -2247,9 +2247,9 @@ dissect_q931_number_ie(tvbuff_t *tvb, int offset, int len, /* Collect q931_packet_info */ if ( e164_info.e164_number_type == CALLING_PARTY_NUMBER && have_valid_q931_pi) - q931_pi->calling_number = tvb_get_ephemeral_string(tvb, offset, len); + q931_pi->calling_number = tvb_get_string(wmem_packet_scope(), tvb, offset, len); if ( e164_info.e164_number_type == CALLED_PARTY_NUMBER && have_valid_q931_pi) - q931_pi->called_number = tvb_get_ephemeral_string(tvb, offset, len); + q931_pi->called_number = tvb_get_string(wmem_packet_scope(), tvb, offset, len); } /* |