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 --- javascript/content.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'javascript/content.c') diff --git a/javascript/content.c b/javascript/content.c index 879c2190d..ef1bedc8e 100644 --- a/javascript/content.c +++ b/javascript/content.c @@ -30,7 +30,6 @@ #include "content/hlcache.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" #include "javascript/content.h" @@ -46,14 +45,14 @@ static nserror javascript_create(const content_handler *handler, javascript_content *script; nserror error; - script = talloc_zero(0, javascript_content); + script = calloc(1, sizeof(javascript_content)); if (script == NULL) return NSERROR_NOMEM; error = content__init(&script->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(script); + free(script); return error; } @@ -76,7 +75,7 @@ javascript_clone(const struct content *old, struct content **newc) javascript_content *script; nserror error; - script = talloc_zero(0, javascript_content); + script = calloc(1, sizeof(javascript_content)); if (script == NULL) return NSERROR_NOMEM; -- cgit v1.2.3