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 --- amiga/dt_picture.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'amiga/dt_picture.c') diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index 076847989..1a9dc4f72 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -29,7 +29,6 @@ #include "image/image_cache.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include #include @@ -104,14 +103,14 @@ nserror amiga_dt_picture_create(const content_handler *handler, struct content *adt; nserror error; - adt = talloc_zero(0, struct content); + adt = calloc(1, sizeof(struct content)); if (adt == NULL) return NSERROR_NOMEM; error = content__init(adt, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(adt); + free(adt); return error; } @@ -231,7 +230,7 @@ nserror amiga_dt_picture_clone(const struct content *old, struct content **newc) LOG(("amiga_dt_picture_clone")); - adt = talloc_zero(0, struct content); + adt = calloc(1, sizeof(struct content)); if (adt == NULL) return NSERROR_NOMEM; -- cgit v1.2.3