trivial dbtool->selector renames

diff --git a/db.h b/db.h
index bd37d2b45984226dc890f06976924eaa48774702..80c0de8936a5f2bab30183d49e9ccdbada26d127 100644 (file)
--- a/db.h
+++ b/db.h
@@ -118,7 +118,7 @@ void (*post_select)(fd_set *rfds, fd_set *wfds);
 void *private_data;
 };
 
-int mysql_dbtool_init(struct audio_file_selector*);
-int plm_dbtool_init(struct audio_file_selector*);
-int random_dbtool_init(struct audio_file_selector*);
+int mysql_selector_init(struct audio_file_selector*);
+int plm_selector_init(struct audio_file_selector*);
+int random_selector_init(struct audio_file_selector*);
 

diff --git a/mysql.c b/mysql.c
index d5d32e503be98102630d27dbdc34cc6d17f79d48..61d9cfdf24f56f436292ff12b3cc7d453682e4ee 100644 (file)
--- a/mysql.c
+++ b/mysql.c
@@ -2516,7 +2516,7 @@ static void shutdown_connection(void)
  *
  * \sa struct audio_file_selector, misc_meta_data::dbinfo, random_dbtool.c
  */
-int mysql_dbtool_init(struct audio_file_selector *db)
+int mysql_selector_init(struct audio_file_selector *db)
 {
        int ret;
 

diff --git a/plm_dbtool.c b/plm_dbtool.c
index f7e085f4c998a1e22fd68e321109a2f8bf9eaf59..d17ac3afb35319be12a038cdeba533a5a75951f3 100644 (file)
--- a/plm_dbtool.c
+++ b/plm_dbtool.c
@@ -277,7 +277,7 @@ void plm_update_audio_file(char *audio_file)
  *
  * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c random_dbtool.c
  */
-int plm_dbtool_init(struct audio_file_selector *db)
+int plm_selector_init(struct audio_file_selector *db)
 {
        int ret;
        struct private_plm_data *ppd = NULL;

diff --git a/random_dbtool.c b/random_dbtool.c
index a74415579aeffb5010332184418ae5dcadfa5a76..c860c0396bad51b9b21eaa79447b17eb74f79382 100644 (file)
--- a/random_dbtool.c
+++ b/random_dbtool.c
@@ -135,7 +135,7 @@ static void random_shutdown(void)
  *
  * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c
  */
-int random_dbtool_init(struct audio_file_selector *db)
+int random_selector_init(struct audio_file_selector *db)
 {
        struct timeval now;
 

diff --git a/server.c b/server.c
index 8275ccd0646adaacbd257ab08edcdeedb7e95c7d..f2835bae7d32679ae608b1e6d09ed0fe5ebf3afc 100644 (file)
--- a/server.c
+++ b/server.c
@@ -65,12 +65,12 @@ extern struct audio_format afl[];
 struct audio_file_selector dblist[] = {
        {
                .name = "random",
-               .init = random_dbtool_init,
+               .init = random_selector_init,
                .update_audio_file = NULL,
        },
        {
                .name = "plm",
-               .init = plm_dbtool_init,
+               .init = plm_selector_init,
                .update_audio_file = NULL,
                .pre_select = NULL,
                .post_select = NULL,
@@ -78,7 +78,7 @@ struct audio_file_selector dblist[] = {
 #ifdef HAVE_MYSQL
        {
                .name = "mysql",
-               .init = mysql_dbtool_init,
+               .init = mysql_selector_init,
                .update_audio_file = NULL,
                .pre_select = NULL,
                .post_select = NULL,