Changeset 244

Timestamp:

05/31/14 21:31:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Printing multi-line messages splits the message into separate lines and adds "..." prefix

Location:

cpp

Files:

• common/framsg.cpp (modified) (1 diff)
• common/framsg.h (modified) (1 diff)
• common/nonstd.h (modified) (1 diff)
• frams/errmgr/errmanager.cpp (modified) (1 diff)
• frams/errmgr/stdouterr.cpp (modified) (1 diff)

cpp/common/framsg.cpp

@@ -9 +9 @@
 
 const char* MSG_LEVEL[]={"DEBUG","INFO","WARN","ERROR","CRITICAL"};
+
+void FramMessage(const char *o, const char *m, const char *txt, int w)
+{
+        int line = 0; //all lines except the first one get the "..." prefix
+        const char* nextsep;
+        do
+        {
+                nextsep = strchr(txt, '\n');
+                if (nextsep == NULL) //last chunk, until the end
+                        nextsep = strchr(txt, '\0');
+                if ((nextsep > txt) && (nextsep[-1] == '\r'))
+                        nextsep--;
+                if (line == 0)
+                {
+                        if (*nextsep == 0) //there was only one line! no need to modify it in any way.
+                                _FramMessageSingleLine(o, m, txt, w);
+                        else //first line from multi-line
+                                _FramMessageSingleLine(o, m, string(txt, nextsep - txt).c_str(), w);
+                }
+                else //consecutive lines from multi-line
+                        _FramMessageSingleLine(o, m, ("..." + 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'))
+                        txt = nextsep + 2;
+                else if (*nextsep)
+                        txt = nextsep + 1;
+        } while (*nextsep);
+}
+
 
 void FMprintf_va(const char *o,const char *m,int w,const char *bl,va_list va)

cpp/common/framsg.h

@@ -13 +13 @@
 void FMprintf_va(const char *o,const char *m,int w,const char *bl,va_list va); //a different name than FMprintf - otherwise the compiler could confuse the "string" parameter with va_list and could call the wrong function
 void printFM(const char *bl,...); //a shorthand for printf (a different name again to avoid the risk of confusion with the two functions above. This would be unlikely but possible when the argument types would match)
-void FramMessage(const char *o,const char *m,const char *bl,int w);
+void FramMessage(const char *o,const char *m,const char *txt,int w);
+
+void _FramMessageSingleLine(const char *o,const char *m,const char *txt,int w); //don't call this directly - it is used internally
 
 #define FMLV_DEBUG -1

cpp/common/nonstd.h

@@ -57 +57 @@
 #endif
 
-#ifdef MACOS
+#if defined MACOS || defined __ANDROID__
  #define stricmp(a,b) strcasecmp(a,b)
 #endif

cpp/frams/errmgr/errmanager.cpp

@@ -6 +6 @@
 #include <common/stl-util.h>
 
-void FramMessage(const char *o,const char *m,const char *bl,int w)
+void _FramMessageSingleLine(const char *o, const char *m, const char *txt, int w)
 {
-tlsGetRef(errmgr_instance).send(o,m,bl,w);
+tlsGetRef(errmgr_instance).send(o,m,txt,w);
 }
 

cpp/frams/errmgr/stdouterr.cpp

@@ -10 +10 @@
 #endif
 
-void StdoutErrorHandler::handle(const char *o,const char *m,const char *bl,int w)
+void StdoutErrorHandler::handle(const char *o, const char *m, const char *bl, int w)
 {
-if (w<-1) w=-1; else if (w>3) w=3;
+        if (w < -1) w = -1; else if (w>3) w = 3;
 #ifdef SHP
-AppLog("[%s] %s::%s - %s\n",MSG_LEVEL[w+1],o,m,bl);
+        AppLog("[%s] %s::%s - %s\n",MSG_LEVEL[w+1],o,m,bl);
 #else
-if (file)
-        file->printf("[%s] %s::%s - %s\n",MSG_LEVEL[w+1],o,m,bl);
-else
-        printf("[%s] %s::%s - %s\n",MSG_LEVEL[w+1],o,m,bl);
+        if (file)
+                file->printf("[%s] %s::%s - %s\n", MSG_LEVEL[w + 1], o, m, bl);
+        else
+                printf("[%s] %s::%s - %s\n", MSG_LEVEL[w + 1], o, m, bl);
 #endif
 }