kill a macro which is only used once.

[paraslash.git] / mysql_selector.c

diff --git a/mysql_selector.c b/mysql_selector.c
index 85d16ee200dc9c7bf032aac790894dabee5a710f..9f5a14f39854831faa238e8cb3d6363cb8d4f93d 100644 (file)
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -93,7 +93,7 @@ static struct server_command cmds[] = {
 
 "\tCreate database name containing the initial columns for basic\n"
 "\tinteroperation with server. This command has to be used only once\n"
 
 "\tCreate database name containing the initial columns for basic\n"
 "\tinteroperation with server. This command has to be used only once\n"

-"\twhen you use the mysql database tool for the very first time.\n"
+"\twhen you use the mysql audio file selector for the very first time.\n"

 "\n"
 "\tThe optional name defaults to 'paraslash' if not given.\n"
 
 "\n"
 "\tThe optional name defaults to 'paraslash' if not given.\n"
 


@@ -212,7 +212,7 @@ static struct server_command cmds[] = {
 .help =
 
 "\tIf pattern was not given, print list of all audio files known\n"
 .help =
 
 "\tIf pattern was not given, print list of all audio files known\n"

-"\tto the mysql database tool. See the documentation of mysql\n"
+"\tto the mysql selector. See the documentation of mysql\n"

 "\tfor the definition of LIKE patterns.\n"
 
 },
 "\tfor the definition of LIKE patterns.\n"
 
 },


@@ -1807,8 +1807,8 @@ out:
 static void update_mmd(char *info)
 {
        PARA_DEBUG_LOG("%s", "updating shared memory area\n");
 static void update_mmd(char *info)
 {
        PARA_DEBUG_LOG("%s", "updating shared memory area\n");

-       strncpy(mmd->dbinfo, info, MMD_INFO_SIZE - 1);
-       mmd->dbinfo[MMD_INFO_SIZE - 1] = '\0';
+       strncpy(mmd->selector_info, info, MMD_INFO_SIZE - 1);
+       mmd->selector_info[MMD_INFO_SIZE - 1] = '\0';

 }
 
 static void update_audio_file_server_handler(char *name)
 }
 
 static void update_audio_file_server_handler(char *name)


@@ -2427,7 +2427,7 @@ static int init_mysql_server(void)
 /* mmd lock must be held */
 static void write_msg2mmd(int success)
 {
 /* mmd lock must be held */
 static void write_msg2mmd(int success)
 {

-       sprintf(mmd->dbinfo, "dbinfo1:%s\ndbinfo2:mysql-%s\ndbinfo3:\n",
+       sprintf(mmd->selector_info, "dbinfo1:%s\ndbinfo2:mysql-%s\ndbinfo3:\n",

                success < 0? PARA_STRERROR(-success) :
                        "successfully connected to mysql server",
                success < 0? "" : mysql_get_server_info(mysql_ptr));
                success < 0? PARA_STRERROR(-success) :
                        "successfully connected to mysql server",
                success < 0? "" : mysql_get_server_info(mysql_ptr));


@@ -2509,12 +2509,13 @@ static void shutdown_connection(void)
 }
 
 /**
 }
 
 /**

- * the init function of the mysql-based database tool
+ * the init function of the mysql-based audio file selector

  *
  * Check the command line options and initialize all function pointers of \a db.
  *
  * Check the command line options and initialize all function pointers of \a db.

- * Connect to the mysql server and initialize the dbinfo string.
+ * Connect to the mysql server and initialize the info string.

  *
  *

- * \sa struct audio_file_selector, misc_meta_data::dbinfo, random_selector.c
+ * \sa struct audio_file_selector, misc_meta_data::selector_info,
+ * random_selector.c

  */
 int mysql_selector_init(struct audio_file_selector *db)
 {
  */
 int mysql_selector_init(struct audio_file_selector *db)
 {