[vlc-commits] Revert "logger: store in the context which logging mode is being used"

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jan 25 04:00:00 2012 -0500| [ec5d9cb08672f4a1e27d413644556d49c8feccfb] | committer: Jean-Baptiste Kempf

Revert "logger: store in the context which logging mode is being used"

This reverts commit e50cfac2d3cbc00abd7d332eb47abb584ef5eac4.
This undid modifications made in f83d51d4b16a939d9b308a47b1b08db69917af68
(cherry picked from commit 091552e8ad1738aaccb1e930d39fcb13df113114)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ec5d9cb08672f4a1e27d413644556d49c8feccfb
---

 modules/misc/logger.c |   27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 2669319..481d262 100644
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -69,17 +69,6 @@
 #include <syslog.h>
 #endif
 
-enum logmode {
-    LOGGER_TEXT,
-    LOGGER_HTML,
-#ifdef HAVE_SYSLOG_H
-    LOGGER_SYSLOG,
-#endif
-#ifdef __ANDROID__
-    LOGGER_ANDROID,
-#endif
-};
-
 /*****************************************************************************
  * intf_sys_t: description and status of log interface
  *****************************************************************************/
@@ -88,7 +77,6 @@ struct intf_sys_t
     msg_subscription_t *p_sub;
     FILE *p_file;
     const char *footer;
-    enum logmode logmode;
 };
 
 /*****************************************************************************
@@ -216,7 +204,6 @@ static int Open( vlc_object_t *p_this )
     msg_callback_t cb = TextPrint;
     const char *filename = LOG_FILE_TEXT, *header = TEXT_HEADER;
     p_sys->footer = TEXT_FOOTER;
-    p_sys->logmode = LOGGER_TEXT;
 
     char *mode = var_InheritString( p_intf, "logmode" );
     if( mode != NULL )
@@ -226,21 +213,14 @@ static int Open( vlc_object_t *p_this )
             p_sys->footer = HTML_FOOTER;
             header = HTML_HEADER;
             cb = HtmlPrint;
-            p_sys->logmode = LOGGER_HTML;
         }
 #ifdef HAVE_SYSLOG_H
         else if( !strcmp( mode, "syslog" ) )
-        {
             cb = SyslogPrint;
-            p_sys->logmode = LOGGER_SYSLOG;
-        }
 #endif
 #ifdef __ANDROID__
         else if( !strcmp( mode, "android" ) )
-        {
             cb = AndroidPrint;
-            p_sys->logmode = LOGGER_ANDROID;
-        }
 #endif
         else if( strcmp( mode, "text" ) )
             msg_Warn( p_intf, "invalid log mode `%s', using `text'", mode );
@@ -248,7 +228,7 @@ static int Open( vlc_object_t *p_this )
     }
 
 #ifdef HAVE_SYSLOG_H
-    if( p_sys->logmode == LOGGER_SYSLOG )
+    if( cb == SyslogPrint )
     {
         int i_facility;
         char *psz_facility = var_InheritString( p_intf, "syslog-facility" );
@@ -285,7 +265,7 @@ static int Open( vlc_object_t *p_this )
     else
 #endif
 #ifdef __ANDROID__
-    if( p_sys->logmode == LOGGER_ANDROID )
+    if( cb == AndroidPrint )
     {
         /* nothing to do */
     }
@@ -342,11 +322,10 @@ static void Close( vlc_object_t *p_this )
 
     /* Close the log file */
 #ifdef HAVE_SYSLOG_H
-    if( p_sys->logmode == LOGGER_SYSLOG )
+    if( p_sys->p_file == NULL )
         closelog();
     else
 #endif
-    if( p_sys->logmode == LOGGER_TEXT || p_sys->logmode == LOGGER_HTML )
     {
         fputs( p_sys->footer, p_sys->p_file );
         fclose( p_sys->p_file );