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 --- riscos/content-handlers/artworks.c | 7 +++---- riscos/content-handlers/draw.c | 7 +++---- riscos/content-handlers/sprite.c | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'riscos') diff --git a/riscos/content-handlers/artworks.c b/riscos/content-handlers/artworks.c index b9c5f3378..66808d42a 100644 --- a/riscos/content-handlers/artworks.c +++ b/riscos/content-handlers/artworks.c @@ -39,7 +39,6 @@ #include "riscos/wimputils.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" #define AWRender_FileInitAddress 0x46080 @@ -140,14 +139,14 @@ nserror artworks_create(const content_handler *handler, artworks_content *aw; nserror error; - aw = talloc_zero(0, artworks_content); + aw = calloc(1, sizeof(artworks_content)); if (aw == NULL) return NSERROR_NOMEM; error = content__init(&aw->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(aw); + free(aw); return error; } @@ -406,7 +405,7 @@ nserror artworks_clone(const struct content *old, struct content **newc) artworks_content *aw; nserror error; - aw = talloc_zero(0, artworks_content); + aw = calloc(1, sizeof(artworks_content)); if (aw == NULL) return NSERROR_NOMEM; diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c index 0d8c86914..d18d580cd 100644 --- a/riscos/content-handlers/draw.c +++ b/riscos/content-handlers/draw.c @@ -35,7 +35,6 @@ #include "riscos/gui.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" typedef struct draw_content { @@ -82,14 +81,14 @@ nserror draw_create(const content_handler *handler, draw_content *draw; nserror error; - draw = talloc_zero(0, draw_content); + draw = calloc(1, sizeof(draw_content)); if (draw == NULL) return NSERROR_NOMEM; error = content__init(&draw->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(draw); + free(draw); return error; } @@ -218,7 +217,7 @@ nserror draw_clone(const struct content *old, struct content **newc) draw_content *draw; nserror error; - draw = talloc_zero(0, draw_content); + draw = calloc(1, sizeof(draw_content)); if (draw == NULL) return NSERROR_NOMEM; diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c index 7b6045cb9..9a70ebe75 100644 --- a/riscos/content-handlers/sprite.c +++ b/riscos/content-handlers/sprite.c @@ -35,7 +35,6 @@ #include "utils/config.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" #ifdef WITH_SPRITE @@ -81,14 +80,14 @@ nserror sprite_create(const content_handler *handler, sprite_content *sprite; nserror error; - sprite = talloc_zero(0, sprite_content); + sprite = calloc(1, sizeof(sprite_content)); if (sprite == NULL) return NSERROR_NOMEM; error = content__init(&sprite->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(sprite); + free(sprite); return error; } @@ -191,7 +190,7 @@ nserror sprite_clone(const struct content *old, struct content **newc) sprite_content *sprite; nserror error; - sprite = talloc_zero(0, sprite_content); + sprite = calloc(1, sizeof(sprite_content)); if (sprite == NULL) return NSERROR_NOMEM; -- cgit v1.2.3