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-ber.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-ber.c')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 66a810cc5c..07758ccb1b 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -4507,7 +4507,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree return end_offset; } - tmpstr = tvb_get_ephemeral_string(tvb, offset, len); + tmpstr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); strptr = str; /* those fields are allways present */ strptr += g_snprintf(str, 20, "%.4s-%.2s-%.2s %.2s:%.2s:%.2s", @@ -4616,11 +4616,11 @@ dissect_ber_UTCTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, t if ((len < 10) || (len > 19)) { error_str = wmem_strdup_printf(wmem_packet_scope(), "BER Error: UTCTime invalid length: %u", len); - instr = tvb_get_ephemeral_string(tvb, offset, len > 19 ? 19 : len); + instr = tvb_get_string(wmem_packet_scope(), tvb, offset, len > 19 ? 19 : len); goto malformed; } - instr = tvb_get_ephemeral_string(tvb, offset, len); + instr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); /* YYMMDDhhmm */ for (i=0; i<10; i++) { @@ -4818,7 +4818,7 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto sep = " ("; term = FALSE; nb = named_bits; - bitstring = tvb_get_ephemeral_string(tvb, offset, len); + bitstring = tvb_get_string(wmem_packet_scope(), tvb, offset, len); while (nb->p_id) { if ((len > 0) && (nb->bit < (8*len-pad))) { |