Changeset 372 for cpp/common/hmessage.cpp

Timestamp:

04/22/15 04:14:59 (9 years ago)

Author:

sz

Message:

Renamed some classes and functions to make their purpose more obvious:

• FramMessage?, FMprintf, etc. become Hmessage, Hprintf, etc... (H for handled message).
• ErrorManager? (and its family) becomes MessageHandler?. Handler names reflect their function better, e.g. MessageHandlerToStdout?.

All MessageHandlers? must now be given the explicit "Enable" argument if you want them to automatically become active. This makes side effects clearly visible.

File:

• cpp/common/hmessage.cpp (moved) (moved from cpp/common/framsg.cpp) (3 diffs)

cpp/common/hmessage.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "framsg.h"
+#include "hmessage.h"
 #include <common/nonstd_stdio.h>
 #include "stl-util.h"
 #include "Convert.h"
 
-const char* MSG_LEVEL[]={"[DEBUG] ","","[WARN] ","[ERROR] ","[CRITICAL] "};
+const char* HMSG_LEVEL[]={"[DEBUG] ","","[WARN] ","[ERROR] ","[CRITICAL] "};
 
-void FramMessage(const char *o, const char *m, const char *txt, int w)
+void Hmessage(const char *o, const char *m, const char *txt, int w)
 {
         int line = 0; //all lines except the first one get the "..." prefix
@@ -24 +24 @@
                 {
                         if (*nextsep == 0) //there was only one line! no need to modify it in any way.
-                                _FramMessageSingleLine(o, m, txt, w);
+                                _HmessageSingleLine(o, m, txt, w);
                         else //first line from multi-line
-                                _FramMessageSingleLine(o, m, string(txt, nextsep - txt).c_str(), w);
+                                _HmessageSingleLine(o, m, string(txt, nextsep - txt).c_str(), w);
                 }
                 else //consecutive lines from multi-line
-                        _FramMessageSingleLine(o, m, (FRAMSG_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
+                        _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
                 line++;
                 if ((nextsep[0] == '\r') && (nextsep[1] == '\n'))
@@ -39 +39 @@
 
 
-void FMprintf_va(const char *o,const char *m,int w,const char *bl,va_list va)
+void Hprintf_va(const char *o,const char *m,int w,const char *bl,va_list va)
 {
         string buf=ssprintf_va(bl,va);
-        FramMessage(o,m,buf.c_str(),w);
+        Hmessage(o,m,buf.c_str(),w);
 }
 
-void FMprintf(const char *o,const char *m,int w,const char *bl, ...)
+void Hprintf(const char *o,const char *m,int w,const char *bl, ...)
 {
         va_list argptr;
         va_start(argptr,bl);
-        FMprintf_va(o,m,w,bl,argptr);
+        Hprintf_va(o,m,w,bl,argptr);
         va_end(argptr);
 }
 
-void printFM(const char *bl,...)
+void printH(const char *bl,...)
 {
         va_list argptr;
         va_start(argptr,bl);
-        FMprintf_va("Message","printf",FMLV_INFO,bl,argptr);
+        Hprintf_va("Message","printf",HMLV_INFO,bl,argptr);
         va_end(argptr);
 }