Changeset 375 for cpp/common/log.cpp

Timestamp:

04/26/15 00:59:09 (9 years ago)

Author:

Maciej Komosinski

Message:

Renamed logging functions to more intuitive and simple names

File:

• cpp/common/log.cpp (moved) (moved from cpp/common/hmessage.cpp) (2 diffs)

cpp/common/log.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "hmessage.h"
+#include "log.h"
 #include <common/nonstd_stdio.h>
 #include "stl-util.h"
 #include "Convert.h"
 
-const char* HMSG_LEVEL[]={"[DEBUG] ","","[WARN] ","[ERROR] ","[CRITICAL] "};
+const char* LOG_LEVEL[] = { "[DEBUG] ", "", "[WARN] ", "[ERROR] ", "[CRITICAL] " };
 
-void Hmessage(const char *o, const char *m, const char *txt, int w)
+void logMessage(const char *obj, const char *method, int level, const char *msg)
 {
         int line = 0; //all lines except the first one get the "..." prefix
@@ -16 +16 @@
         do
         {
-                nextsep = strchr(txt, '\n');
+                nextsep = strchr(msg, '\n');
                 if (nextsep == NULL) //last chunk, until the end
-                        nextsep = strchr(txt, '\0');
-                if ((nextsep > txt) && (nextsep[-1] == '\r'))
+                        nextsep = strchr(msg, '\0');
+                if ((nextsep > msg) && (nextsep[-1] == '\r'))
                         nextsep--;
                 if (line == 0)
                 {
                         if (*nextsep == 0) //there was only one line! no need to modify it in any way.
-                                _HmessageSingleLine(o, m, txt, w);
+                                _logMessageSingleLine(obj, method, level, msg);
                         else //first line from multi-line
-                                _HmessageSingleLine(o, m, string(txt, nextsep - txt).c_str(), w);
+                                _logMessageSingleLine(obj, method, level, string(msg, nextsep - msg).c_str());
                 }
                 else //consecutive lines from multi-line
-                        _HmessageSingleLine(o, m, (HMSG_MULTILINE_CONTINUATION + string(txt, nextsep - txt)).c_str(), w); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
+                        _logMessageSingleLine(obj, method, level, (LOG_MULTILINE_CONTINUATION + string(msg, nextsep - msg)).c_str()); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
                 line++;
                 if ((nextsep[0] == '\r') && (nextsep[1] == '\n'))
-                        txt = nextsep + 2;
+                        msg = nextsep + 2;
                 else if (*nextsep)
-                        txt = nextsep + 1;
+                        msg = nextsep + 1;
         } while (*nextsep);
 }
 
 
-void Hprintf_va(const char *o,const char *m,int w,const char *bl,va_list va)
+void logPrintf_va(const char *obj, const char *method, int level, const char *msgf, va_list va)
 {
-        string buf=ssprintf_va(bl,va);
-        Hmessage(o,m,buf.c_str(),w);
+        string buf = ssprintf_va(msgf, va);
+        logMessage(obj, method, level, buf.c_str());
 }
 
-void Hprintf(const char *o,const char *m,int w,const char *bl, ...)
+void logPrintf(const char *obj, const char *method, int level, const char *msgf, ...)
 {
         va_list argptr;
-        va_start(argptr,bl);
-        Hprintf_va(o,m,w,bl,argptr);
+        va_start(argptr, msgf);
+        logPrintf_va(obj, method, level, msgf, argptr);
         va_end(argptr);
 }
 
-void printH(const char *bl,...)
+void log_printf(const char *msgf, ...)
 {
         va_list argptr;
-        va_start(argptr,bl);
-        Hprintf_va("Message","printf",HMLV_INFO,bl,argptr);
+        va_start(argptr, msgf);
+        logPrintf_va("Message", "printf", LOG_INFO, msgf, argptr);
         va_end(argptr);
 }