From 1776383c89bcc2bec6b469b3d58d5f5c3a37f090 Mon Sep 17 00:00:00 2001 From: Andre Date: Fri, 10 Mar 2006 21:53:05 +0100 Subject: [PATCH] rename mysql.c to mysql_selector.c Just to be consistent. --- configure.ac | 4 ++-- error.h | 7 ++++--- mysql.c => mysql_selector.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) rename mysql.c => mysql_selector.c (99%) diff --git a/configure.ac b/configure.ac index e05765ec..06cbe7ac 100644 --- a/configure.ac +++ b/configure.ac @@ -150,10 +150,10 @@ AC_CHECK_LIB([mysqlclient], [mysql_init], [], [ ]) if test "$have_mysql" = "yes"; then server_ldflags="$server_ldflags -lmysqlclient" - server_errlist_objs="$server_errlist_objs mysql" + server_errlist_objs="$server_errlist_objs mysql_selector" AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support]) else - AC_MSG_WARN([no libmysqlclient, cannot build mysql-based dbtool]) + AC_MSG_WARN([cannot build mysql-based audio file selector]) fi ########################################################################### ogg have_ogg="yes" diff --git a/error.h b/error.h index f15d0dc6..335950b7 100644 --- a/error.h +++ b/error.h @@ -25,7 +25,8 @@ enum para_subsystem {SS_RECV, SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER, SS_COMMAND, SS_RANDOM_SELECTOR, SS_PLAYLIST_SELECTOR, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG, - SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_RINGBUFFER}; + SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL_SELECTOR, + SS_IPC, SS_RINGBUFFER}; #define NUM_SS (SS_RINGBUFFER + 1) extern const char **para_errlist[]; /** \endcond */ @@ -191,7 +192,7 @@ extern const char **para_errlist[]; PARA_ERROR(NOTHING_FOUND, "no audio files found"), \ -#define MYSQL_ERRORS \ +#define MYSQL_SELECTOR_ERRORS \ PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \ PARA_ERROR(NOTCONN, "not connected to mysql server"), \ PARA_ERROR(TOOBIG, "mysql: file too large"), \ @@ -349,7 +350,7 @@ SS_ENUM(CRYPT); SS_ENUM(HTTP_SEND); SS_ENUM(ORTP_SEND); SS_ENUM(DB); -SS_ENUM(MYSQL); +SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); SS_ENUM(RINGBUFFER); /** \endcond */ diff --git a/mysql.c b/mysql_selector.c similarity index 99% rename from mysql.c rename to mysql_selector.c index 9292ab29..85d16ee2 100644 --- a/mysql.c +++ b/mysql_selector.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -/** \file mysql.c para_server's mysql-based audio file selector */ +/** \file mysql_selector.c para_server's mysql-based audio file selector */ /** \cond some internal constants */ #define MEDIUM_BLOB_SIZE 16777220 /* (2**24 + 4) */ -- 2.39.2