More consistent naming for font cache elements

5 files changed, 48 insertions, 44 deletions

diff --git a/amiga/font.c b/amiga/font.c
index 79f887f82..3a141ac68 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -348,9 +348,9 @@ static inline bool amiga_nsfont_split(const plot_font_style_t *fstyle,
 /**
  * Search for a font in the list and load from disk if not present
  */
-static struct ami_font_node *ami_font_open(const char *font, bool critical)
+static struct ami_font_cache_node *ami_font_open(const char *font, bool critical)
 {
-	struct ami_font_node *nodedata = ami_font_cache_locate(font);
+	struct ami_font_cache_node *nodedata = ami_font_cache_locate(font);
 	if(nodedata) return nodedata;
 
 	nodedata = ami_font_cache_alloc_entry(font);
@@ -402,8 +402,8 @@ static struct ami_font_node *ami_font_open(const char *font, bool critical)
 static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle,
 		const uint16 *codepoint)
 {
-	struct ami_font_node *node;
-	struct ami_font_node *designed_node = NULL;
+	struct ami_font_cache_node *node;
+	struct ami_font_cache_node *designed_node = NULL;
 	struct OutlineFont *ofont;
 	char *fontname;
 	ULONG ysize;
@@ -891,7 +891,7 @@ void ami_close_fonts(void)
 	ami_font_finiscanner();
 }
 
-void ami_font_close(struct ami_font_node *node)
+void ami_font_close(struct ami_font_cache_node *node)
 {
 	/* Called from FreeObjList if node type is AMINS_FONT */
 
diff --git a/amiga/font.h b/amiga/font.h
index 375e15032..98b0a0c74 100755
--- a/amiga/font.h
+++ b/amiga/font.h
@@ -23,14 +23,14 @@
 #include <graphics/rastport.h>
 #include <graphics/text.h>
 
-struct ami_font_node;
+struct ami_font_cache_node;
 
 ULONG ami_font_unicode_text(struct RastPort *rp, const char *string,
 	ULONG length, const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa);
 void ami_font_setdevicedpi(int id);
 void ami_init_fonts(void);
 void ami_close_fonts(void);
-void ami_font_close(struct ami_font_node *node);
+void ami_font_close(struct ami_font_cache_node *node);
 
 /* Alternate entry points into font_scan */
 void ami_font_initscanner(bool force, bool save);
diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c
index 65d21936e..98dd4c938 100644
--- a/amiga/font_bitmap.c
+++ b/amiga/font_bitmap.c
@@ -37,6 +37,7 @@
 #include "desktop/gui_window.h"
 
 #include "amiga/font.h"
+#include "amiga/font_cache.h"
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
 
diff --git a/amiga/font_cache.c b/amiga/font_cache.c
index 4b81aabe1..5814f835f 100644
--- a/amiga/font_cache.c
+++ b/amiga/font_cache.c
@@ -34,10 +34,10 @@
 #endif
 
 #ifdef __amigaos4__
-static struct SkipList *ami_font_list = NULL;
+static struct SkipList *ami_font_cache_list = NULL;
 static struct Hook ami_font_cache_hook;
 #else
-static struct MinList *ami_font_list = NULL;
+static struct MinList *ami_font_cache_list = NULL;
 #endif
 
 
@@ -52,17 +52,17 @@ static LONG ami_font_cache_sort(struct Hook *hook, APTR key1, APTR key2)
 #endif
 
 #ifdef __amigaos4__
-static void ami_font_cleanup(struct SkipList *skiplist)
+static void ami_font_cache_cleanup(struct SkipList *skiplist)
 {
-	struct ami_font_node *node;
-	struct ami_font_node *nnode;
+	struct ami_font_cache_node *node;
+	struct ami_font_cache_node *nnode;
 	struct TimeVal curtime;
 
-	node = (struct ami_font_node *)GetFirstSkipNode(skiplist);
+	node = (struct ami_font_cache_node *)GetFirstSkipNode(skiplist);
 	if(node == NULL) return;
 
 	do {
-		nnode = (struct ami_font_node *)GetNextSkipNode(skiplist, (struct SkipNode *)node);
+		nnode = (struct ami_font_cache_node *)GetNextSkipNode(skiplist, (struct SkipNode *)node);
 		GetSysTime(&curtime);
 		SubTime(&curtime, &node->lastused);
 		if(curtime.Seconds > 300)
@@ -74,19 +74,19 @@ static void ami_font_cleanup(struct SkipList *skiplist)
 	} while((node = nnode));
 
 	/* reschedule to run in five minutes */
-	ami_schedule(300000, (void *)ami_font_cleanup, ami_font_list);
+	ami_schedule(300000, (void *)ami_font_cache_cleanup, ami_font_cache_list);
 }
 #else
-static void ami_font_cleanup(struct MinList *ami_font_list)
+static void ami_font_cache_cleanup(struct MinList *ami_font_cache_list)
 {
 	struct nsObject *node;
 	struct nsObject *nnode;
-	struct ami_font_node *fnode;
+	struct ami_font_cache_node *fnode;
 	struct TimeVal curtime;
 
-	if(IsMinListEmpty(ami_font_list)) return;
+	if(IsMinListEmpty(ami_font_cache_list)) return;
 
-	node = (struct nsObject *)GetHead((struct List *)ami_font_list);
+	node = (struct nsObject *)GetHead((struct List *)ami_font_cache_list);
 
 	do
 	{
@@ -102,17 +102,17 @@ static void ami_font_cleanup(struct MinList *ami_font_list)
 	} while((node=nnode));
 
 	/* reschedule to run in five minutes */
-	ami_schedule(300000, (void *)ami_font_cleanup, ami_font_list);
+	ami_schedule(300000, (void *)ami_font_cache_cleanup, ami_font_cache_list);
 }
 #endif
 
 #ifdef __amigaos4__
-static void ami_font_del_skiplist(struct SkipList *skiplist)
+static void ami_font_cache_del_skiplist(struct SkipList *skiplist)
 {
-	struct ami_font_node *node;
+	struct ami_font_cache_node *node;
 	struct SkipNode *nnode;
 
-	node = (struct ami_font_node *)GetFirstSkipNode(skiplist);
+	node = (struct ami_font_cache_node *)GetFirstSkipNode(skiplist);
 	if(node == NULL) return;
 
 	do {
@@ -126,16 +126,16 @@ static void ami_font_del_skiplist(struct SkipList *skiplist)
 #endif
 
 
-struct ami_font_node *ami_font_cache_locate(const char *font)
+struct ami_font_cache_node *ami_font_cache_locate(const char *font)
 {
-	struct ami_font_node *nodedata;
+	struct ami_font_cache_node *nodedata;
 	uint32 hash = 0;
 
 #ifdef __amigaos4__
 	hash = XXH32(font, strlen(font), 0);
-	nodedata = (struct ami_font_node *)FindSkipNode(ami_font_list, (APTR)hash);		
+	nodedata = (struct ami_font_cache_node *)FindSkipNode(ami_font_cache_list, (APTR)hash);		
 #else
-	struct nsObject *node = (struct nsObject *)FindIName((struct List *)ami_font_list, font);
+	struct nsObject *node = (struct nsObject *)FindIName((struct List *)ami_font_cache_list, font);
 	if(node) nodedata = node->objstruct;
 #endif
 
@@ -148,15 +148,15 @@ struct ami_font_node *ami_font_cache_locate(const char *font)
 	return NULL;
 }
 
-struct ami_font_node *ami_font_cache_alloc_entry(const char *font)
+struct ami_font_cache_node *ami_font_cache_alloc_entry(const char *font)
 {
-	struct ami_font_node *nodedata;
+	struct ami_font_cache_node *nodedata;
 
 #ifdef __amigaos4__
 	uint32 hash = XXH32(font, strlen(font), 0);
-	nodedata = (struct ami_font_node *)InsertSkipNode(ami_font_list, (APTR)hash, sizeof(struct ami_font_node));
+	nodedata = (struct ami_font_cache_node *)InsertSkipNode(ami_font_cache_list, (APTR)hash, sizeof(struct ami_font_cache_node));
 #else
-	nodedata = AllocVecTagList(sizeof(struct ami_font_node), NULL);
+	nodedata = AllocVecTagList(sizeof(struct ami_font_cache_node), NULL);
 #endif
 
 	GetSysTime(&nodedata->lastused);
@@ -164,10 +164,10 @@ struct ami_font_node *ami_font_cache_alloc_entry(const char *font)
 	return nodedata;
 }
 
-void ami_font_cache_insert(struct ami_font_node *nodedata, const char *font)
+void ami_font_cache_insert(struct ami_font_cache_node *nodedata, const char *font)
 {
 #ifndef __amigaos4__
-	struct nsObject *node = AddObject(ami_font_list, AMINS_FONT);
+	struct nsObject *node = AddObject(ami_font_cache_list, AMINS_FONT);
 	if(node) {
 		node->objstruct = nodedata;
 		node->dtz_Node.ln_Name = strdup(font);
@@ -178,13 +178,13 @@ void ami_font_cache_insert(struct ami_font_node *nodedata, const char *font)
 void ami_font_cache_fini(void)
 {
 	LOG("Cleaning up font cache");
-	ami_schedule(-1, (void *)ami_font_cleanup, ami_font_list);
+	ami_schedule(-1, (void *)ami_font_cache_cleanup, ami_font_cache_list);
 #ifdef __amigaos4__
-	ami_font_del_skiplist(ami_font_list);
+	ami_font_cache_del_skiplist(ami_font_cache_list);
 #else
-	FreeObjList(ami_font_list);
+	FreeObjList(ami_font_cache_list);
 #endif
-	ami_font_list = NULL;
+	ami_font_cache_list = NULL;
 }
 
 void ami_font_cache_init(void)
@@ -192,12 +192,12 @@ void ami_font_cache_init(void)
 #ifdef __amigaos4__
 	ami_font_cache_hook.h_Entry = (HOOKFUNC)ami_font_cache_sort;
 	ami_font_cache_hook.h_Data = 0;
-	ami_font_list = CreateSkipList(&ami_font_cache_hook, 8);
+	ami_font_cache_list = CreateSkipList(&ami_font_cache_hook, 8);
 #else
-	ami_font_list = NewObjList();
+	ami_font_cache_list = NewObjList();
 #endif
 
 	/* run first cleanup in ten minutes */
-	ami_schedule(600000, (void *)ami_font_cleanup, ami_font_list);
+	ami_schedule(600000, (void *)ami_font_cache_cleanup, ami_font_cache_list);
 }
 
diff --git a/amiga/font_cache.h b/amiga/font_cache.h
index bb462bcfa..813b67dd1 100644
--- a/amiga/font_cache.h
+++ b/amiga/font_cache.h
@@ -18,7 +18,7 @@
 
 #ifndef AMIGA_FONT_CACHE_H
 #define AMIGA_FONT_CACHE_H
-struct ami_font_node
+struct ami_font_cache_node
 {
 #ifdef __amigaos4__
 	struct SkipNode skip_node;
@@ -32,15 +32,18 @@ struct ami_font_node
 
 
 /* locate an entry in the font cache, NULL if not found */
-struct ami_font_node *ami_font_cache_locate(const char *font);
+struct ami_font_cache_node *ami_font_cache_locate(const char *font);
 
 /* allocate a cache entry */
-struct ami_font_node *ami_font_cache_alloc_entry(const char *font);
+struct ami_font_cache_node *ami_font_cache_alloc_entry(const char *font);
 
 /* insert a cache entry into the list (OS3) */
-void ami_font_cache_insert(struct ami_font_node *nodedata, const char *font);
+void ami_font_cache_insert(struct ami_font_cache_node *nodedata, const char *font);
 
+/* initialise the cache */
 void ami_font_cache_init(void);
+
+/* cache clean-up */
 void ami_font_cache_fini(void);
 
 #endif