X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=3b92be657bd28b49ca690923583d2b42cb5dd770;hb=7062b8a307355422f2c69b44b65f23eab17ce15d;hp=030289af8444ac35baddb8e10b30712a542768c9;hpb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf;p=paraslash.git

diff --git a/command.c b/command.c
index 030289af..3b92be65 100644
--- a/command.c
+++ b/command.c
@@ -44,7 +44,7 @@ static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
-extern struct audio_file_selector dblist[];
+extern struct audio_file_selector selectors[];
 extern struct audio_format afl[];
 extern struct sender senders[];
 extern char *user_list;
@@ -426,7 +426,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
 		status_item_list[SI_STATUS], status,
 		status_item_list[SI_STATUS_FLAGS], flags,
-		status_item_list[SI_SELECTOR], dblist[nmmd->selector_num].name,
+		status_item_list[SI_SELECTOR], selectors[nmmd->selector_num].name,
 
 		status_item_list[SI_OFFSET], offset,
 		status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
@@ -559,15 +559,15 @@ static int com_si(int fd, int argc, __unused char **argv)
 {
 	int i, ret;
 	char *ut;
-	char *selectors = NULL, *sender_info = NULL, *sender_list = NULL;
+	char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
 	struct mallinfo mi = mallinfo();
 
 	if (argc)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
-	for (i = 0; dblist[i].name; i++) {
-		selectors = para_strcat(selectors, dblist[i].name);
-		selectors = para_strcat(selectors, " ");
+	for (i = 0; selectors[i].name; i++) {
+		selector_string = para_strcat(selector_string, selectors[i].name);
+		selector_string = para_strcat(selector_string, " ");
 	}
 	for (i = 0; senders[i].name; i++) {
 		char *info = senders[i].info();
@@ -593,14 +593,14 @@ static int com_si(int fd, int argc, __unused char **argv)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		selectors,
+		selector_string,
 		SUPPORTED_AUDIO_FORMATS,
 		sender_list,
 		sender_info
 	);
 	mmd_unlock();
 	free(ut);
-	free(selectors);
+	free(selector_string);
 	free(sender_list);
 	free(sender_info);
 	return ret;
@@ -735,8 +735,8 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
 	mmd_lock();
 	if (handler)
 		*handler = make_message("the %s selector",
-			dblist[mmd->selector_num].name);
-	cmd = dblist[mmd->selector_num].cmd_list;
+			selectors[mmd->selector_num].name);
+	cmd = selectors[mmd->selector_num].cmd_list;
 	mmd_unlock();
 	for (; cmd->name; cmd++)
 		if (!strcmp(cmd->name, name))
@@ -756,8 +756,8 @@ static int com_help(int fd, int argc, char **argv)
 		if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
 			return ret;
 		mmd_lock();
-		handler = para_strdup(dblist[mmd->selector_num].name);
-		cmd = dblist[mmd->selector_num].cmd_list;
+		handler = para_strdup(selectors[mmd->selector_num].name);
+		cmd = selectors[mmd->selector_num].cmd_list;
 		mmd_unlock();
 		ret = send_description(fd, cmd, handler, 0);
 		free(handler);
@@ -855,14 +855,14 @@ static int com_chs(int fd, int argc, char **argv)
 	if (!argc) {
 		char *selector;
 		mmd_lock();
-		selector = para_strdup(dblist[mmd->selector_num].name);
+		selector = para_strdup(selectors[mmd->selector_num].name);
 		mmd_unlock();
 		ret = send_va_buffer(fd, "%s\n", selector);
 		free(selector);
 		return ret;
 	}
-	for (i = 0; dblist[i].name; i++) {
-		if (strcmp(dblist[i].name, argv[1]))
+	for (i = 0; selectors[i].name; i++) {
+		if (strcmp(selectors[i].name, argv[1]))
 			continue;
 		mmd_lock();
 		mmd->selector_change = i;