diff options
Diffstat (limited to 'log.c')
| -rw-r--r-- | log.c | 40 |
1 files changed, 20 insertions, 20 deletions
@@ -57,7 +57,7 @@ #include "log-internal.h" -static void _warn_helper(int severity, const char *errstr, const char *fmt, +static void warn_helper_(int severity, const char *errstr, const char *fmt, va_list ap); static void event_log(int severity, const char *msg); static void event_exit(int errcode) EV_NORETURN; @@ -72,13 +72,13 @@ static event_fatal_cb fatal_fn = NULL; #endif #ifdef USE_GLOBAL_FOR_DEBUG_LOGGING -ev_uint32_t _event_debug_logging_mask = DEFAULT_MASK; +ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK; #else -static ev_uint32_t _event_debug_logging_mask = DEFAULT_MASK; +static ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK; ev_uint32_t -_event_debug_get_logging_mask(void) +event_debug_get_logging_mask_(void) { - return _event_debug_logging_mask; + return event_debug_logging_mask_; } #endif #endif /* EVENT_DEBUG_LOGGING_ENABLED */ @@ -95,7 +95,7 @@ event_exit(int errcode) if (fatal_fn) { fatal_fn(errcode); exit(errcode); /* should never be reached */ - } else if (errcode == _EVENT_ERR_ABORT) + } else if (errcode == EVENT_ERR_ABORT_) abort(); else exit(errcode); @@ -107,7 +107,7 @@ event_err(int eval, const char *fmt, ...) va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_ERR, strerror(errno), fmt, ap); + warn_helper_(EVENT_LOG_ERR, strerror(errno), fmt, ap); va_end(ap); event_exit(eval); } @@ -118,7 +118,7 @@ event_warn(const char *fmt, ...) va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_WARN, strerror(errno), fmt, ap); + warn_helper_(EVENT_LOG_WARN, strerror(errno), fmt, ap); va_end(ap); } @@ -129,7 +129,7 @@ event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...) int err = evutil_socket_geterror(sock); va_start(ap, fmt); - _warn_helper(_EVENT_LOG_ERR, evutil_socket_error_to_string(err), fmt, ap); + warn_helper_(EVENT_LOG_ERR, evutil_socket_error_to_string(err), fmt, ap); va_end(ap); event_exit(eval); } @@ -141,7 +141,7 @@ event_sock_warn(evutil_socket_t sock, const char *fmt, ...) int err = evutil_socket_geterror(sock); va_start(ap, fmt); - _warn_helper(_EVENT_LOG_WARN, evutil_socket_error_to_string(err), fmt, ap); + warn_helper_(EVENT_LOG_WARN, evutil_socket_error_to_string(err), fmt, ap); va_end(ap); } @@ -151,7 +151,7 @@ event_errx(int eval, const char *fmt, ...) va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_ERR, NULL, fmt, ap); + warn_helper_(EVENT_LOG_ERR, NULL, fmt, ap); va_end(ap); event_exit(eval); } @@ -162,7 +162,7 @@ event_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_WARN, NULL, fmt, ap); + warn_helper_(EVENT_LOG_WARN, NULL, fmt, ap); va_end(ap); } @@ -172,22 +172,22 @@ event_msgx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_MSG, NULL, fmt, ap); + warn_helper_(EVENT_LOG_MSG, NULL, fmt, ap); va_end(ap); } void -_event_debugx(const char *fmt, ...) +event_debugx_(const char *fmt, ...) { va_list ap; va_start(ap, fmt); - _warn_helper(_EVENT_LOG_DEBUG, NULL, fmt, ap); + warn_helper_(EVENT_LOG_DEBUG, NULL, fmt, ap); va_end(ap); } static void -_warn_helper(int severity, const char *errstr, const char *fmt, va_list ap) +warn_helper_(int severity, const char *errstr, const char *fmt, va_list ap) { char buf[1024]; size_t len; @@ -223,16 +223,16 @@ event_log(int severity, const char *msg) else { const char *severity_str; switch (severity) { - case _EVENT_LOG_DEBUG: + case EVENT_LOG_DEBUG: severity_str = "debug"; break; - case _EVENT_LOG_MSG: + case EVENT_LOG_MSG: severity_str = "msg"; break; - case _EVENT_LOG_WARN: + case EVENT_LOG_WARN: severity_str = "warn"; break; - case _EVENT_LOG_ERR: + case EVENT_LOG_ERR: severity_str = "err"; break; default: |