diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:55:15 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:55:15 +0000 |
commit | eab6c0c99e29e10a3ac409b8de7c0e39ef918358 (patch) | |
tree | 7411a9e07adfb98dd03df5cac60209925b6230a7 /frontends/amiga | |
parent | 15a68714919c64edc04d6e26679fabb490bdf9a2 (diff) | |
download | netsurf-eab6c0c99e29e10a3ac409b8de7c0e39ef918358.tar.gz netsurf-eab6c0c99e29e10a3ac409b8de7c0e39ef918358.tar.bz2 |
remove ami_misc_allocvec_clear
Diffstat (limited to 'frontends/amiga')
-rw-r--r-- | frontends/amiga/dt_anim.c | 5 | ||||
-rwxr-xr-x | frontends/amiga/memory.c | 11 | ||||
-rw-r--r-- | frontends/amiga/memory.h | 3 | ||||
-rw-r--r-- | frontends/amiga/os3support.h | 1 |
4 files changed, 2 insertions, 18 deletions
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c index 3175cf13b..a48633403 100644 --- a/frontends/amiga/dt_anim.c +++ b/frontends/amiga/dt_anim.c @@ -46,7 +46,6 @@ #include "amiga/bitmap.h" #include "amiga/filetype.h" #include "amiga/datatypes.h" -#include "amiga/memory.h" #include "amiga/plotters.h" typedef struct amiga_dt_anim_content { @@ -216,7 +215,7 @@ bool amiga_dt_anim_convert(struct content *c) #else #warning FIXME: Need to use a different blitter function for OS3! #endif - FreeVec(clut); + free(clut); adt_frame.MethodID = ADTM_UNLOADFRAME; IDoMethodA(plugin->dto, (Msg)&adt_frame); @@ -344,7 +343,7 @@ content_type amiga_dt_anim_content_type(void) static APTR ami_colormap_to_clut(struct ColorMap *cmap) { int i; - UBYTE *clut = ami_misc_allocvec_clear(256 * 4, 0); /* NB: Was not MEMF_PRIVATE */ + UBYTE *clut = calloc(1, 256 * 4); ULONG colr[256 * 4]; if(!clut) return NULL; diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c index 567f4f5c9..7a34f7abd 100755 --- a/frontends/amiga/memory.c +++ b/frontends/amiga/memory.c @@ -47,17 +47,6 @@ void ami_memory_clear_free(void *p) #endif } -void *ami_misc_allocvec_clear(int size, UBYTE value) -{ -#ifdef __amigaos4__ - return AllocVecTags(size, AVT_ClearWithValue, value, TAG_DONE); -#else - void *mem = AllocVec(size, MEMF_ANY); - if (mem) memset(mem, value, size); - return mem; -#endif -} - APTR ami_misc_itempool_create(int size) { #ifdef __amigaos4__ diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h index dd36a214b..63452f61a 100644 --- a/frontends/amiga/memory.h +++ b/frontends/amiga/memory.h @@ -34,9 +34,6 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value); void ami_memory_clear_free(void *p); -/* Standard memory allocation - to be removed */ -void *ami_misc_allocvec_clear(int size, UBYTE value); - /* Itempool cross-compatibility */ APTR ami_misc_itempool_create(int size); void ami_misc_itempool_delete(APTR pool); diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index 94d1d5818..856439bd8 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -152,7 +152,6 @@ #define DevNameFromLock(A,B,C,D) NameFromLock(A,B,C) /* Exec */ -#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */ #define FindIName FindName /* Intuition */ |