videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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

This reverts commit e50cfac2d3.
This undid modifications made in f83d51d4b1
This commit is contained in:
Rafaël Carré 2012-01-25 04:00:00 -05:00
parent e50cfac2d3
commit 091552e8ad
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/misc/logger.c
View File

@ -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;
};
/*****************************************************************************
@ -208,7 +196,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 )
@ -218,21 +205,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 );
@ -240,7 +220,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" );
@ -277,7 +257,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 */
}
@ -334,11 +314,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 );