Remove change_unsafe() no-op.

[vlc] / modules / demux / demuxdump.c

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index bc0cd13d8f16236d8e2d1d3e8a6a0dd0724d7dc4..1dd677377bc853c30c30044b3a03de5301f84779 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -24,13 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <errno.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
@@ -51,11 +53,10 @@ vlc_module_begin();
     set_shortname("Dump");
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("File dumper") );
+    set_description( N_("File dumper") );
     set_capability( "demux", 0 );
     add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
               FILE_LONGTEXT, false );
-        change_unsafe();
     add_bool( "demuxdump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT,
               false );
     set_callbacks( Open, Close );
@@ -99,6 +100,10 @@ static int Open( vlc_object_t * p_this )
     if( !p_demux->b_force )
         return VLC_EGENERIC;
 
+    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+
     var_Create( p_demux, "demuxdump-append", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
     var_Get( p_demux, "demuxdump-append", &val );
     b_append = val.b_bool;
@@ -109,13 +114,15 @@ static int Open( vlc_object_t * p_this )
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+
     p_sys->i_write = 0;
     p_sys->p_file = NULL;
     p_sys->psz_file = var_CreateGetString( p_demux, "demuxdump-file" );
     if( *p_sys->psz_file == '\0' )
     {
         msg_Warn( p_demux, "no dump file name given" );
+        free( p_sys->psz_file );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -127,7 +134,7 @@ static int Open( vlc_object_t * p_this )
     else if( ( p_sys->p_file = utf8_fopen( p_sys->psz_file, psz_mode ) ) == NULL )
     {
         msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file );
-
+        free( p_sys->psz_file );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -146,7 +153,7 @@ static void Close( vlc_object_t *p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file,
+    msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file,
               p_sys->i_write / 1024 );
 
     if( p_sys->p_file != stdout )
@@ -154,7 +161,6 @@ static void Close( vlc_object_t *p_this )
         fclose( p_sys->p_file );
     }
     free( p_sys->psz_file );
-
     free( p_sys );
 }