diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/dt_anim.c | 7 | ||||
| -rw-r--r-- | amiga/dt_picture.c | 7 | ||||
| -rw-r--r-- | amiga/dt_sound.c | 7 | ||||
| -rw-r--r-- | amiga/icon.c | 7 | ||||
| -rw-r--r-- | amiga/plugin_hack.c | 7 |
5 files changed, 15 insertions, 20 deletions
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c index 9d79257cc..221f331fb 100644 --- a/amiga/dt_anim.c +++ b/amiga/dt_anim.c @@ -29,7 +29,6 @@ #include "image/bitmap.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include <proto/datatypes.h> #include <proto/dos.h> @@ -139,14 +138,14 @@ nserror amiga_dt_anim_create(const content_handler *handler, amiga_dt_anim_content *plugin; nserror error; - plugin = talloc_zero(0, amiga_dt_anim_content); + plugin = calloc(1, sizeof(amiga_dt_anim_content)); if (plugin == NULL) return NSERROR_NOMEM; error = content__init(&plugin->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(plugin); + free(plugin); return error; } @@ -309,7 +308,7 @@ nserror amiga_dt_anim_clone(const struct content *old, struct content **newc) LOG(("amiga_dt_anim_clone")); - plugin = talloc_zero(0, amiga_dt_anim_content); + plugin = calloc(1, sizeof(amiga_dt_anim_content)); if (plugin == NULL) return NSERROR_NOMEM; 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 <proto/datatypes.h> #include <proto/dos.h> @@ -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; diff --git a/amiga/dt_sound.c b/amiga/dt_sound.c index d1e9771f3..3f8216914 100644 --- a/amiga/dt_sound.c +++ b/amiga/dt_sound.c @@ -28,7 +28,6 @@ #include "render/box.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include <proto/datatypes.h> #include <proto/dos.h> @@ -126,14 +125,14 @@ nserror amiga_dt_sound_create(const content_handler *handler, LOG(("amiga_dt_sound_create")); - plugin = talloc_zero(0, amiga_dt_sound_content); + plugin = calloc(1, sizeof(amiga_dt_sound_content)); if (plugin == NULL) return NSERROR_NOMEM; error = content__init(&plugin->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(plugin); + free(plugin); return error; } @@ -251,7 +250,7 @@ nserror amiga_dt_sound_clone(const struct content *old, struct content **newc) LOG(("amiga_dt_sound_clone")); - plugin = talloc_zero(0, amiga_dt_sound_content); + plugin = calloc(1, sizeof(amiga_dt_sound_content)); if (plugin == NULL) return NSERROR_NOMEM; diff --git a/amiga/icon.c b/amiga/icon.c index 87a8a5c18..641095bc4 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -44,7 +44,6 @@ #include "content/content_protected.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include "utils/utils.h" #include "utils/url.h" @@ -108,14 +107,14 @@ nserror amiga_icon_create(const content_handler *handler, amiga_icon_content *ai_content; nserror error; - ai_content = talloc_zero(0, amiga_icon_content); + ai_content = calloc(1, sizeof(amiga_icon_content)); if (ai_content == NULL) return NSERROR_NOMEM; error = content__init(&ai_content->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(ai_content); + free(ai_content); return error; } @@ -285,7 +284,7 @@ nserror amiga_icon_clone(const struct content *old, struct content **newc) amiga_icon_content *ai; nserror error; - ai = talloc_zero(0, amiga_icon_content); + ai = calloc(1, sizeof(amiga_icon_content)); if (ai == NULL) return NSERROR_NOMEM; diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c index 89e80e3e4..830d2f614 100644 --- a/amiga/plugin_hack.c +++ b/amiga/plugin_hack.c @@ -27,7 +27,6 @@ #include "desktop/plotters.h" #include "utils/log.h" #include "utils/messages.h" -#include "utils/talloc.h" #include <proto/dos.h> #include <proto/exec.h> @@ -101,14 +100,14 @@ nserror amiga_plugin_hack_create(const content_handler *handler, amiga_plugin_hack_content *plugin; nserror error; - plugin = talloc_zero(0, amiga_plugin_hack_content); + plugin = calloc(1, amiga_plugin_hack_content); if (plugin == NULL) return NSERROR_NOMEM; error = content__init(&plugin->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(plugin); + free(plugin); return error; } @@ -208,7 +207,7 @@ nserror amiga_plugin_hack_clone(const struct content *old, struct content **newc LOG(("amiga_plugin_hack_clone")); - plugin = talloc_zero(0, amiga_plugin_hack_content); + plugin = calloc(1, sizeof(amiga_plugin_hack_content)); if (plugin == NULL) return NSERROR_NOMEM; |