From c1671f37b1a6b8872d736bfdcee25770dbbd5a06 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 3 Oct 2012 19:24:58 +0100 Subject: reduce talloc usage to box tree layout only --- image/mng.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'image/mng.c') diff --git a/image/mng.c b/image/mng.c index 8d9769b70..67625f026 100644 --- a/image/mng.c +++ b/image/mng.c @@ -35,7 +35,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/schedule.h" -#include "utils/talloc.h" #include "utils/utils.h" /* This implementation does not currently support dynamic MNGs or any @@ -513,20 +512,20 @@ static nserror nsmng_create(const content_handler *handler, nsmng_content *mng; nserror error; - mng = talloc_zero(0, nsmng_content); + mng = calloc(1, sizeof(nsmng_content)); if (mng == NULL) return NSERROR_NOMEM; error = content__init(&mng->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(mng); + free(mng); return error; } error = nsmng_create_mng_data(mng); if (error != NSERROR_OK) { - talloc_free(mng); + free(mng); return error; } @@ -728,7 +727,7 @@ static nserror nsmng_clone(const struct content *old, struct content **newc) const char *data; unsigned long size; - mng = talloc_zero(0, nsmng_content); + mng = calloc(1, sizeof(nsmng_content)); if (mng == NULL) return NSERROR_NOMEM; -- cgit v1.2.3