From 77264e47dcd6a606ecff2f86f14359f25ab0eba0 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sat, 8 Sep 2007 09:14:27 +0200
Subject: [PATCH 1/1] Rename afs.[ch] to afs_common.[ch].

As a prepraration for merging the new afs.
---
 afs.c => afs_common.c | 2 +-
 afs.h => afs_common.h | 2 +-
 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, 12 insertions(+), 12 deletions(-)
 rename afs.c => afs_common.c (96%)
 rename afs.h => afs_common.h (97%)

diff --git a/afs.c b/afs_common.c
similarity index 96%
rename from afs.c
rename to afs_common.c
index 13a9ccb2..36da960b 100644
--- a/afs.c
+++ b/afs_common.c
@@ -5,7 +5,7 @@
  */
 
 
-/** \file afs.c Functions common to all audio file selectors. */
+/** \file afs_common.c Functions common to all audio file selectors. */
 
 #include "server.cmdline.h"
 #include "server.h"
diff --git a/afs.h b/afs_common.h
similarity index 97%
rename from afs.h
rename to afs_common.h
index 1fb6a435..fd4c0969 100644
--- a/afs.h
+++ b/afs_common.h
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file afs.h data structures common to all audio file selectors */
+/** \file afs_common.h data structures common to all audio file selectors */
 
 #include <sys/select.h>
 
diff --git a/command.c b/command.c
index 056df57d..ae4c700c 100644
--- a/command.c
+++ b/command.c
@@ -8,7 +8,7 @@
 
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
-#include "afs.h"
+#include "afs_common.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"
diff --git a/configure.ac b/configure.ac
index 19244f99..a0d3785c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,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 afs close_on_fork playlist_selector
+	time daemon stat crypt http_send afs_common close_on_fork playlist_selector
 	ipc dccp dccp_send fd user_list chunk_queue"
 server_ldflags=""
 server_audio_formats=" mp3"
diff --git a/error.h b/error.h
index c0888aa0..060268db 100644
--- a/error.h
+++ b/error.h
@@ -43,7 +43,7 @@ enum para_subsystem {
 	SS_CRYPT,
 	SS_HTTP_SEND,
 	SS_ORTP_SEND,
-	SS_AFS,
+	SS_AFS_COMMON,
 	SS_OGG_AFH,
 	SS_MP3_AFH,
 	SS_AAC_AFH,
@@ -279,7 +279,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(CHUNK, "unable to get chunk"), \
 
 
-#define AFS_ERRORS \
+#define AFS_COMMON_ERRORS \
 	PARA_ERROR(GETCWD, "can not get current working directory"), \
 	PARA_ERROR(CHDIR, "can not change directory"), \
 	PARA_ERROR(OPENDIR, "can not open directory"), \
@@ -537,7 +537,7 @@ SS_ENUM(PLAYLIST_SELECTOR);
 SS_ENUM(CRYPT);
 SS_ENUM(HTTP_SEND);
 SS_ENUM(ORTP_SEND);
-SS_ENUM(AFS);
+SS_ENUM(AFS_COMMON);
 SS_ENUM(MYSQL_SELECTOR);
 SS_ENUM(IPC);
 SS_ENUM(DCCP);
diff --git a/mysql_selector.c b/mysql_selector.c
index bbc05bdf..46fc65b8 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -13,7 +13,7 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "vss.h"
-#include "afs.h"
+#include "afs_common.h"
 #include <mysql/mysql.h>
 #include <mysql/mysql_version.h>
 #include <regex.h>
diff --git a/playlist_selector.c b/playlist_selector.c
index d1149269..a497ec13 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -7,7 +7,7 @@
 /** \file playlist_selector.c The playlist audio file selector of paraslash  */
 
 #include "server.h"
-#include "afs.h"
+#include "afs_common.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"
diff --git a/random_selector.c b/random_selector.c
index bef1b7fd..c3d7e9b0 100644
--- a/random_selector.c
+++ b/random_selector.c
@@ -9,7 +9,7 @@
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "afs_common.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"
diff --git a/server.c b/server.c
index b4397c8f..e39354e7 100644
--- a/server.c
+++ b/server.c
@@ -18,7 +18,7 @@
 
 
 #include "server.cmdline.h"
-#include "afs.h"
+#include "afs_common.h"
 #include "server.h"
 #include "vss.h"
 #include "config.h"
diff --git a/vss.c b/vss.c
index c15fbd7e..859fd611 100644
--- a/vss.c
+++ b/vss.c
@@ -15,7 +15,7 @@
 #include <sys/mman.h> /* mmap */
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
-#include "afs.h"
+#include "afs_common.h"
 #include "vss.h"
 #include "send.h"
 #include "error.h"
-- 
2.39.2