More cleanups

1 files changed, 1 insertions, 46 deletions

diff --git a/mmss/log.cpp b/mmss/log.cpp
index 029b1d6..b66cf6f 100644
--- a/mmss/log.cpp
+++ b/mmss/log.cpp
@@ -25,41 +25,10 @@
 
 
 #include "mmss.hpp"
-
-#include <cstdarg>
-#include <cstdio>
-
+#include "util.hpp"
 
 namespace MMSS {
 
-static inline int snprintf_safe(char *buffer, size_t size, const char *format, ...) {
-	std::va_list ap;
-	va_start(ap, format);
-	int ret = std::vsnprintf(buffer, size, format, ap);
-	va_end(ap);
-
-	return ret < 0 ? 0 : ret > size ? size : ret;
-}
-
-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 logf(context_t *mmss, int priority, const char *format, ...) {
 	char buf[1024];
 	size_t pos = 0;
@@ -75,17 +44,3 @@ void logf(context_t *mmss, int priority, const char *format, ...) {
 }
 
 }
-
-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, MMSS::get_log_prefix(priority));
-
-	va_list ap;
-	va_start(ap, format);
-	vsnprintf(buf+pos, sizeof(buf)-pos, format, ap);
-	va_end(ap);
-
-	MMSS::logf(gmrf->mmss, priority, "%s", buf);
-}