X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=df8f3936faf89a2c5b5550901d2e6e9bcf12ebdb;hp=56d922e6681e66d0d9c4f65df86569806a38ca80;hb=d1e7875caba9aface190dab0de394435a80edd21;hpb=d15d8509bcb56d6a40f2709c28cc6c9cc1f6739a

diff --git a/audiod_command.c b/audiod_command.c
index 56d922e6..df8f3936 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,7 @@
 #include "write.h"
 #include "fd.h"
 #include "version.h"
-#include "audiod_command_list.h"
+#include "audiod.command_list.h"
 
 extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
@@ -376,10 +376,10 @@ static int com_grab(int fd, int argc, char **argv)
 	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
-	clean_exit(EXIT_SUCCESS, "terminating on user request");
+	return -E_AUDIOD_TERM;
 }
 
 static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
@@ -527,7 +527,7 @@ void audiod_status_dump(bool force)
 			free(new);
 	}
 
-	new = get_server_uptime_str(now);
+	new = daemon_get_uptime_str(now);
 	old = stat_item_values[SI_AUDIOD_UPTIME];
 	if (force || !old || strcmp(old, new)) {
 		free(old);