X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=src%2Fconfig%2Fintf.c;h=a97ef24e3ae98ef1260e23fc4c77fdfeb1a09ac1;hp=78f15454c25898bd16800e97e6ad01021a7ee79f;hb=5281440cca25ed01d1844f5a8eeda855ea9ef4c5;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;ds=sidebyside diff --git a/src/config/intf.c b/src/config/intf.c index 78f15454c2..a97ef24e3a 100644 --- a/src/config/intf.c +++ b/src/config/intf.c @@ -25,48 +25,9 @@ # include "config.h" #endif -#include -#include "../libvlc.h" -#include "vlc_keys.h" -#include "vlc_charset.h" +#include -#include /* errno */ - -#ifdef HAVE_LIMITS_H -# include -#endif - -#ifdef HAVE_UNISTD_H -# include /* getuid() */ -#endif - -#ifdef HAVE_GETOPT_LONG -# ifdef HAVE_GETOPT_H -# include /* getopt() */ -# endif -#else -# include "../extras/getopt.h" -#endif - -#if defined(HAVE_GETPWUID) -# include /* getpwuid() */ -#endif - -#if defined( HAVE_SYS_STAT_H ) -# include -#endif -#if defined( HAVE_SYS_TYPES_H ) -# include -#endif -#if defined( WIN32 ) -# if !defined( UNDER_CE ) -# include -# endif -#include -#endif - -#include "configuration.h" -#include "modules/modules.h" +#include /* Adds an extra interface to the configuration */ void __config_AddIntf( vlc_object_t *p_this, const char *psz_intf ) @@ -169,10 +130,10 @@ void __config_RemoveIntf( vlc_object_t *p_this, const char *psz_intf ) } /* - * 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 ); @@ -185,7 +146,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 ':' */ @@ -198,13 +159,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; }