From 38cb39339a8f1f9a0afb69340a404fd767db5a79 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 16 Jan 2014 00:01:25 +0000
Subject: move filename_from_path and path_add_part into gui operation tables

---
 amiga/gui.c  | 29 +++++++++++++++++++++++++++++
 amiga/misc.c | 27 ---------------------------
 2 files changed, 29 insertions(+), 27 deletions(-)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 27e747a05..d651ef11e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -209,6 +209,33 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy);
 		nsoptions[NSOPTION_##OPTION].value.i = VALUE;	\
 	nsoptions_default[NSOPTION_##OPTION].value.i = VALUE
 
+/**
+ * Return the filename part of a full path
+ *
+ * \param path full path and filename
+ * \return filename (will be freed with free())
+ */
+
+static char *filename_from_path(char *path)
+{
+	return strdup(FilePart(path));
+}
+
+/**
+ * Add a path component/filename to an existing path
+ *
+ * \param path buffer containing path + free space
+ * \param length length of buffer "path"
+ * \param newpart string containing path component to add to path
+ * \return true on success
+ */
+
+static bool path_add_part(char *path, int length, const char *newpart)
+{
+	if(AddPart(path, newpart, length)) return true;
+		else return false;
+}
+
 STRPTR ami_locale_langs(void)
 {
 	struct Locale *locale;
@@ -5130,6 +5157,8 @@ static struct gui_browser_table amiga_browser_table = {
 	.launch_url = gui_launch_url,
 	.create_form_select_menu = gui_create_form_select_menu,
 	.cert_verify = gui_cert_verify,
+	.filename_from_path = filename_from_path,
+	.path_add_part = path_add_part,
 };
 
 /** Normal entry point from OS */
diff --git a/amiga/misc.c b/amiga/misc.c
index 003a5fb6e..ac9d2453e 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -172,33 +172,6 @@ char *path_to_url(const char *path)
 	return r;
 }
 
-/**
- * Return the filename part of a full path
- *
- * \param path full path and filename
- * \return filename (will be freed with free())
- */
-
-char *filename_from_path(char *path)
-{
-	return strdup(FilePart(path));
-}
-
-/**
- * Add a path component/filename to an existing path
- *
- * \param path buffer containing path + free space
- * \param length length of buffer "path"
- * \param newpart string containing path component to add to path
- * \return true on success
- */
-
-bool path_add_part(char *path, int length, const char *newpart)
-{
-	if(AddPart(path, newpart, length)) return true;
-		else return false;
-}
-
 /**
  * returns a string with escape chars translated.
  * (based on remove_underscores from utils.c)
-- 
cgit v1.2.3