diff options
| -rw-r--r-- | epan/exported_pdu.c | 2 | ||||
| -rw-r--r-- | epan/proto.c | 2 | ||||
| -rw-r--r-- | epan/tvbparse.c | 20 | ||||
| -rw-r--r-- | plugins/epan/unistim/packet-unistim.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/epan/exported_pdu.c b/epan/exported_pdu.c index 431266ffe1..1b4d7d3e69 100644 --- a/epan/exported_pdu.c +++ b/epan/exported_pdu.c @@ -248,7 +248,7 @@ export_pdu_create_tags(packet_info *pinfo, const char* proto_name, guint16 tag_t DISSECTOR_ASSERT(proto_name != NULL); DISSECTOR_ASSERT((tag_type == EXP_PDU_TAG_PROTO_NAME) || (tag_type == EXP_PDU_TAG_HEUR_PROTO_NAME) || (tag_type == EXP_PDU_TAG_DISSECTOR_TABLE_NAME)); - exp_pdu_data = (exp_pdu_data_t *)wmem_alloc(wmem_packet_scope(), sizeof(exp_pdu_data_t)); + exp_pdu_data = wmem_new(wmem_packet_scope(), exp_pdu_data_t); /* Start by computing size of protocol name as a tag */ proto_str_len = (int)strlen(proto_name); diff --git a/epan/proto.c b/epan/proto.c index 2f48344266..f738173db5 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1147,7 +1147,7 @@ ptvcursor_new(proto_tree *tree, tvbuff_t *tvb, gint offset) { ptvcursor_t *ptvc; - ptvc = (ptvcursor_t *)wmem_alloc(wmem_packet_scope(), sizeof(ptvcursor_t)); + ptvc = wmem_new(wmem_packet_scope(), ptvcursor_t); ptvc->tree = tree; ptvc->tvb = tvb; ptvc->offset = offset; diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 8037c3d776..91c7205baf 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -210,7 +210,7 @@ tvbparse_wanted_t* tvbparse_chars(const int id, tvbparse_action_t before_cb, tvbparse_action_t after_cb) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); char *accept_str; gsize i; @@ -269,7 +269,7 @@ tvbparse_wanted_t* tvbparse_not_char(const int id, const void* data, tvbparse_action_t before_cb, tvbparse_action_t after_cb) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); w->condition = cond_not_char; w->id = id; @@ -289,7 +289,7 @@ tvbparse_wanted_t* tvbparse_not_chars(const int id, tvbparse_action_t before_cb, tvbparse_action_t after_cb) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); char *accept_str; gsize i; @@ -338,7 +338,7 @@ tvbparse_wanted_t* tvbparse_string(const int id, const void* data, tvbparse_action_t before_cb, tvbparse_action_t after_cb) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); w->condition = cond_string; w->id = id; @@ -377,7 +377,7 @@ tvbparse_wanted_t* tvbparse_casestring(const int id, const void* data, tvbparse_action_t before_cb, tvbparse_action_t after_cb) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); w->condition = cond_casestring; w->id = id; @@ -440,7 +440,7 @@ tvbparse_wanted_t* tvbparse_set_oneof(const int id, tvbparse_action_t before_cb, tvbparse_action_t after_cb, ...) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); tvbparse_t* el; va_list ap; @@ -531,7 +531,7 @@ tvbparse_wanted_t* tvbparse_hashed(const int id, tvbparse_wanted_t* key, tvbparse_wanted_t* other, ...) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); gchar* name; tvbparse_wanted_t* el; va_list ap; @@ -636,7 +636,7 @@ tvbparse_wanted_t* tvbparse_set_seq(const int id, tvbparse_action_t before_cb, tvbparse_action_t after_cb, ...) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); tvbparse_wanted_t* el = NULL; va_list ap; @@ -735,7 +735,7 @@ tvbparse_wanted_t* tvbparse_some(const int id, tvbparse_action_t after_cb, const tvbparse_wanted_t* el) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); g_assert(from <= to); @@ -817,7 +817,7 @@ tvbparse_wanted_t* tvbparse_until(const int id, tvbparse_action_t after_cb, const tvbparse_wanted_t* el, until_mode_t until_mode) { - tvbparse_wanted_t* w = (tvbparse_wanted_t *)wmem_alloc0(wmem_epan_scope(), sizeof(tvbparse_wanted_t)); + tvbparse_wanted_t* w = wmem_new0(wmem_epan_scope(), tvbparse_wanted_t); w->condition = cond_until; w->control.until.mode = until_mode; diff --git a/plugins/epan/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c index 4ebad9a158..6c2563142a 100644 --- a/plugins/epan/unistim/packet-unistim.c +++ b/plugins/epan/unistim/packet-unistim.c @@ -194,7 +194,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_ proto_tree_add_item(rudpm_tree,hf_unistim_seq_nu,tvb,offset,4,ENC_BIG_ENDIAN); /* Allocate new mem for queueing */ - uinfo = (unistim_info_t *)wmem_alloc(wmem_packet_scope(), sizeof(unistim_info_t)); + uinfo = wmem_new(wmem_packet_scope(), unistim_info_t); /* Clear tap struct */ uinfo->rudp_type = 0; |