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

---
 monkey/main.c  | 41 +++++++++++++++++++++++++++++++++++++++++
 monkey/utils.c | 38 --------------------------------------
 2 files changed, 41 insertions(+), 38 deletions(-)

(limited to 'monkey')

diff --git a/monkey/main.c b/monkey/main.c
index 22aaf1e06..1922393a8 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -114,12 +114,53 @@ static bool nslog_stream_configure(FILE *fptr)
   return true;
 }
 
+/**
+ * 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)
+{
+	char *leafname;
+
+	leafname = strrchr(path, '/');
+	if (!leafname)
+		leafname = path;
+	else
+		leafname += 1;
+
+	return strdup(leafname);
+}
+
+/**
+ * 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(path[strlen(path) - 1] != '/')
+		strncat(path, "/", length);
+
+	strncat(path, newpart, length);
+
+	return true;
+}
+
 static struct gui_browser_table monkey_browser_table = {
   .poll = monkey_poll,
   .quit = monkey_quit,
   .get_resource_url = gui_get_resource_url,
   .launch_url = gui_launch_url,
   .cert_verify = gui_cert_verify,
+  .filename_from_path = filename_from_path,
+  .path_add_part = path_add_part,
 };
 
 int
diff --git a/monkey/utils.c b/monkey/utils.c
index 3e09106f7..aa7245533 100644
--- a/monkey/utils.c
+++ b/monkey/utils.c
@@ -70,44 +70,6 @@ char *url_to_path(const char *url)
 	return respath;
 }
 
-/**
- * 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)
-{
-	char *leafname;
-
-	leafname = strrchr(path, '/');
-	if (!leafname)
-		leafname = path;
-	else
-		leafname += 1;
-
-	return strdup(leafname);
-}
-
-/**
- * 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(path[strlen(path) - 1] != '/')
-		strncat(path, "/", length);
-
-	strncat(path, newpart, length);
-
-	return true;
-}
 
 void warn_user(const char *warning, const char *detail)
 {
-- 
cgit v1.2.3