X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=b4c50dc86118a6d9f3c756f7d6b2c40a87c34ca9;hp=a225b76b83f848c5f9ec31b8a141a64d932212ee;hb=1889013e900f08d5ee842a50dc13c66689ebf15b;hpb=99daab96f932309995188ee7f7618c036994eb46

diff --git a/audiod_command.c b/audiod_command.c
index a225b76b..b4c50dc8 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -259,8 +259,7 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 			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;
@@ -280,8 +279,7 @@ out:
 
 static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
 {
-	struct filter_node *fn;
-	int i, j;
+	int i;
 
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
@@ -291,14 +289,10 @@ static struct filter_node *find_filter_node(int slot_num, int format, int filter
 			continue;
 		if (format >= 0 && s->format != format)
 			continue;
-		if (num_filters(i) < filternum)
+		if (num_filters(i) <= filternum)
 			continue;
 		/* success */
-		j = 1;
-		list_for_each_entry(fn, &s->fc->filters, node)
-			if (filternum <= 0 || j++ == filternum)
-				break;
-		return fn;
+		return  s->fc->filter_nodes + filternum;
 	}
 	return NULL;
 }
@@ -462,7 +456,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);
@@ -529,7 +523,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);