X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=3879c0d8c81e1235298aa74b923a7ef968160b24;hp=05002f4eff228e0200d5d6cdce9be0c697ed3bc3;hb=823a4ff87a03ff9e1d2bfe8bc501f55ee4213649;hpb=56df9bb38aa4725f9244a7898d765608d8a1fffa

diff --git a/daemon.c b/daemon.c
index 05002f4e..3879c0d8 100644
--- a/daemon.c
+++ b/daemon.c
@@ -229,7 +229,7 @@ void daemon_open_log_or_die(void)
 /**
  * Log the startup message containing the paraslash version.
  */
-void log_welcome(const char *whoami)
+void daemon_log_welcome(const char *whoami)
 {
 	PARA_INFO_LOG("welcome to %s " PACKAGE_VERSION " ("BUILD_DATE")\n",
 		whoami);
@@ -249,7 +249,7 @@ void log_welcome(const char *whoami)
  *
  * \sa getpwnam(3), getuid(2), setuid(2), getgrnam(2), setgid(2)
  */
-void drop_privileges_or_die(const char *username, const char *groupname)
+void daemon_drop_privileges_or_die(const char *username, const char *groupname)
 {
 	struct passwd *p;
 	char *tmp;
@@ -290,27 +290,20 @@ void drop_privileges_or_die(const char *username, const char *groupname)
 }
 
 /**
- * Set the server startup time.
+ * Set the startup time.
  *
- * \param startuptime The value to store as the server start time.
+ * This should be called once on startup. It sets the start time to the
+ * current time. The stored time is used for retrieving the server uptime.
  *
- * This should be called once on startup with \a startuptime either NULL or a
- * pointer to a struct timeval which contains the current time. If \a
- * startuptime is NULL, the server start time is set to the current time.
- *
- * \sa time(2), difftime(3) \ref get_server_uptime(), \ref
- * get_server_uptime_str().
+ * \sa time(2), \ref daemon_get_uptime(), \ref daemon_get_uptime_str().
  */
-void set_server_start_time(const struct timeval *startuptime)
+void daemon_set_start_time(void)
 {
-	if (startuptime)
-		me->startuptime = startuptime->tv_sec;
-	else
-		time(&me->startuptime);
+	time(&me->startuptime);
 }
 
 /**
- * Get the server uptime.
+ * Get the uptime.
  *
  * \param current_time The current time.
  *
@@ -319,9 +312,9 @@ void set_server_start_time(const struct timeval *startuptime)
  *
  * \return This returns the server uptime in seconds, i.e. the difference
  * between the current time and the value stored previously via \ref
- * set_server_start_time().
+ * daemon_set_start_time().
  */
-time_t get_server_uptime(const struct timeval *current_time)
+time_t daemon_get_uptime(const struct timeval *current_time)
 {
 	time_t t;
 
@@ -334,15 +327,15 @@ time_t get_server_uptime(const struct timeval *current_time)
 /**
  * Construct a string containing the current uptime.
  *
- * \param current_time See a \ref get_server_uptime().
+ * \param current_time See a \ref daemon_get_uptime().
  *
  * \return A dynamically allocated string of the form "days:hours:minutes".
  *
  * \sa server_uptime.
  */
-__malloc char *get_server_uptime_str(const struct timeval *current_time)
+__malloc char *daemon_get_uptime_str(const struct timeval *current_time)
 {
-	long t = get_server_uptime(current_time);
+	long t = daemon_get_uptime(current_time);
 	return make_message("%li:%02li:%02li", t / 86400,
 		(t / 3600) % 24, (t / 60) % 60);
 }