From: RĂ©mi Denis-Courmont Date: Thu, 10 Dec 2009 16:45:04 +0000 (+0200) Subject: Fix --syslog X-Git-Tag: 1.1.0-ff~2041 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a27a45508085160f814823a2792234d9b16a30b1;p=vlc Fix --syslog psz_logmode is tested for NULLity, so we need to use *NonEmpty*. Also, always delete the variable. If the reference count was 1, we will revert back to the configuration value, which makes no difference. --- diff --git a/src/libvlc.c b/src/libvlc.c index fbe9ccf0f6..07937d6c99 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -946,7 +946,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { - char *logmode = var_CreateGetString( p_libvlc, "logmode" ); + char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); intf_Create( p_libvlc, "logger,none" ); @@ -955,8 +955,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_SetString( p_libvlc, "logmode", logmode ); free( logmode ); } - else - var_Destroy( p_libvlc, "logmode" ); + var_Destroy( p_libvlc, "logmode" ); } #endif