X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=875e4551242615b1b7780664b98517b5029d8a5f;hp=ea8c1a582f3301e08ca34798935adce5f5357228;hb=9f021e58c181e2cd2e1e245fcd7b84f33ad50f9d;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;ds=sidebyside

diff --git a/audiod_command.c b/audiod_command.c
index ea8c1a58..875e4551 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,13 +1,15 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod_command.c commands for para_audiod */
 
-#include "para.h"
+#include <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "close_on_fork.h"
@@ -68,7 +70,7 @@ static char *get_time_string(struct timeval *newest_stime)
 		total = 0;
 out:
 	return make_message(
-		"%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
+		"%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
 		status_item_list[SI_PLAY_TIME],
 		use_server_time? "~" : "",
 		total / 60,
@@ -86,7 +88,7 @@ __malloc static char *audiod_status_string(void)
 {
 	const char *status = (audiod_status == AUDIOD_ON)?
 		"on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
-	return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
+	return make_message("%s: %s\n", status_item_list[SI_AUDIOD_STATUS], status);
 }
 
 static struct timeval *wstime(void)
@@ -118,7 +120,7 @@ __malloc static char *decoder_flags(void)
 		flags[i] = flag;
 	}
 	flags[MAX_STREAM_SLOTS] = '\0';
-	return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
+	return make_message("%s: %s\n", status_item_list[SI_DECODER_FLAGS],
 		flags);
 }
 
@@ -235,7 +237,7 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 	}
 	if (mask & (1 << SI_AUDIOD_UPTIME)) {
 		char *tmp, *us = uptime_str();
-		tmp = make_message("%s:%s\n",
+		tmp = make_message("%s: %s\n",
 			status_item_list[SI_AUDIOD_UPTIME], us);
 		free(us);
 		ret = client_write(fd, tmp);
@@ -251,14 +253,13 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 		free(s);
 	}
 	if (mask & (1 << SI_DECODER_FLAGS)) {
-		char *df =decoder_flags();
+		char *df = decoder_flags();
 		ret = client_write(fd, df);
 		if (ret < 0)
 			goto out;
 		free(df);
 	}
-
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
+	FOR_EACH_STATUS_ITEM(i) {
 		char *tmp, *v;
 		if (!((1 << i) & mask))
 			continue;
@@ -460,7 +461,7 @@ out:
 	free(buf);
 	free(argv);
 	if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
-		char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+		char *tmp = make_message("%s\n", para_strerror(-ret));
 		client_write(clifd, tmp);
 		free(tmp);
 		close(clifd);
@@ -490,7 +491,7 @@ void audiod_status_dump(void)
 	old = stat_task->stat_item_values[SI_AUDIOD_UPTIME];
 	if (!old || strcmp(old, new)) {
 		free(old);
-		tmp = make_message("%s:%s\n",
+		tmp = make_message("%s: %s\n",
 			status_item_list[SI_AUDIOD_UPTIME], new);
 		stat_client_write(tmp, SI_AUDIOD_UPTIME);
 		free(tmp);
@@ -527,7 +528,7 @@ void dump_empty_status(void)
 {
 	int i;
 
-	FOR_EACH_STAT_ITEM(i) {
+	FOR_EACH_STATUS_ITEM(i) {
 		char *tmp = make_message("%s:\n", status_item_list[i]);
 		stat_client_write(tmp, i);
 		free(tmp);