X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_filter%2Fdump.c;h=33a30422ad573cbd1ea8530d90e9035be15d94e5;hb=bcae143e590a2cd68f17f5a66490b6b346ed924d;hp=70ee23d06f19f640f623f12b2d5f9a1aff87b340;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc

diff --git a/modules/access_filter/dump.c b/modules/access_filter/dump.c
index 70ee23d06f..33a30422ad 100644
--- a/modules/access_filter/dump.c
+++ b/modules/access_filter/dump.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include <assert.h>
@@ -35,7 +35,7 @@
 #include <vlc_access.h>
 
 #include <vlc_charset.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
 
 #define DEFAULT_MARGIN 32 // megabytes
 
@@ -50,20 +50,20 @@
 static int  Open (vlc_object_t *);
 static void Close (vlc_object_t *);
 
-vlc_module_begin ();
-    set_shortname (_("Dump"));
-    set_description (_("Dump"));
-    set_category (CAT_INPUT);
-    set_subcategory (SUBCAT_INPUT_ACCESS_FILTER);
-    set_capability ("access_filter", 0);
-    add_shortcut ("dump");
-    set_callbacks (Open, Close);
+vlc_module_begin ()
+    set_shortname (N_("Dump"))
+    set_description (N_("Dump"))
+    set_category (CAT_INPUT)
+    set_subcategory (SUBCAT_INPUT_ACCESS_FILTER)
+    set_capability ("access_filter", 0)
+    add_shortcut ("dump")
+    set_callbacks (Open, Close)
 
     add_bool ("dump-force", false, NULL, FORCE_TEXT,
               FORCE_LONGTEXT, false);
     add_integer ("dump-margin", DEFAULT_MARGIN, NULL, MARGIN_TEXT,
                  MARGIN_LONGTEXT, false);
-vlc_module_end();
+vlc_module_end ()
 
 static ssize_t Read (access_t *access, uint8_t *buffer, size_t len);
 static block_t *Block (access_t *access);
@@ -109,12 +109,16 @@ static int Open (vlc_object_t *obj)
     access->pf_control = Control;
     access->info = src->info;
 
-    access_sys_t *p_sys = access->p_sys = malloc (sizeof (*p_sys));
-    if (p_sys == NULL)
+    access_sys_t *p_sys = access->p_sys = calloc( 1, sizeof (*p_sys) );
+    if( !p_sys )
         return VLC_ENOMEM;
-    memset (p_sys, 0, sizeof (*p_sys));
 
+# ifndef UNDER_CE
     if ((p_sys->stream = tmpfile ()) == NULL)
+# else
+    char buf[75];
+    if(GetTempFileName("\\Temp\\","vlc",0,buf) || ((p_sys->stream = fopen(buf,"wb+")) ==NULL))
+#endif
     {
         msg_Err (access, "cannot create temporary file: %m");
         free (p_sys);
@@ -267,7 +271,7 @@ static void Trigger (access_t *access)
         // and there is an off-by-one in the following sprintf().
         return;
 
-    const char *home = access->p_libvlc->psz_homedir;
+    const char *home = config_GetHomeDir();
 
     /* Hmm what about the extension?? */
     char filename[strlen (home) + sizeof ("/vlcdump-YYYYYYYYY-MM-DD-HH-MM-SS.ts")];
@@ -325,6 +329,7 @@ static int KeyHandler (vlc_object_t *obj, char const *varname,
 {
     access_t *access = data;
 
+    (void)varname;
     (void)oldval;
     (void)obj;