X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=d2a58bbe2a22dd2462e554a3dc9f0c3ca136e98a;hb=eec23a69;hp=687fc5c29107ea2443f25c76562f60488d8aac96;hpb=cd5f0aa2b06b227f519600705fdde2a13f03424d;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 687fc5c2..d2a58bbe 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1069,27 +1069,6 @@ static void close_stat_pipe(void)
 	audiod_status_dump();
 }
 
-/**
- * close the connection to para_server and exit
- *
- * \param status the exit status which is passed to exit(3)
- * \param msg the log message
- *
- * Log \a msg with loglevel \p EMERG, close the connection to para_server if
- * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or
- * EXIT_FAILURE.
- *
- * \sa exit(3)
- */
-void __noreturn clean_exit(int status, const char *msg)
-{
-	PARA_EMERG_LOG("%s\n", msg);
-	if (socket_name)
-		unlink(socket_name);
-	close_stat_pipe();
-	exit(status);
-}
-
 /* avoid busy loop if server is down */
 static void set_stat_task_restart_barrier(unsigned seconds)
 {
@@ -1121,20 +1100,49 @@ static bool must_close_slot(int slot_num)
 	return true;
 }
 
+static void close_slot(int slot_num)
+{
+	struct slot_info *s = slot + slot_num;
+
+	PARA_INFO_LOG("closing slot %d\n", slot_num);
+	close_writers(s);
+	close_filters(s);
+	close_receiver(slot_num);
+	clear_slot(slot_num);
+}
+
 static void close_unused_slots(void)
 {
 	int i;
 
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = slot + i;
-		if (!must_close_slot(i))
-			continue;
-		PARA_INFO_LOG("closing slot %d\n", i);
-		close_writers(s);
-		close_filters(s);
-		close_receiver(i);
-		clear_slot(i);
-	}
+	FOR_EACH_SLOT(i)
+		if (must_close_slot(i))
+			close_slot(i);
+}
+
+/**
+ * Close the connection to para_server and exit.
+ *
+ * \param status The exit status which is passed to exit(3).
+ * \param msg The log message
+ *
+ * Log \a msg with loglevel \p EMERG, close the connection to para_server and
+ * all slots, and call \p exit(status). \a status should be either EXIT_SUCCESS
+ * or EXIT_FAILURE.
+ *
+ * \sa exit(3).
+ */
+void __noreturn clean_exit(int status, const char *msg)
+{
+	int i;
+
+	PARA_EMERG_LOG("%s\n", msg);
+	if (socket_name)
+		unlink(socket_name);
+	close_stat_pipe();
+	FOR_EACH_SLOT(i)
+		close_slot(i);
+	exit(status);
 }
 
 /*