X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=855e5cea102e51076b50ad345d014096d9c08e4a;hp=d424cf2e76f32ca90058685b68186b5a00be6a2b;hb=14960ed632ff6a07e5d4ae4a6b02f0f1da19a5b9;hpb=3689799ede7bba230ca544ac953392b428c3d662

diff --git a/audiod_command.c b/audiod_command.c
index d424cf2e..855e5cea 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -70,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,
@@ -88,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)
@@ -120,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);
 }
 
@@ -237,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);
@@ -253,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;
@@ -492,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);
@@ -529,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);