lua: add vlc.strings.iconv to use vlc_iconv, shouldn't eat kittens

[vlc] / modules / misc / logger.c

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 377609b83125f53a06e3283f5fa74582c601b73d..e633f9d857dd172644167c676bc326796e9b2313 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -32,8 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <assert.h>
 
@@ -130,10 +129,6 @@ static const char *const mode_list_text[] = { N_("Text"), "HTML"
   "will be forwarded. Available choices are \"user\" (default), \"daemon\", " \
   "and \"local0\" through \"local7\".")
 
-#define LOGVERBOSE_TEXT N_("Verbosity")
-#define LOGVERBOSE_LONGTEXT N_("Select the verbosity to use for log or -1 to " \
-"use the same verbosity given by --verbose.")
-
 /* First in list is the default facility used. */
 #define DEFINE_SYSLOG_FACILITY \
   DEF( "user",   LOG_USER ), \
@@ -158,6 +153,10 @@ enum                   { fac_entries = sizeof(fac_name)/sizeof(fac_name[0]) };
 
 #endif
 
+#define LOGVERBOSE_TEXT N_("Verbosity")
+#define LOGVERBOSE_LONGTEXT N_("Select the verbosity to use for log or -1 to " \
+"use the same verbosity given by --verbose.")
+
 vlc_module_begin ()
     set_shortname( N_( "Logging" ) )
     set_description( N_("File logging") )
@@ -232,7 +231,7 @@ static int Open( vlc_object_t *p_this )
 
     if( p_sys->msg.i_mode != MODE_SYSLOG )
     {
-        char *psz_file = config_GetPsz( p_intf, "logfile" );
+        char *psz_file = var_InheritString( p_intf, "logfile" );
         if( !psz_file )
         {
 #ifdef __APPLE__
@@ -261,7 +260,7 @@ static int Open( vlc_object_t *p_this )
 
         /* Open the log file and remove any buffering for the stream */
         msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
-        p_sys->msg.p_file = utf8_fopen( psz_file, "at" );
+        p_sys->msg.p_file = vlc_fopen( psz_file, "at" );
         if( p_sys->msg.p_file == NULL )
         {
             msg_Err( p_intf, "error opening logfile `%s'", psz_file );