]> git.sesse.net Git - vlc/commitdiff
Don't use FREENULL when that's not needed and don't free NULL just for fun.
authorRémi Duraffort <ivoire@videolan.org>
Wed, 17 Sep 2008 17:58:11 +0000 (19:58 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 17 Sep 2008 17:59:00 +0000 (19:59 +0200)
modules/demux/mp4/libmp4.c

index cbd9858e65bd88be7eddde1d90d4c63d9949644c..422f8f2cedaa9cdeb4ac5d3fa0d9ce17d95e4670 100644 (file)
@@ -2885,7 +2885,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
                           MP4_Box_t *p_box, const char *psz_fmt, va_list args)
 {
     char *psz_dup;
-    char    *psz_path;
+    char *psz_path;
 
     if( !p_box )
     {
@@ -2898,7 +2898,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
 
     if( !psz_path || !psz_path[0] )
     {
-        FREENULL( psz_path );
+        free( psz_path );
         *pp_result = NULL;
         return;
     }
@@ -2915,7 +2915,6 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
 //                 psz_path,psz_token,i_number );
         if( !psz_token )
         {
-            FREENULL( psz_token );
             free( psz_dup );
             *pp_result = p_box;
             return;