Some more (trivial) "database tool" -> "audio file selector" conversions

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 6bee5dd55692307a56ccdc1d4df09a12d5ff9752..9d473019c009f20f5c6f1e4b517712c8a254d49f 100644 (file)
--- 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 dbtool dblist[];
+extern struct audio_file_selector dblist[];
 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_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 */