From: Andre <maan@p133.(none)>
Date: Fri, 10 Mar 2006 19:24:52 +0000 (+0100)
Subject: trivial dbtool->selector renames
X-Git-Tag: v0.2.11~22
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ea9365796ffb4322631b0170ddf8594d00215f2c;p=paraslash.git

trivial dbtool->selector renames
---

diff --git a/db.h b/db.h
index bd37d2b4..80c0de89 100644
--- 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 d5d32e50..61d9cfdf 100644
--- 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 f7e085f4..d17ac3af 100644
--- 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 a7441557..c860c039 100644
--- 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 8275ccd0..f2835bae 100644
--- 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,