aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/tvbparse.c')
-rw-r--r--epan/tvbparse.c20
1 files changed, 10 insertions, 10 deletions
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;