mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
Revert "logger: store in the context which logging mode is being used"
This reverts commite50cfac2d3
. This undid modifications made inf83d51d4b1
This commit is contained in:
parent
e50cfac2d3
commit
091552e8ad
@ -69,17 +69,6 @@
|
|||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
#endif
|
#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
|
* intf_sys_t: description and status of log interface
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
@ -88,7 +77,6 @@ struct intf_sys_t
|
|||||||
msg_subscription_t *p_sub;
|
msg_subscription_t *p_sub;
|
||||||
FILE *p_file;
|
FILE *p_file;
|
||||||
const char *footer;
|
const char *footer;
|
||||||
enum logmode logmode;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
@ -208,7 +196,6 @@ static int Open( vlc_object_t *p_this )
|
|||||||
msg_callback_t cb = TextPrint;
|
msg_callback_t cb = TextPrint;
|
||||||
const char *filename = LOG_FILE_TEXT, *header = TEXT_HEADER;
|
const char *filename = LOG_FILE_TEXT, *header = TEXT_HEADER;
|
||||||
p_sys->footer = TEXT_FOOTER;
|
p_sys->footer = TEXT_FOOTER;
|
||||||
p_sys->logmode = LOGGER_TEXT;
|
|
||||||
|
|
||||||
char *mode = var_InheritString( p_intf, "logmode" );
|
char *mode = var_InheritString( p_intf, "logmode" );
|
||||||
if( mode != NULL )
|
if( mode != NULL )
|
||||||
@ -218,21 +205,14 @@ static int Open( vlc_object_t *p_this )
|
|||||||
p_sys->footer = HTML_FOOTER;
|
p_sys->footer = HTML_FOOTER;
|
||||||
header = HTML_HEADER;
|
header = HTML_HEADER;
|
||||||
cb = HtmlPrint;
|
cb = HtmlPrint;
|
||||||
p_sys->logmode = LOGGER_HTML;
|
|
||||||
}
|
}
|
||||||
#ifdef HAVE_SYSLOG_H
|
#ifdef HAVE_SYSLOG_H
|
||||||
else if( !strcmp( mode, "syslog" ) )
|
else if( !strcmp( mode, "syslog" ) )
|
||||||
{
|
|
||||||
cb = SyslogPrint;
|
cb = SyslogPrint;
|
||||||
p_sys->logmode = LOGGER_SYSLOG;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
else if( !strcmp( mode, "android" ) )
|
else if( !strcmp( mode, "android" ) )
|
||||||
{
|
|
||||||
cb = AndroidPrint;
|
cb = AndroidPrint;
|
||||||
p_sys->logmode = LOGGER_ANDROID;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
else if( strcmp( mode, "text" ) )
|
else if( strcmp( mode, "text" ) )
|
||||||
msg_Warn( p_intf, "invalid log mode `%s', using `text'", mode );
|
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
|
#ifdef HAVE_SYSLOG_H
|
||||||
if( p_sys->logmode == LOGGER_SYSLOG )
|
if( cb == SyslogPrint )
|
||||||
{
|
{
|
||||||
int i_facility;
|
int i_facility;
|
||||||
char *psz_facility = var_InheritString( p_intf, "syslog-facility" );
|
char *psz_facility = var_InheritString( p_intf, "syslog-facility" );
|
||||||
@ -277,7 +257,7 @@ static int Open( vlc_object_t *p_this )
|
|||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
if( p_sys->logmode == LOGGER_ANDROID )
|
if( cb == AndroidPrint )
|
||||||
{
|
{
|
||||||
/* nothing to do */
|
/* nothing to do */
|
||||||
}
|
}
|
||||||
@ -334,11 +314,10 @@ static void Close( vlc_object_t *p_this )
|
|||||||
|
|
||||||
/* Close the log file */
|
/* Close the log file */
|
||||||
#ifdef HAVE_SYSLOG_H
|
#ifdef HAVE_SYSLOG_H
|
||||||
if( p_sys->logmode == LOGGER_SYSLOG )
|
if( p_sys->p_file == NULL )
|
||||||
closelog();
|
closelog();
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if( p_sys->logmode == LOGGER_TEXT || p_sys->logmode == LOGGER_HTML )
|
|
||||||
{
|
{
|
||||||
fputs( p_sys->footer, p_sys->p_file );
|
fputs( p_sys->footer, p_sys->p_file );
|
||||||
fclose( p_sys->p_file );
|
fclose( p_sys->p_file );
|
||||||
|
Loading…
Reference in New Issue
Block a user