X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=9d473019c009f20f5c6f1e4b517712c8a254d49f;hb=3e514007f72825597eaf68ff33339a8eb0ad420b;hp=0fc385e980bff69f9ac7ead244ff514b2419644f;hpb=b2917b2a0a68f84da34e7435ad697d798a0260da;p=paraslash.git

diff --git a/command.c b/command.c
index 0fc385e9..9d473019 100644
--- a/command.c
+++ b/command.c
@@ -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_DBTOOL], dblist[nmmd->dbt_num].name,
+		status_item_list[SI_SELECTOR], dblist[nmmd->dbt_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 *dbtools = NULL, *sender_info = NULL, *sender_list = NULL;
+	char *selectors = 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++) {
-		dbtools = para_strcat(dbtools, dblist[i].name);
-		dbtools = para_strcat(dbtools, " ");
+		selectors = para_strcat(selectors, dblist[i].name);
+		selectors = para_strcat(selectors, " ");
 	}
 	for (i = 0; senders[i].name; i++) {
 		char *info = senders[i].info();
@@ -582,7 +582,7 @@ static int com_si(int fd, int argc, __unused char **argv)
 		"mallinfo: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
 		"current loglevel: %i\n"
-		"supported database tools: %s\n"
+		"supported audio file selectors: %s\n"
 		"supported audio formats: %s\n"
 		"supported senders: %s\n"
 		"%s",
@@ -593,14 +593,14 @@ static int com_si(int fd, int argc, __unused char **argv)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		dbtools,
+		selectors,
 		SUPPORTED_AUDIO_FORMATS,
 		sender_list,
 		sender_info
 	);
 	mmd_unlock();
 	free(ut);
-	free(dbtools);
+	free(selectors);
 	free(sender_list);
 	free(sender_info);
 	return ret;
@@ -735,7 +735,7 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
 	/* not found, look for commands supported by the current selector */
 	mmd_lock();
 	if (handler)
-		*handler = make_message("the %s database tool", dblist[mmd->dbt_num].name);
+		*handler = make_message("the %s selector", dblist[mmd->dbt_num].name);
 	cmd = dblist[mmd->dbt_num].cmd_list;
 	mmd_unlock();
 	for (; cmd->name; cmd++)
@@ -853,12 +853,12 @@ static int com_chs(int fd, int argc, char **argv)
 	int i, ret;
 
 	if (!argc) {
-		char *dbtool;
+		char *selector;
 		mmd_lock();
-		dbtool = para_strdup(dblist[mmd->dbt_num].name);
+		selector = para_strdup(dblist[mmd->dbt_num].name);
 		mmd_unlock();
-		ret = send_va_buffer(fd, "%s\n", dbtool);
-		free(dbtool);
+		ret = send_va_buffer(fd, "%s\n", selector);
+		free(selector);
 		return ret;
 	}
 	for (i = 0; dblist[i].name; i++) {
@@ -870,7 +870,7 @@ static int com_chs(int fd, int argc, char **argv)
 		mmd_unlock();
 		return 1;
 	}
-	return -E_BAD_DBTOOL;
+	return -E_BAD_SELECTOR;
 }
 
 /* next */