From 1d298ac7426fdc13221f759848dbf766ef606c0b Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 20 Feb 2007 21:15:53 +0100 Subject: [PATCH 1/1] rename db.c to afs.c and db.h to afs.h --- db.c => afs.c | 2 +- db.h => afs.h | 4 ++-- command.c | 2 +- configure.ac | 2 +- error.h | 6 +++--- mysql_selector.c | 2 +- playlist_selector.c | 2 +- random_selector.c | 2 +- server.c | 2 +- vss.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename db.c => afs.c (97%) rename db.h => afs.h (97%) diff --git a/db.c b/afs.c similarity index 97% rename from db.c rename to afs.c index 027dfda5..f5de6609 100644 --- a/db.c +++ b/afs.c @@ -17,7 +17,7 @@ */ -/** \file db.c functions common to all audio file selectors */ +/** \file afs.c functions common to all audio file selectors */ #include "server.cmdline.h" #include "server.h" diff --git a/db.h b/afs.h similarity index 97% rename from db.h rename to afs.h index 3b9d4530..520bd5ba 100644 --- a/db.h +++ b/afs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -/** \file db.h data structures common to all audio file selectors */ +/** \file afs.h data structures common to all audio file selectors */ #include diff --git a/command.c b/command.c index ffd660d6..325f7686 100644 --- a/command.c +++ b/command.c @@ -20,7 +20,7 @@ #include /* gettimeofday */ #include "server.cmdline.h" -#include "db.h" +#include "afs.h" #include "server.h" #include "vss.h" #include "send.h" diff --git a/configure.ac b/configure.ac index fd01b188..aeb6f8d4 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ audiod_audio_formats="" server_cmdline_objs="server.cmdline server_command_list random_selector_command_list playlist_selector_command_list" server_errlist_objs="server mp3_afh vss command net string signal random_selector - time daemon stat crypt http_send db close_on_fork playlist_selector + time daemon stat crypt http_send afs close_on_fork playlist_selector ipc dccp dccp_send fd user_list" server_ldflags="" server_audio_formats=" mp3" diff --git a/error.h b/error.h index b9709477..537aca57 100644 --- a/error.h +++ b/error.h @@ -55,7 +55,7 @@ enum para_subsystem { SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, - SS_DB, + SS_AFS, SS_OGG_AFH, SS_MP3_AFH, SS_AAC_AFH, @@ -305,7 +305,7 @@ extern const char **para_errlist[]; PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ -#define DB_ERRORS \ +#define AFS_ERRORS \ PARA_ERROR(GETCWD, "can not get current working directory"), \ PARA_ERROR(CHDIR, "can not change directory"), \ PARA_ERROR(OPENDIR, "can not open directory"), \ @@ -559,7 +559,7 @@ SS_ENUM(PLAYLIST_SELECTOR); SS_ENUM(CRYPT); SS_ENUM(HTTP_SEND); SS_ENUM(ORTP_SEND); -SS_ENUM(DB); +SS_ENUM(AFS); SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); SS_ENUM(DCCP); diff --git a/mysql_selector.c b/mysql_selector.c index d4ccc868..e545f0da 100644 --- a/mysql_selector.c +++ b/mysql_selector.c @@ -25,7 +25,7 @@ #include "server.cmdline.h" #include "server.h" #include "vss.h" -#include "db.h" +#include "afs.h" #include #include #include diff --git a/playlist_selector.c b/playlist_selector.c index 8d1d4516..2b0599cb 100644 --- a/playlist_selector.c +++ b/playlist_selector.c @@ -19,7 +19,7 @@ /** \file playlist_selector.c The playlist audio file selector of paraslash */ #include "server.h" -#include "db.h" +#include "afs.h" #include "error.h" #include "net.h" #include "string.h" diff --git a/random_selector.c b/random_selector.c index 5d8b386c..d9efaaf2 100644 --- a/random_selector.c +++ b/random_selector.c @@ -21,7 +21,7 @@ #include /* gettimeofday */ #include "server.cmdline.h" #include "server.h" -#include "db.h" +#include "afs.h" #include "error.h" #include "net.h" #include "string.h" diff --git a/server.c b/server.c index 89f901f4..41d9a2ac 100644 --- a/server.c +++ b/server.c @@ -30,7 +30,7 @@ #include "server.cmdline.h" -#include "db.h" +#include "afs.h" #include "server.h" #include "vss.h" #include "config.h" diff --git a/vss.c b/vss.c index 4a395593..b34703de 100644 --- a/vss.c +++ b/vss.c @@ -25,7 +25,7 @@ #include "server.h" #include /* gettimeofday */ #include "server.cmdline.h" -#include "db.h" +#include "afs.h" #include "afh.h" #include "vss.h" #include "send.h" -- 2.39.2