diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 13:46:13 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 13:46:13 +0000 |
| commit | 9486a3d9747ad9426913dd3302e19c5884cc2bff (patch) | |
| tree | f245f85039bfb7c41c76a68588c9e9ebe383e940 /epan/dissectors/packet-ldp.c | |
| parent | 888650324b6c2fc7f8c9d29f66d862f25b7e9a9f (diff) | |
More wmem conversion (leaving uat related functions aside)
svn path=/trunk/; revision=52055
Diffstat (limited to 'epan/dissectors/packet-ldp.c')
| -rw-r--r-- | epan/dissectors/packet-ldp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 03745a6577..7cde6e2435 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -46,7 +46,7 @@ #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/afn.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/show_exception.h> @@ -1030,7 +1030,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre break; } - addr=(guint8 *)ep_alloc0(addr_size); + addr=(guint8 *)wmem_alloc0(wmem_packet_scope(), addr_size); for(ax=0; ax+1 <= prefix_len_octets; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); @@ -1105,7 +1105,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre break; } - addr=(guint8 *)ep_alloc0(addr_size); + addr=(guint8 *)wmem_alloc0(wmem_packet_scope(), addr_size); for(ax=0; ax+1 <= host_len; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); @@ -1395,7 +1395,7 @@ dissect_tlv_address_list(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem) ti=proto_tree_add_text(tree, tvb, offset, rem, "Addresses"); val_tree=proto_item_add_subtree(ti, ett_ldp_tlv_val); - addr=(guint8 *)ep_alloc(addr_size); + addr=(guint8 *)wmem_alloc(wmem_packet_scope(), addr_size); for(ix=1; rem >= addr_size; ix++, offset += addr_size, rem -= addr_size) { |