Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / config / intf.c

diff --git a/src/config/intf.c b/src/config/intf.c
index a8ae1b68fd91ad767aff0344b3ad63a617370a38..fb04f20fd2376780959ac0ab000c6293a22a378d 100644 (file)
--- a/src/config/intf.c
+++ b/src/config/intf.c
@@ -25,49 +25,13 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-#include "../libvlc.h"
-#include "vlc_keys.h"
-#include "vlc_charset.h"
+#include <vlc_common.h>
 
-#include <errno.h>                                                  /* errno */
 #include <assert.h>
-#include <limits.h>
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>                                          /* getuid() */
-#endif
-
-#ifdef HAVE_GETOPT_LONG
-#   ifdef HAVE_GETOPT_H
-#       include <getopt.h>                                       /* getopt() */
-#   endif
-#else
-#   include "../extras/getopt.h"
-#endif
-
-#if defined(HAVE_GETPWUID)
-#   include <pwd.h>                                            /* getpwuid() */
-#endif
-
-#if defined( HAVE_SYS_STAT_H )
-#   include <sys/stat.h>
-#endif
-#if defined( HAVE_SYS_TYPES_H )
-#   include <sys/types.h>
-#endif
-#if defined( WIN32 )
-#   if !defined( UNDER_CE )
-#       include <direct.h>
-#   endif
-#include <tchar.h>
-#endif
-
-#include "configuration.h"
-#include "modules/modules.h"
 
+#undef config_AddIntf
 /* Adds an extra interface to the configuration */
-void __config_AddIntf( vlc_object_t *p_this, const char *psz_intf )
+void config_AddIntf( vlc_object_t *p_this, const char *psz_intf )
 {
     assert( psz_intf );
 
@@ -115,8 +79,9 @@ void __config_AddIntf( vlc_object_t *p_this, const char *psz_intf )
     free( psz_config );
 }
 
+#undef config_RemoveIntf
 /* Removes an extra interface from the configuration */
-void __config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf )
+void config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf )
 {
     assert( psz_intf );
 
@@ -166,11 +131,12 @@ void __config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf )
     free( psz_config );
 }
 
+#undef config_ExistIntf
 /*
- * Returns VLC_TRUE if the specified extra interface is present in the
- * configuration, VLC_FALSE if not
+ * Returns true if the specified extra interface is present in the
+ * configuration, false if not
  */
-vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf )
+bool config_ExistIntf( vlc_object_t *p_this, const char *psz_intf )
 {
     assert( psz_intf );
 
@@ -183,7 +149,7 @@ vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf )
         if( !strncmp( psz_parser, psz_intf, i_len ) )
         {
             free( psz_config );
-            return VLC_TRUE;
+            return true;
         }
         psz_parser = strchr( psz_parser, ':' );
         if( psz_parser ) psz_parser++; /* skip the ':' */
@@ -196,13 +162,13 @@ vlc_bool_t __config_ExistIntf( vlc_object_t *p_this, const char *psz_intf )
         if( !strncmp( psz_parser, psz_intf, i_len ) )
         {
             free( psz_config );
-            return VLC_TRUE;
+            return true;
         }
         psz_parser = strchr( psz_parser, ':' );
         if( psz_parser ) psz_parser++; /* skip the ':' */
     }
     free( psz_config );
 
-    return VLC_FALSE;
+    return false;
 }