One more "Remove useless test before free"

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 6ed368af2aa09f9c02546506c67d01dd5b5e4cec..9e33d92bebad25638c416af0669084618a528081 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -75,8 +75,6 @@
 #   include <hal/libhal.h>
 #endif
 
-#include "vlc_os_specific.h"
-
 #include <vlc_playlist.h>
 #include <vlc_interface.h>
 
@@ -216,6 +214,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
     msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
 
     /* Initialize mutexes */
+    vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
     vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
 #ifdef __APPLE__
     vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
@@ -421,7 +420,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
         libvlc_global.p_module_bank->b_cache_delete = b_cache_delete;
     }
-    if( psz_language ) free( psz_language );
+    free( psz_language );
 # endif
 #endif
 
@@ -724,7 +723,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
     p_libvlc->i_timers = 0;
     p_libvlc->pp_timers = NULL;
-    vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
 
     /*
      * Initialize hotkey handling
@@ -754,7 +752,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         /* Add service discovery modules */
         playlist_ServicesDiscoveryAdd( p_playlist, psz_modules );
     }
-    if( psz_modules ) free( psz_modules );
+    free( psz_modules );
 
     /*
      * Load background interfaces
@@ -858,12 +856,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
             if( psz_morecodecs )
             {
                 config_PutPsz( p_libvlc, "codec", psz_morecodecs);
-                free(psz_morecodecs);
+                free( psz_morecodecs );
             }
         }
         else
             config_PutPsz( p_libvlc, "codec", "dmo,quicktime");
-        free(psz_codecs);
+        free( psz_codecs );
     }
 #endif
 
@@ -898,7 +896,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0,
                        PLAYLIST_INSERT, 0 );
     }
-    if ( val.psz_string != NULL ) free( val.psz_string );
+    free( val.psz_string );
 
     return VLC_SUCCESS;
 }
@@ -993,7 +991,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
                         psz_pidfile );
             }
         }
-        free ( psz_pidfile );
+        free( psz_pidfile );
     }
 #endif
 
@@ -1034,7 +1032,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     vlc_mutex_destroy( &p_libvlc->timer_lock );
 
     if( b_release ) vlc_object_release( p_libvlc );
-    vlc_object_destroy( p_libvlc );
+    vlc_object_release( p_libvlc );
     p_libvlc = NULL;
 
     /* Stop thread system: last one out please shut the door!
@@ -1074,7 +1072,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
          * We prefer the dummy interface if none is specified. */
         char *psz_interface = config_GetPsz( p_libvlc, "intf" );
         if( !psz_interface || !*psz_interface ) psz_module = "dummy";
-        if( psz_interface ) free( psz_interface );
+        free( psz_interface );
     }
 #endif
 
@@ -1696,9 +1694,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
         }
     }
 
-    if( b_has_advanced )
-        utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ),
-        _( "add --advanced to your command line to see advanced options." ) );
+    if( b_has_advanced ) 
+    {
+        if( b_color )
+            utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ),
+           _( "add --advanced to your command line to see advanced options."));
+        else
+            utf8_fprintf( stdout, "\n %s %s\n", _( "Note:" ),
+           _( "add --advanced to your command line to see advanced options."));
+    }
 
     /* Release the module list */
     vlc_list_release( p_list );
@@ -1806,7 +1810,7 @@ static void Version( void )
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
     if( strcmp( VLC_Changeset(), "exported" ) )
-        utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
+        utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"),
                  VLC_Changeset() );
     utf8_fprintf( stdout, LICENSE_MSG );