From daf868394fb65a6501472a99f0ec9e03a891558f Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 4 Oct 2007 13:51:57 +0000
Subject: __rc_service_daemon_set is now a private function

---
 src/librc-daemon.c      | 10 +++++-----
 src/librc.h             |  4 +++-
 src/rc.h                | 10 ----------
 src/rc.map              |  5 ++++-
 src/start-stop-daemon.c |  5 +++--
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/librc-daemon.c b/src/librc-daemon.c
index b1734f67..7e20ab0f 100644
--- a/src/librc-daemon.c
+++ b/src/librc-daemon.c
@@ -148,7 +148,7 @@ pid_t *rc_find_pids (const char *exec, const char *cmd,
 librc_hidden_def(rc_find_pids)
 
 #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
-	defined(__NetBSD__) || defined(__OpenBSD__)
+		defined(__NetBSD__) || defined(__OpenBSD__)
 
 # if defined(__DragonFly__) || defined(__FreeBSD__)
 #  ifndef KERN_PROC_PROC
@@ -283,9 +283,9 @@ static bool _match_daemon (const char *path, const char *file,
 	return (m == 111 ? true : false);
 }
 
-void rc_service_daemon_set (const char *service, const char *exec,
-							const char *name, const char *pidfile,
-							bool started)
+void __rc_service_daemon_set (const char *service, const char *exec,
+							  const char *name, const char *pidfile,
+							  bool started)
 {
 	char *svc = rc_xstrdup (service);
 	char *dirpath = rc_strcatpaths (RC_SVCDIR, "daemons", basename (svc),
@@ -368,7 +368,7 @@ void rc_service_daemon_set (const char *service, const char *exec,
 	free (mpidfile);
 	free (dirpath);
 }
-librc_hidden_def(rc_service_daemon_set)
+librc_hidden_def(__rc_service_daemon_set)
 
 bool rc_service_started_daemon (const char *service, const char *exec,
 								int indx)
diff --git a/src/librc.h b/src/librc.h
index efed97f2..d9d30d02 100644
--- a/src/librc.h
+++ b/src/librc.h
@@ -42,6 +42,7 @@
 #include <kvm.h>
 #endif
 
+#include "librc-daemon.h"
 #include "librc-depend.h"
 #include "rc.h"
 #include "rc-misc.h"
@@ -79,7 +80,6 @@ librc_hidden_proto(rc_runlevel_starting)
 librc_hidden_proto(rc_runlevel_stopping)
 librc_hidden_proto(rc_service_add)
 librc_hidden_proto(rc_service_daemons_crashed)
-librc_hidden_proto(rc_service_daemon_set)
 librc_hidden_proto(rc_service_delete)
 librc_hidden_proto(rc_service_description)
 librc_hidden_proto(rc_service_exists)
@@ -116,4 +116,6 @@ librc_hidden_proto(rc_xmalloc)
 librc_hidden_proto(rc_xrealloc)
 librc_hidden_proto(rc_xstrdup)
 
+librc_hidden_proto(__rc_service_daemon_set)
+
 #endif
diff --git a/src/rc.h b/src/rc.h
index 6f8b7f56..fe2447de 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -93,16 +93,6 @@ bool rc_service_add (const char *runlevel, const char *service);
  * @return true if sucessful, otherwise false */
 bool rc_service_delete (const char *runlevel, const char *service);
 
-/*! Save the arguments to find a running daemon
- * @param service to save arguments for
- * @param exec that we started
- * @param name of the process (optional)
- * @param pidfile of the process (optional)
- * @param started if true, add the arguments otherwise remove existing matching arguments */
-void rc_service_daemon_set (const char *service, const char *exec,
-							const char *name, const char *pidfile,
-							bool started);
-
 /*! Returns a description of what the service and/or option does.
  * @param service to check
  * @param option to check (if NULL, service description)
diff --git a/src/rc.map b/src/rc.map
index 917f40c5..ce83e34d 100644
--- a/src/rc.map
+++ b/src/rc.map
@@ -29,7 +29,6 @@ global:
 	rc_runlevel_stopping;
 	rc_service_add;
 	rc_service_daemons_crashed;
-	rc_service_daemon_set;
 	rc_service_delete;
 	rc_service_description;
 	rc_service_exists;
@@ -69,3 +68,7 @@ global:
 local:
 	*;
 };
+
+RC_PRIVATE {
+	__rc_service_daemon_set;
+};
diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
index 8fdcaa33..f37351f3 100644
--- a/src/start-stop-daemon.c
+++ b/src/start-stop-daemon.c
@@ -46,6 +46,7 @@ static struct pam_conv conv = { NULL, NULL} ;
 
 #include "builtins.h"
 #include "einfo.h"
+#include "librc-daemon.h"
 #include "rc.h"
 #include "rc-misc.h"
 #include "strlist.h"
@@ -758,7 +759,7 @@ int start_stop_daemon (int argc, char **argv)
 			unlink (pidfile);
 
 		if (svcname)
-			rc_service_daemon_set (svcname, exec, cmd, pidfile, false);
+			__rc_service_daemon_set (svcname, exec, cmd, pidfile, false);
 
 		exit (EXIT_SUCCESS);
 	}
@@ -1032,7 +1033,7 @@ int start_stop_daemon (int argc, char **argv)
 	}
 
 	if (svcname)
-		rc_service_daemon_set (svcname, exec, cmd, pidfile, true);
+		__rc_service_daemon_set (svcname, exec, cmd, pidfile, true);
 
 	exit (EXIT_SUCCESS);
 }
-- 
cgit v1.2.3