Another time "Remove useless test before a free".

[vlc] / modules / access / dc1394.c

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 26445d6bde42538fe88aa21f44e8316fb7325017..5c66ffabc96e967ff6d98973338aa8cad18f77d3 100644 (file)
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -8,7 +8,7 @@
  *****************************************************************************
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; 
+ * License as published by the Free Software Foundation;
  * version 2 of the License.
  *
  * This library is distributed in the hope that it will be useful,
@@ -26,13 +26,15 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
 #include <vlc_demux.h>
 
-#include <stdio.h>
-#include <string.h>
 
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
@@ -574,7 +576,7 @@ static void OpenAudioDev( demux_t *p_demux )
         CloseAudioDev( p_demux );
     }
 
-    msg_Dbg( p_demux, "openened adev=`%s' %s %dHz",
+    msg_Dbg( p_demux, "opened adev=`%s' %s %dHz",
              psz_device,
              (p_sys->channels > 1) ? "stereo" : "mono",
              p_sys->i_sample_rate );
@@ -626,10 +628,8 @@ static void Close( vlc_object_t *p_this )
         dc1394_destroy_handle( p_sys->fd_video );
     CloseAudioDev( p_demux );
 
-    if( p_sys->camera_nodes )
-        free( p_sys->camera_nodes );
-    if( p_sys->audio_device )
-        free( p_sys->audio_device );
+    free( p_sys->camera_nodes );
+    free( p_sys->audio_device );
 
     free( p_sys );
 }
@@ -804,6 +804,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     {
         /* Special for access_demux */
         case DEMUX_CAN_PAUSE:
+        case DEMUX_CAN_SEEK:
         case DEMUX_SET_PAUSE_STATE:
         case DEMUX_CAN_CONTROL_PACE:
             pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
@@ -830,7 +831,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 static int process_options( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    char *psz_dup; 
+    char *psz_dup;
     char *psz_parser;
     char *token = NULL;
     char *state = NULL;
@@ -856,7 +857,7 @@ static int process_options( demux_t *p_demux )
                     "video size of 160x120 is actually disabled for lack of chroma "
                     "support. It will relased ASAP, until then try an higher size "
                     "(320x240 and 640x480 are fully supported)" );
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
 #if 0
                 p_sys->frame_size = MODE_160x120_YUV444;
@@ -883,7 +884,7 @@ static int process_options( demux_t *p_demux )
                     " 160x120, 320x240, and 640x480. "
                     "Please specify one of them. You have specified %s.",
                     token );
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
             }
             msg_Dbg( p_demux, "Requested video size : %s",token );
@@ -911,7 +912,7 @@ static int process_options( demux_t *p_demux )
                     " 1.875, 3.75, 7.5, 15, 30, 60. "
                     "Please specify one of them. You have specified %s.",
                     token);
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
             }
             msg_Dbg( p_demux, "Requested frame rate : %s",token );
@@ -926,7 +927,7 @@ static int process_options( demux_t *p_demux )
                 msg_Err( p_demux, "Bad brightness value '%s', "
                                   "must be an unsigned integer.",
                                   token );
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
             }
         }
@@ -955,7 +956,7 @@ static int process_options( demux_t *p_demux )
                 msg_Err( p_demux, "Bad camera number '%s', "
                                   "must be an unsigned integer.",
                                   token );
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
             }
         }
@@ -977,7 +978,7 @@ static int process_options( demux_t *p_demux )
                 msg_Err(p_demux, "Bad capture method value '%s', "
                                  "it can be 'raw1394' or 'video1394'.",
                                 token );
-                free(psz_dup);
+                free( psz_dup );
                 return VLC_EGENERIC;
             }
         }
@@ -1008,7 +1009,7 @@ static int process_options( demux_t *p_demux )
             sscanf( token, "0x%llx", &p_sys->selected_uid );
         }
     }
-    if( psz_dup ) free( psz_dup );
+    free( psz_dup );
     return VLC_SUCCESS;
 }