From ec239402eac198af635f14970bf411e5690dd02e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 19 Nov 2016 15:50:22 +0000 Subject: Move memory functions from misc.c to memory.c --- frontends/amiga/Makefile | 2 +- frontends/amiga/arexx.c | 1 + frontends/amiga/bitmap.c | 1 + frontends/amiga/clipboard.c | 2 +- frontends/amiga/download.c | 1 + frontends/amiga/dt_anim.c | 2 +- frontends/amiga/file.c | 1 + frontends/amiga/filetype.c | 2 +- frontends/amiga/font_bullet.c | 1 + frontends/amiga/gui.c | 1 + frontends/amiga/gui_options.c | 2 +- frontends/amiga/history_local.c | 1 + frontends/amiga/icon.c | 2 +- frontends/amiga/iff_dr2d.c | 2 +- frontends/amiga/login.c | 2 +- frontends/amiga/menu.c | 2 +- frontends/amiga/misc.c | 52 ----------------------------------------- frontends/amiga/misc.h | 9 ------- frontends/amiga/object.c | 2 +- frontends/amiga/plotters.c | 2 +- frontends/amiga/print.c | 1 + frontends/amiga/schedule.c | 2 +- frontends/amiga/search.c | 2 +- frontends/amiga/theme.c | 2 +- frontends/amiga/tree.c | 2 +- 25 files changed, 23 insertions(+), 76 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index a2c1b13d5..ea6e8fe67 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -37,7 +37,7 @@ MESSAGES_FILTER=ami # sources purely for the Amiga build S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ - misc.c bitmap.c font.c filetype.c utf8.c login.c \ + misc.c bitmap.c font.c filetype.c utf8.c login.c memory.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index 062f00b3f..ad2d23713 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -42,6 +42,7 @@ #include "amiga/hotlist.h" #include "amiga/tree.h" #include "amiga/libs.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/theme.h" diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 8c691eded..7609d9451 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -54,6 +54,7 @@ #include "amiga/gui.h" #include "amiga/bitmap.h" #include "amiga/plotters.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/rtg.h" diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index 2dce06845..4933f59e7 100644 --- a/frontends/amiga/clipboard.c +++ b/frontends/amiga/clipboard.c @@ -45,7 +45,7 @@ #include "amiga/iff_cset.h" #include "amiga/iff_dr2d.h" #include "amiga/menu.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/utf8.h" #define ID_UTF8 MAKE_ID('U','T','F','8') diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index 93536f494..0750e5e83 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -64,6 +64,7 @@ #include "amiga/file.h" #include "amiga/iff_dr2d.h" #include "amiga/libs.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/theme.h" #include "amiga/utf8.h" diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c index 19467882a..3175cf13b 100644 --- a/frontends/amiga/dt_anim.c +++ b/frontends/amiga/dt_anim.c @@ -46,7 +46,7 @@ #include "amiga/bitmap.h" #include "amiga/filetype.h" #include "amiga/datatypes.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/plotters.h" typedef struct amiga_dt_anim_content { diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c index 1bba30eb3..db0e7162b 100644 --- a/frontends/amiga/file.c +++ b/frontends/amiga/file.c @@ -40,6 +40,7 @@ #include "amiga/filetype.h" #include "amiga/icon.h" #include "amiga/iff_dr2d.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/save_pdf.h" #include "amiga/theme.h" diff --git a/frontends/amiga/filetype.c b/frontends/amiga/filetype.c index 61e4929c5..8c658ee81 100644 --- a/frontends/amiga/filetype.c +++ b/frontends/amiga/filetype.c @@ -31,7 +31,7 @@ #include "utils/utils.h" #include "amiga/filetype.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/object.h" /** diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index 48e49f345..bb0adb5d0 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -41,6 +41,7 @@ #include "utils/utf8.h" #include "utils/utils.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/font.h" #include "amiga/font_bullet.h" diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 459e768e1..df03756f3 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -141,6 +141,7 @@ #include "amiga/libs.h" #include "amiga/login.h" #include "amiga/menu.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/nsoption.h" #include "amiga/plotters.h" diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 2b1b7c944..a890a9126 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -73,7 +73,7 @@ #include "amiga/gui_options.h" #include "amiga/help.h" #include "amiga/libs.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/nsoption.h" #include "amiga/object.h" #include "amiga/selectmenu.h" diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c index c87b56385..fa5c249b9 100755 --- a/frontends/amiga/history_local.c +++ b/frontends/amiga/history_local.c @@ -51,6 +51,7 @@ #include "graphics/rpattr.h" #include "amiga/libs.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/plotters.h" diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index 7b73360d0..bd79a5502 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -49,7 +49,7 @@ #include "amiga/os3support.h" #include "amiga/bitmap.h" #include "amiga/icon.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */ #define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */ diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c index aea7738d3..1c8d7db2c 100644 --- a/frontends/amiga/iff_dr2d.c +++ b/frontends/amiga/iff_dr2d.c @@ -30,7 +30,7 @@ #include "netsurf/content.h" #include "amiga/os3support.h" #include "amiga/iff_dr2d.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #else #include "os3support.h" #include "iff_dr2d.h" diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c index 3b338bfe5..e1d2891c5 100755 --- a/frontends/amiga/login.c +++ b/frontends/amiga/login.c @@ -46,7 +46,7 @@ #include "amiga/gui.h" #include "amiga/libs.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/object.h" #include "amiga/login.h" diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 0fd730ed8..2eda5ff1b 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -68,7 +68,7 @@ #include "amiga/hotlist.h" #include "amiga/libs.h" #include "amiga/menu.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/nsoption.h" #include "amiga/print.h" #include "amiga/search.h" diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c index c09b28308..5ca4f906a 100755 --- a/frontends/amiga/misc.c +++ b/frontends/amiga/misc.c @@ -42,58 +42,6 @@ #include "amiga/misc.h" #include "amiga/utf8.h" -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__ - return AllocSysObjectTags(ASOT_ITEMPOOL, - ASOITEM_MFlags, MEMF_PRIVATE, - ASOITEM_ItemSize, size, - ASOITEM_GCPolicy, ITEMGC_AFTERCOUNT, - ASOITEM_GCParameter, 100, - TAG_DONE); -#else - return CreatePool(MEMF_ANY, 20 * size, size); -#endif -} - -void ami_misc_itempool_delete(APTR pool) -{ -#ifdef __amigaos4__ - FreeSysObject(ASOT_ITEMPOOL, pool); -#else - DeletePool(pool); -#endif -} - -APTR ami_misc_itempool_alloc(APTR pool, int size) -{ -#ifdef __amigaos4__ - return ItemPoolAlloc(pool); -#else - return AllocPooled(pool, size); -#endif -} - -void ami_misc_itempool_free(APTR restrict pool, APTR restrict item, int size) -{ -#ifdef __amigaos4__ - ItemPoolFree(pool, item); -#else - FreePooled(pool, item, size); -#endif -} - static LONG ami_misc_req(const char *message, uint32 type) { LONG ret = 0; diff --git a/frontends/amiga/misc.h b/frontends/amiga/misc.h index c7ae5af78..a74979451 100644 --- a/frontends/amiga/misc.h +++ b/frontends/amiga/misc.h @@ -35,15 +35,6 @@ struct Window; * faliure displaying the message to the user. */ nserror amiga_warn_user(const char *warning, const char *detail); - -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); -APTR ami_misc_itempool_alloc(APTR pool, int size); -void ami_misc_itempool_free(APTR pool, APTR item, int size); - char *translate_escape_chars(const char *s); void ami_misc_fatal_error(const char *message); int32 amiga_warn_user_multi(const char *body, diff --git a/frontends/amiga/object.c b/frontends/amiga/object.c index 6459d63c0..074ad9277 100755 --- a/frontends/amiga/object.c +++ b/frontends/amiga/object.c @@ -26,7 +26,7 @@ #include #include -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/object.h" #ifdef __amigaos4__ diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index 19171716c..842e1bbac 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -45,7 +45,7 @@ #include "amiga/bitmap.h" #include "amiga/font.h" #include "amiga/gui.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/rtg.h" #include "amiga/utf8.h" diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index 6926647c3..7c0dfd963 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -62,6 +62,7 @@ #include "amiga/font.h" #include "amiga/gui.h" #include "amiga/libs.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/print.h" #include "amiga/utf8.h" diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c index 707d7bbfa..bfafe9c88 100644 --- a/frontends/amiga/schedule.c +++ b/frontends/amiga/schedule.c @@ -30,7 +30,7 @@ #include "utils/errors.h" #include "utils/log.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/schedule.h" struct nscallback diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 429545e4f..7a49919be 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -56,7 +56,7 @@ #include "amiga/libs.h" #include "amiga/gui.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/search.h" #include "amiga/object.h" #include "amiga/theme.h" diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c index 4042d1dd0..5f44a9bab 100644 --- a/frontends/amiga/theme.c +++ b/frontends/amiga/theme.c @@ -49,7 +49,7 @@ #include "amiga/bitmap.h" #include "amiga/schedule.h" #include "amiga/theme.h" -#include "amiga/misc.h" +#include "amiga/memory.h" static struct BitMap *throbber = NULL; static struct bitmap *throbber_nsbm = NULL; diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c index 8328194ac..460eb2217 100644 --- a/frontends/amiga/tree.c +++ b/frontends/amiga/tree.c @@ -66,7 +66,7 @@ #include "amiga/tree.h" #include "amiga/file.h" #include "amiga/libs.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/utf8.h" #include "amiga/sslcert.h" #include "amiga/drag.h" /* drag icon stuff */ -- cgit v1.2.3