X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=2fa7eb148d6d32bb9e003e4da55b7180bff41375;hp=6bf5ac8600812ef6642c12ee2f5e0e1273ab3e84;hb=1446f99e3adc59d868726382a2ac7cec105372a7;hpb=b43af255d4514b68c98b23fb220306cf5ba1df60

diff --git a/audiod_command.c b/audiod_command.c
index 6bf5ac86..2fa7eb14 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <noll@mathematik.tu-darmstadt.de>
+ * Copyright (C) 2005-2007 Andre Noll <noll@mathematik.tu-darmstadt.de>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 #include "audiod_command_list.h"
 
 /** iterate over the array of all audiod commands */
-#define FOR_EACH_COMMAND(c) for (c = 0; cmds[c].name; c++)
+#define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++)
 
 static int client_write(int fd, const char *buf)
 {
@@ -141,8 +141,8 @@ static int dump_commands(int fd)
 	ssize_t ret;
 
 	FOR_EACH_COMMAND(i) {
-		tmp = make_message("%s%s\t%s\n", buf, cmds[i].name,
-			cmds[i].description);
+		tmp = make_message("%s%s\t%s\n", buf, audiod_cmds[i].name,
+			audiod_cmds[i].description);
 		free(buf);
 		buf = tmp;
 	}
@@ -168,16 +168,16 @@ int com_help(int fd, int argc, char **argv)
 		goto out;
 	}
 	FOR_EACH_COMMAND(i) {
-		if (strcmp(cmds[i].name, argv[1]))
+		if (strcmp(audiod_cmds[i].name, argv[1]))
 			continue;
 		buf = make_message(
 			"NAME\n\t%s -- %s\n"
 			"SYNOPSIS\n\tpara_audioc %s\n"
 			"DESCRIPTION\n%s\n",
 			argv[1],
-			cmds[i].description,
-			cmds[i].synopsis,
-			cmds[i].help
+			audiod_cmds[i].description,
+			audiod_cmds[i].usage,
+			audiod_cmds[i].help
 		);
 		ret = client_write(fd, buf);
 		free(buf);
@@ -432,21 +432,21 @@ int handle_connect(int accept_fd)
 		*p = '\0';
 		p++;
 	}
-	for (i = 0; cmds[i].name; i++) {
+	for (i = 0; audiod_cmds[i].name; i++) {
 		int j;
-		if (strcmp(cmds[i].name, cmd))
+		if (strcmp(audiod_cmds[i].name, cmd))
 			continue;
-		if (cmds[i].handler) {
+		if (audiod_cmds[i].handler) {
 			argc = split_args(buf, &argv, "\n");
 			PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
-			ret = cmds[i].handler(clifd, argc, argv);
+			ret = audiod_cmds[i].handler(clifd, argc, argv);
 			goto out;
 		}
 		for (j = 0; p[j]; j++)
 			if (p[j] == '\n')
 				p[j] = ' ';
 		PARA_INFO_LOG("cmd: %s, options: %s\n", cmd, p);
-		ret = cmds[i].line_handler(clifd, p);
+		ret = audiod_cmds[i].line_handler(clifd, p);
 		goto out;
 	}
 	ret = -E_INVALID_AUDIOD_CMD;