Oops ?

[vlc] / src / misc / configuration.c

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index 86e7cfa66478eef7e85745c238a0da114d82d2fa..5d5679fb8772e8bc887e1545bb663873213c8583 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -23,7 +23,7 @@
 
 #include <vlc/vlc.h>
 #include "vlc_keys.h"
-#include "charset.h"
+#include "vlc_charset.h"
 
 #include <stdio.h>                                              /* sprintf() */
 #include <stdlib.h>                                      /* free(), strtol() */
@@ -63,6 +63,8 @@
 #include <tchar.h>
 #endif
 
+#include "configuration.h"
+
 static int ConfigStringToKey( const char * );
 static char *ConfigKeyToString( int );
 
@@ -635,20 +637,11 @@ void config_Free( module_t *p_module )
     {
         module_config_t *p_item = p_module->p_config + j;
 
-        if( p_item->psz_type )
-            free( p_item->psz_type );
-
-        if( p_item->psz_name )
-            free( p_item->psz_name );
-
-        if( p_item->psz_current )
-            free( p_item->psz_current );
-
-        if( p_item->psz_text )
-            free( p_item->psz_text );
-
-        if( p_item->psz_longtext )
-            free( p_item->psz_longtext );
+        free( (char*) p_item->psz_type );
+        free( (char*) p_item->psz_name );
+        free( (char*) p_item->psz_current );
+        free( (char*) p_item->psz_text );
+        free( (char*) p_item->psz_longtext );
 
         if (IsConfigStringType (p_item->i_type))
         {
@@ -662,9 +655,9 @@ void config_Free( module_t *p_module )
             for( i = 0; i < p_item->i_list; i++ )
             {
                 if( p_item->ppsz_list && p_item->ppsz_list[i] )
-                    free( p_item->ppsz_list[i] );
+                    free( (char*) p_item->ppsz_list[i] );
                 if( p_item->ppsz_list_text && p_item->ppsz_list_text[i] )
-                    free( p_item->ppsz_list_text[i] );
+                    free( (char*) p_item->ppsz_list_text[i] );
             }
             if( p_item->ppsz_list ) free( p_item->ppsz_list );
             if( p_item->ppsz_list_text ) free( p_item->ppsz_list_text );
@@ -675,8 +668,7 @@ void config_Free( module_t *p_module )
         {
             for( i = 0; i < p_item->i_action; i++ )
             {
-                if( p_item->ppsz_action_text[i] )
-                    free( p_item->ppsz_action_text[i] );
+                free( (char*) p_item->ppsz_action_text[i] );
             }
             if( p_item->ppf_action ) free( p_item->ppf_action );
             if( p_item->ppsz_action_text ) free( p_item->ppsz_action_text );
@@ -940,8 +932,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
                     vlc_mutex_lock( p_item->p_lock );
 
                     /* free old string */
-                    free (p_item->value.psz);
-                    free (p_item->saved.psz);
+                    free( (char*) p_item->value.psz );
+                    free( (char*) p_item->saved.psz );
 
                     p_item->value.psz = convert (psz_option_value);
                     p_item->saved.psz = strdupnull (p_item->value.psz);
@@ -1264,6 +1256,8 @@ int config_AutoSaveConfigFile( vlc_object_t *p_this )
     vlc_list_t *p_list;
     int i_index, i_count;
 
+    if( !p_this ) return -1;
+
     /* Check if there's anything to save */
     vlc_mutex_lock( &p_this->p_libvlc->config_lock );
     p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
@@ -1541,7 +1535,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
                                 "You should use --%s instead.\n",
                                 p_conf->psz_name, p_conf->psz_current);
                     }
-                    psz_name=p_conf->psz_current;
+                    psz_name = p_conf->psz_current;
                     p_conf = config_FindConfig( p_this, psz_name );
                 }