From 08c6bcb98e4f9c6da6dd819becc136efa3455466 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 27 Jul 2013 18:53:27 +0200 Subject: Move logging into context_t --- mmss/gmrf.cpp | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'mmss/gmrf.cpp') diff --git a/mmss/gmrf.cpp b/mmss/gmrf.cpp index 9cda413..1eaa656 100644 --- a/mmss/gmrf.cpp +++ b/mmss/gmrf.cpp @@ -25,7 +25,6 @@ #include "mmss.hpp" -#include "util.hpp" #include @@ -92,37 +91,11 @@ void gmrf_random_bytes(gmrf_t *gmrf, void *buffer, size_t len) { data[i] = rand_r(&gmrf->rand_seed); } -static inline const char* get_log_prefix(int log_level) { - switch(log_level) { - case LOG_CRIT: - return "Fatal: "; - case LOG_ERR: - return "Error: "; - case LOG_WARNING: - return "Warning: "; - case LOG_NOTICE: - return "Info: "; - case LOG_INFO: - return "Verbose: "; - case LOG_DEBUG: - return "DEBUG: "; - default: - return ""; - } -} - void gmrf_logf(gmrf_t *gmrf, int priority, const char *format, ...) { - char buf[1024]; - size_t pos = 0; - - pos += MMSS::snprintf_safe(buf, sizeof(buf), "%s: %s", gmrf->name.c_str(), get_log_prefix(priority)); - va_list ap; va_start(ap, format); - vsnprintf(buf+pos, sizeof(buf)-pos, format, ap); + gmrf->mmss->vlogf_orig(gmrf, priority, format, ap); va_end(ap); - - MMSS::logf(gmrf->mmss, priority, "%s", buf); } } -- cgit v1.2.3