svg module: fix memleak.

[vlc] / src / config / chain.c

diff --git a/src/config/chain.c b/src/config/chain.c
index 4d71bd5c6e4dbfa0d369a3cf1849240fd41d1880..db78ab718bff5da956ac5e3ddb13f0278c6645a3 100644 (file)
--- a/src/config/chain.c
+++ b/src/config/chain.c
@@ -27,9 +27,15 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include "libvlc.h"
 
+#include "vlc_interface.h"
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -114,7 +120,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char
             /* fprintf( stderr, "name=%s - rest=%s\n", psz_name, p ); */
             if( p == psz_name )
             {
-                fprintf( stderr, "invalid options (empty)" );
+                fprintf( stderr, "config_ChainCreate: invalid options (empty) \n" );
                 break;
             }
 
@@ -125,7 +131,7 @@ char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char
             if( *p == '=' || *p == '{' )
             {
                 const char *end;
-                vlc_bool_t b_keep_brackets = (*p == '{');
+                bool b_keep_brackets = (*p == '{');
 
                 if( *p == '=' ) p++;
 
@@ -246,8 +252,8 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
     for(; cfg; cfg = cfg->p_next )
     {
         vlc_value_t val;
-        vlc_bool_t b_yes = VLC_TRUE;
-        vlc_bool_t b_once = VLC_FALSE;
+        bool b_yes = true;
+        bool b_once = false;
         module_config_t *p_conf;
         int i_type;
         size_t i;
@@ -266,14 +272,14 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
                 ( !strncmp( cfg->psz_name, "no", 2 ) &&
                   !strcmp( ppsz_options[i], cfg->psz_name + 2 ) ) )
             {
-                b_yes = VLC_FALSE;
+                b_yes = false;
                 break;
             }
 
             if( *ppsz_options[i] == '*' &&
                 !strcmp( &ppsz_options[i][1], cfg->psz_name ) )
             {
-                b_once = VLC_TRUE;
+                b_once = true;
                 break;
             }