From 66985d531f0c38d8469ba3fa926a0aa252056102 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 6 Feb 2002 10:57:15 +0000
Subject: rename config_file_init to xine_config_file_init.

CVS patchset: 1479
CVS date: 2002/02/06 10:57:15
---
 src/xine-engine/configfile.c    | 15 +++++++++------
 src/xine-engine/configfile.h    |  7 +++++--
 src/xine-engine/xine_internal.h |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index f8348157f..e2ef6595b 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.c,v 1.17 2002/01/13 23:08:27 jcdutton Exp $
+ * $Id: configfile.c,v 1.18 2002/02/06 10:57:15 f1rmb Exp $
  *
  * config file management - implementation
  *
@@ -89,7 +89,7 @@ static cfg_entry_t *config_file_add (config_values_t *this, char *key) {
  * external interface
  */
 
-cfg_entry_t *config_file_lookup_entry (config_values_t *this, char *key) {
+static cfg_entry_t *config_file_lookup_entry (config_values_t *this, char *key) {
   cfg_entry_t *entry;
 
   entry = this->first;
@@ -107,7 +107,7 @@ static char *config_file_register_string (config_values_t *this,
 					  char *help,
 					  config_cb_t changed_cb,
 					  void *cb_data) {
-
+  
   cfg_entry_t *entry;
 
   assert (key);
@@ -167,7 +167,7 @@ static int config_file_register_num (config_values_t *this,
 				     char *help,
 				     config_cb_t changed_cb,
 				     void *cb_data) {
-
+  
   cfg_entry_t *entry;
 
   assert (key);
@@ -262,7 +262,7 @@ static int config_file_register_range (config_values_t *this,
 				       char *help,
 				       config_cb_t changed_cb,
 				       void *cb_data) {
-
+  
   cfg_entry_t *entry;
 
   assert (key);
@@ -557,7 +557,7 @@ static void config_file_read (config_values_t *this, char *filename){
   }
 }
 
-config_values_t *config_file_init (char *filename) {
+config_values_t *xine_config_file_init (char *filename) {
 
 #ifdef HAVE_IRIXAL
   volatile /* is this a (old, 2.91.66) irix gcc bug?!? */
@@ -594,6 +594,9 @@ config_values_t *config_file_init (char *filename) {
 
 /*
  * $Log: configfile.c,v $
+ * Revision 1.18  2002/02/06 10:57:15  f1rmb
+ * rename config_file_init to xine_config_file_init.
+ *
  * Revision 1.17  2002/01/13 23:08:27  jcdutton
  * Fix another compiler warning.
  *
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 74831d526..26480abcc 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.h,v 1.7 2001/12/01 22:38:32 guenter Exp $
+ * $Id: configfile.h,v 1.8 2002/02/06 10:57:15 f1rmb Exp $
  *
  * config file management
  *
@@ -178,7 +178,7 @@ struct config_values_s {
  * init internal data structures, read config file
  * (if it exists)
  */
-config_values_t *config_file_init (char *filename);
+config_values_t *xine_config_file_init (char *filename);
 
 #ifdef __cplusplus
 }
@@ -188,6 +188,9 @@ config_values_t *config_file_init (char *filename);
 
 /*
  * $Log: configfile.h,v $
+ * Revision 1.8  2002/02/06 10:57:15  f1rmb
+ * rename config_file_init to xine_config_file_init.
+ *
  * Revision 1.7  2001/12/01 22:38:32  guenter
  * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense)
  *
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 9b2c0066a..88f790fcd 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_internal.h,v 1.70 2002/02/02 17:05:43 richwareham Exp $
+ * $Id: xine_internal.h,v 1.71 2002/02/06 10:57:15 f1rmb Exp $
  *
  */
 
@@ -240,7 +240,7 @@ struct xine_s {
  * read config file and init a config object
  * (if it exists)
  */
-config_values_t *config_file_init (char *filename);
+config_values_t *xine_config_file_init (char *filename);
 
 /*
  * init xine - call once at startup
-- 
cgit v1.2.3