X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flogger.c;h=18e16913062b7783e8a8460cefd7fbeb66cdbd26;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=ba969cc66c0b53a6882c70d34f7dbae8d1e7dac7;hpb=f0ffeb173ab80dba4bba7d2353b5b1a24a3a0ffe;p=vlc

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index ba969cc66c..18e1691306 100644
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -24,20 +24,18 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
 
 #include <errno.h>                                                 /* ENOMEM */
-#include <stdio.h>
 
 #ifdef UNDER_CE
 #   define _IONBF 0x0004
 #endif
 
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
 #define MODE_TEXT 0
 #define MODE_HTML 1
 #define MODE_SYSLOG 2
@@ -104,12 +102,12 @@ static void DoRRD( intf_thread_t *p_intf );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static char *mode_list[] = { "text", "html"
+static const char *mode_list[] = { "text", "html"
 #ifdef HAVE_SYSLOG_H
 ,"syslog"
 #endif
 };
-static char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *mode_list_text[] = { N_("Text"), "HTML"
 #ifdef HAVE_SYSLOG_H
 , "syslog"
 #endif
@@ -122,11 +120,11 @@ static char *mode_list_text[] = { N_("Text"), "HTML"
   "syslog instead of file.")
 #else
 #define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
-  \"text\" (default) and \"html\".")
+  "\"text\" (default) and \"html\".")
 #endif
 
 vlc_module_begin();
-    set_shortname( N_( "Logging" ) );
+    set_shortname( _( "Logging" ) );
     set_description( _("File logging") );
 
     set_category( CAT_ADVANCED );
@@ -138,8 +136,8 @@ vlc_module_begin();
                 VLC_FALSE );
         change_string_list( mode_list, mode_list_text, 0 );
 
-    add_string( "rrd-file", NULL, NULL, N_("RRD output file") ,
-                    N_("Output data for RRDTool in this file" ), VLC_TRUE );
+    add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
+                    N_("Output data for RRDTool in this file." ), VLC_TRUE );
 
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
@@ -154,7 +152,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_mode, *psz_file, *psz_rrd_file;
 
     CONSOLE_INTRO_MSG;
-    msg_Info( p_intf, "Using logger..." );
+    msg_Info( p_intf, "using logger..." );
 
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
@@ -201,11 +199,11 @@ static int Open( vlc_object_t *p_this )
         if( !psz_file )
         {
 #ifdef __APPLE__
-            char *psz_homedir = p_this->p_vlc->psz_homedir;
+            char *psz_homedir = p_this->p_libvlc->psz_homedir;
 
-            if( !psz_homedir )
+            if( !psz_homedir ) /* XXX: This should never happen */
             {
-                msg_Err( p_this, "Unable to find home directory" );
+                msg_Err( p_this, "unable to find home directory" );
                 return -1;
             }
             psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
@@ -243,7 +241,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_intf->p_sys->p_file = utf8_fopen( psz_file, "wt" );
+        p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
         if( p_intf->p_sys->p_file == NULL )
         {
             msg_Err( p_intf, "error opening logfile `%s'", psz_file );
@@ -413,7 +411,7 @@ static void SyslogPrint( const msg_item_t *p_msg )
                 p_msg->psz_module, p_msg->psz_msg );
     else
         syslog( i_priority, "%s: %s", p_msg->psz_module, p_msg->psz_msg );
-        
+ 
 }
 #endif
 
@@ -434,7 +432,6 @@ static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
 static void DoRRD( intf_thread_t *p_intf )
 {
     playlist_t *p_playlist;
-    float f_input_bitrate;
     if( mdate() - p_intf->p_sys->last_update < 1000000 )
         return;
     p_intf->p_sys->last_update = mdate();
@@ -450,7 +447,7 @@ static void DoRRD( intf_thread_t *p_intf )
         lldiv_t dout = lldiv( p_playlist->p_stats->f_output_bitrate * 1000000,
                              1000 );
         fprintf( p_intf->p_sys->p_rrd,
-                   I64Fi":"I64Fd".%03u:"I64Fd".%03u:"I64Fd".%03u\n",
+                   I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n",
                    p_intf->p_sys->last_update/1000000,
                    din.quot, (unsigned int)din.rem,
                    ddm.quot, (unsigned int)ddm.rem,