diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-17 16:30:25 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-17 23:22:46 +0000 |
| commit | b5eb9710db46b0e68883858fd43b1eb600ec5cf1 (patch) | |
| tree | 9a597df895f0d350ce2615ce8c4d7775c436d787 /epan/next_tvb.c | |
| parent | be113e8806796faf048d6c95c1141525ab5da29e (diff) | |
Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.
Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1
Reviewed-on: https://code.wireshark.org/review/6595
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/next_tvb.c')
| -rw-r--r-- | epan/next_tvb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/next_tvb.c b/epan/next_tvb.c index 34aaee5862..2a6512c3f3 100644 --- a/epan/next_tvb.c +++ b/epan/next_tvb.c @@ -25,7 +25,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> #include "next_tvb.h" @@ -38,7 +37,7 @@ void next_tvb_init(next_tvb_list_t *list) { void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_handle_t handle) { next_tvb_item_t *item; - item = ep_new(next_tvb_item_t); + item = wmem_new(wmem_packet_scope(), next_tvb_item_t); item->type = NTVB_HANDLE; item->handle = handle; @@ -59,7 +58,7 @@ void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 uint_val) { next_tvb_item_t *item; - item = ep_new(next_tvb_item_t); + item = wmem_new(wmem_packet_scope(), next_tvb_item_t); item->type = NTVB_UINT; item->table = table; @@ -81,7 +80,7 @@ void next_tvb_add_uint(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, d void next_tvb_add_string(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, const gchar *string) { next_tvb_item_t *item; - item = ep_new(next_tvb_item_t); + item = wmem_new(wmem_packet_scope(), next_tvb_item_t); item->type = NTVB_STRING; item->table = table; |