Browse Source

Merge pull request #1208 from trapexit/syslog

Simplify syslog wrapper a bit
pull/1212/head
trapexit 1 year ago
committed by GitHub
parent
commit
775c3cad90
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      libfuse/lib/syslog.c
  2. 14
      src/syslog.cpp

7
libfuse/lib/syslog.c

@ -21,8 +21,6 @@
#include <stdbool.h> #include <stdbool.h>
static bool g_SYSLOG_ENABLED = false;
void void
syslog_open() syslog_open()
{ {
@ -31,14 +29,12 @@ syslog_open()
const int facility = LOG_USER; const int facility = LOG_USER;
openlog(ident,option,facility); openlog(ident,option,facility);
g_SYSLOG_ENABLED = true;
} }
void void
syslog_close() syslog_close()
{ {
closelog(); closelog();
g_SYSLOG_ENABLED = false;
} }
static static
@ -47,9 +43,6 @@ syslog_vlog(const int priority_,
const char *format_, const char *format_,
va_list valist_) va_list valist_)
{ {
if(g_SYSLOG_ENABLED == false)
return;
vsyslog(priority_,format_,valist_); vsyslog(priority_,format_,valist_);
} }

14
src/syslog.cpp

@ -19,7 +19,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <syslog.h> #include <syslog.h>
static bool g_SYSLOG_ENABLED = false;
void void
syslog_open() syslog_open()
@ -29,14 +28,12 @@ syslog_open()
const int facility = LOG_USER; const int facility = LOG_USER;
openlog(ident,option,facility); openlog(ident,option,facility);
g_SYSLOG_ENABLED = true;
} }
void void
syslog_close() syslog_close()
{ {
closelog(); closelog();
g_SYSLOG_ENABLED = false;
} }
void void
@ -44,9 +41,6 @@ syslog_log(const int priority_,
const char *format_, const char *format_,
va_list valist_) va_list valist_)
{ {
if(g_SYSLOG_ENABLED == false)
return;
vsyslog(priority_,format_,valist_); vsyslog(priority_,format_,valist_);
} }
@ -70,7 +64,7 @@ syslog_info(const char *format_,
va_start(valist,format_); va_start(valist,format_);
syslog_log(LOG_INFO,format_,valist); syslog_log(LOG_INFO,format_,valist);
va_end(valist);
va_end(valist);
} }
void void
@ -81,7 +75,7 @@ syslog_notice(const char *format_,
va_start(valist,format_); va_start(valist,format_);
syslog_log(LOG_NOTICE,format_,valist); syslog_log(LOG_NOTICE,format_,valist);
va_end(valist);
va_end(valist);
} }
void void
@ -92,7 +86,7 @@ syslog_warning(const char *format_,
va_start(valist,format_); va_start(valist,format_);
syslog_log(LOG_WARNING,format_,valist); syslog_log(LOG_WARNING,format_,valist);
va_end(valist);
va_end(valist);
} }
void void
@ -103,5 +97,5 @@ syslog_error(const char *format_,
va_start(valist,format_); va_start(valist,format_);
syslog_log(LOG_ERR,format_,valist); syslog_log(LOG_ERR,format_,valist);
va_end(valist);
va_end(valist);
} }
Loading…
Cancel
Save