From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 12 Jun 2012 11:58:36 +0000 (+0200)
Subject: - changed signature of logging functions
X-Git-Tag: v0.1.3~219^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=837f640b9c57f7fb8bbb0c2cf12ba7dc2396e886;p=thirdparty%2Fsnapper.git

- changed signature of logging functions
---

diff --git a/snapper/Log.cc b/snapper/Log.cc
index 66d4f5da..82c9152d 100644
--- a/snapper/Log.cc
+++ b/snapper/Log.cc
@@ -29,10 +29,13 @@ namespace snapper
     using namespace std;
 
 
+    const string component = "libsnapper";
+
+
     bool
     testLogLevel(LogLevel level)
     {
-	return callLogQuery(level, "libsnapper");
+	return callLogQuery(level, component);
     }
 
 
@@ -58,7 +61,7 @@ namespace snapper
     logStreamClose(LogLevel level, const char* file, unsigned line, const char* func,
 		   ostringstream* stream)
     {
-	callLogDo(level, "libsnapper", file, line, func, stream->str());
+	callLogDo(level, component, file, line, func, stream->str());
 	delete stream;
     }
 
diff --git a/snapper/Logger.cc b/snapper/Logger.cc
index 1680b99a..fbbff3d0 100644
--- a/snapper/Logger.cc
+++ b/snapper/Logger.cc
@@ -58,7 +58,7 @@ namespace snapper
 
 
     static void
-    simple_log_do(LogLevel level, const char* component, const char* file, int line,
+    simple_log_do(LogLevel level, const string& component, const char* file, int line,
 		  const char* func, const string& text)
     {
 	static const char* ln[4] = { "DEB", "MIL", "WAR", "ERR" };
@@ -92,14 +92,14 @@ namespace snapper
 
 
     static bool
-    simple_log_query(LogLevel level, const char* component)
+    simple_log_query(LogLevel level, const string& component)
     {
 	return level != DEBUG;
     }
 
 
     void
-    callLogDo(LogLevel level, const char* component, const char* file, int line,
+    callLogDo(LogLevel level, const string& component, const char* file, int line,
 	      const char* func, const string& text)
     {
 	if (log_do)
@@ -110,7 +110,7 @@ namespace snapper
 
 
     bool
-    callLogQuery(LogLevel level, const char* component)
+    callLogQuery(LogLevel level, const string& component)
     {
 	if (log_query)
 	    return (log_query)(level, component);
diff --git a/snapper/Logger.h b/snapper/Logger.h
index 99d10fca..d7b78166 100644
--- a/snapper/Logger.h
+++ b/snapper/Logger.h
@@ -36,19 +36,19 @@ namespace snapper
     /*
      * Called function should be able to split content at newlines.
      */
-    typedef void (*LogDo)(LogLevel level, const char* component, const char* file, int line,
+    typedef void (*LogDo)(LogLevel level, const string& component, const char* file, int line,
 			  const char* func, const string& content);
 
-    typedef bool (*LogQuery)(LogLevel level, const char* component);
+    typedef bool (*LogQuery)(LogLevel level, const string& component);
 
     void setLogDo(LogDo log_do);
 
     void setLogQuery(LogQuery log_query);
 
-    void callLogDo(LogLevel level, const char* component, const char* file, int line,
+    void callLogDo(LogLevel level, const string& component, const char* file, int line,
 		   const char* func, const string& text);
 
-    bool callLogQuery(LogLevel level, const char* component);
+    bool callLogQuery(LogLevel level, const string& component);
 
     void initDefaultLogger();