From d25ad21d86c35cea8497c09521663e377bf49392 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 21 Mar 2015 11:54:14 +0100 Subject: [PATCH] removed last direct calls to malloc() --- server/src/cfg.c | 6 +----- server/src/hooks.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/src/cfg.c b/server/src/cfg.c index 21c01a28c..29bf57b1a 100644 --- a/server/src/cfg.c +++ b/server/src/cfg.c @@ -273,11 +273,7 @@ int config_parse_opal(config_setting_t *cfg, struct node *n) return -1; } - struct opal *o = (struct opal *) malloc(sizeof(struct opal)); - if (!o) - error("Failed to allocate memory for opal settings"); - - memset(o, 0, sizeof(struct opal)); + struct opal *o = (struct opal *) alloc(sizeof(struct opal)); config_setting_lookup_int(cfg, "send_id", &o->send_id); config_setting_lookup_int(cfg, "recv_id", &o->recv_id); diff --git a/server/src/hooks.c b/server/src/hooks.c index 5a0607aff..3f5072e25 100644 --- a/server/src/hooks.c +++ b/server/src/hooks.c @@ -127,7 +127,7 @@ int hook_fir(struct msg *m, struct path *p) /* Create thread local storage for circular history buffer */ if (!history) { - history = malloc(len * sizeof(float)); + history = alloc(len * sizeof(float)); pthread_key_create(&pkey, free); pthread_setspecific(pkey, history);