diff options
| -rw-r--r-- | epan/emem.h | 1 | ||||
| -rw-r--r-- | epan/next_tvb.c | 7 | ||||
| -rw-r--r-- | epan/tvbparse.c | 43 | ||||
| -rwxr-xr-x | tools/checkAPIs.pl | 2 |
4 files changed, 24 insertions, 29 deletions
diff --git a/epan/emem.h b/epan/emem.h index 1236d61c2f..7a0a57af4b 100644 --- a/epan/emem.h +++ b/epan/emem.h @@ -54,7 +54,6 @@ void emem_init(void); /** Allocate memory with a packet lifetime scope */ WS_DLL_PUBLIC void *ep_alloc(size_t size) G_GNUC_MALLOC; -#define ep_new(type) ((type*)ep_alloc(sizeof(type))) /** Allocate memory with a packet lifetime scope and fill it with zeros*/ WS_DLL_PUBLIC 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; diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 0d3b86de37..9b6053be5e 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -27,7 +27,6 @@ #include <string.h> #include <glib.h> -#include <epan/emem.h> #include <epan/wmem/wmem.h> #include <epan/proto.h> #include <epan/packet_info.h> @@ -928,127 +927,127 @@ static gboolean comp_le_f(void* lp, const void* rp) { return ( *((gdouble*)lp) < static gboolean comp_lt_f(void* lp, const void* rp) { return ( *((gdouble*)lp) < *((gdouble*)rp) ); } static void* extract_u8(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_guint8(tvb,offset); return p; } static void* extract_uns(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntohs(tvb,offset); return p; } static void* extract_un24(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntoh24(tvb,offset); return p; } static void* extract_unl(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntohl(tvb,offset); return p; } static void* extract_un64(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntoh64(tvb,offset); return p; } static void* extract_ules(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letohs(tvb,offset); return p; } static void* extract_ule24(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letoh24(tvb,offset); return p; } static void* extract_ulel(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letohl(tvb,offset); return p; } static void* extract_ule64(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letoh64(tvb,offset); return p; } static void* extract_ins(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntohs(tvb,offset); return p; } static void* extract_in24(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntoh24(tvb,offset); return p; } static void* extract_inl(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntohl(tvb,offset); return p; } static void* extract_in64(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_ntoh64(tvb,offset); return p; } static void* extract_iles(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letohs(tvb,offset); return p; } static void* extract_ile24(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letoh24(tvb,offset); return p; } static void* extract_ilel(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letohl(tvb,offset); return p; } static void* extract_ile64(tvbuff_t* tvb, guint offset) { - guint64* p = ep_new(guint64); + guint64* p = wmem_new(wmem_packet_scope(), guint64); *p = tvb_get_letoh64(tvb,offset); return p; } static void* extract_inf(tvbuff_t* tvb, guint offset) { - gdouble* p = ep_new(gdouble); + gdouble* p = wmem_new(wmem_packet_scope(), gdouble); *p = tvb_get_ntohieee_float(tvb,offset); return p; } static void* extract_ind(tvbuff_t* tvb, guint offset) { - gdouble* p = ep_new(gdouble); + gdouble* p = wmem_new(wmem_packet_scope(), gdouble); *p = tvb_get_ntohieee_double(tvb,offset); return p; } static void* extract_ilef(tvbuff_t* tvb, guint offset) { - gdouble* p = ep_new(gdouble); + gdouble* p = wmem_new(wmem_packet_scope(), gdouble); *p = tvb_get_letohieee_float(tvb,offset); return p; } static void* extract_iled(tvbuff_t* tvb, guint offset) { - gdouble* p = ep_new(gdouble); + gdouble* p = wmem_new(wmem_packet_scope(), gdouble); *p = tvb_get_letohieee_double(tvb,offset); return p; } diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index b9b325914e..f008c6cbf9 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -153,9 +153,7 @@ my %APIs = ( # wmem calls should replace all emem calls (see doc/README.wmem) 'ep_alloc', - 'ep_new', 'ep_alloc0', - 'ep_new0', 'ep_strdup', 'ep_strndup', 'ep_strdup_printf', |