diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2012-10-03 19:24:58 +0100 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-10-03 19:26:17 +0100 |
commit | c1671f37b1a6b8872d736bfdcee25770dbbd5a06 (patch) | |
tree | 281e072de977044debdee1dc42efebc5f3c533db /image/ico.c | |
parent | 5a2212fda6332980f351a8d8ca03f7d79d8c9712 (diff) | |
download | netsurf-c1671f37b1a6b8872d736bfdcee25770dbbd5a06.tar.gz netsurf-c1671f37b1a6b8872d736bfdcee25770dbbd5a06.tar.bz2 |
reduce talloc usage to box tree layout only
Diffstat (limited to 'image/ico.c')
-rw-r--r-- | image/ico.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/image/ico.c b/image/ico.c index 65a85c2d4..b9abd7d1c 100644 --- a/image/ico.c +++ b/image/ico.c @@ -35,7 +35,6 @@ #include "image/image.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" typedef struct nsico_content { @@ -69,20 +68,20 @@ static nserror nsico_create(const content_handler *handler, nsico_content *result; nserror error; - result = talloc_zero(0, nsico_content); + result = calloc(1, sizeof(nsico_content)); if (result == NULL) return NSERROR_NOMEM; error = content__init(&result->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(result); + free(result); return error; } error = nsico_create_ico_data(result); if (error != NSERROR_OK) { - talloc_free(result); + free(result); return error; } @@ -190,7 +189,7 @@ static nserror nsico_clone(const struct content *old, struct content **newc) nsico_content *ico; nserror error; - ico = talloc_zero(0, nsico_content); + ico = calloc(1, sizeof(nsico_content)); if (ico == NULL) return NSERROR_NOMEM; |