Changeset 372 for cpp/common

Timestamp:

04/22/15 04:14:59 (10 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.

Location:

cpp/common

Files:

• hmessage.cpp (moved) (moved from cpp/common/framsg.cpp) (3 diffs)
• hmessage.h (moved) (moved from cpp/common/framsg.h) (1 diff)
• nonstd_math.cpp (modified) (4 diffs)
• nonstd_stdio.cpp (modified) (3 diffs)
• stl-util.cpp (modified) (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);
 }

cpp/common/hmessage.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _FRAMSG_H_
-#define _FRAMSG_H_
+#ifndef _HMESSAGE_H_
+#define _HMESSAGE_H_
 
 #include <stdarg.h>
 
-extern const char* MSG_LEVEL[];
-#define FRAMSG_FORMAT "%s%s.%s: %s"
-#define FRAMSG_MULTILINE_CONTINUATION "..."
+extern const char* HMSG_LEVEL[];
+#define HMSG_FORMAT "%s%s.%s: %s"
+#define HMSG_MULTILINE_CONTINUATION "..."
 
-void FMprintf(const char *o,const char *m,int w,const char *bl, ...);
-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 *txt,int w);
+void Hprintf(const char *o,const char *m,int w,const char *bl, ...);
+void Hprintf_va(const char *o,const char *m,int w,const char *bl,va_list va); //a different name than Hprintf - otherwise the compiler could confuse the "string" parameter with va_list and could call the wrong function
+void printH(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 Hmessage(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
+void _HmessageSingleLine(const char *o,const char *m,const char *txt,int w); //don't call this directly - it is used internally
 
-#define FMLV_DEBUG -1
-#define FMLV_INFO 0
-#define FMLV_WARN 1
-#define FMLV_ERROR 2
-#define FMLV_CRITICAL 3
+#define HMLV_DEBUG -1
+#define HMLV_INFO 0
+#define HMLV_WARN 1
+#define HMLV_ERROR 2
+#define HMLV_CRITICAL 3
 
 /*

cpp/common/nonstd_math.cpp

@@ -81 +81 @@
 // But it was resolved by restarting windows and cleaning all intermediate compilation files :o (restarting windows was the key element! restarting BC++Builder and deleting files would not help)
 
-#include "framsg.h"
+#include "hmessage.h"
 
 unsigned int fp_control_word_std;
@@ -89 +89 @@
 {
         //unsigned int was=_clear87();
-        //FMprintf("","fpExceptInit",FMLV_INFO,"control87 status before clear was %08x", was);
+        //Hprintf("","fpExceptInit",HMLV_INFO,"control87 status before clear was %08x", was);
         fp_control_word_std=_control87(0, 0);             //4978 = 1001101110010
         // Make the new fp env same as the old one, except for the changes we're going to make
@@ -98 +98 @@
 {
         unsigned int was=_clear87(); //trzeba czyscic zeby nie bylo exception...
-        //FMprintf("","fpExceptEnable ",FMLV_INFO,"control87 status before clear was %08x", was);
+        //Hprintf("","fpExceptEnable ",HMLV_INFO,"control87 status before clear was %08x", was);
         _control87(fp_control_word_std, 0xffffffff);
-        //FMprintf("","fpExceptEnable ",FMLV_INFO,"control87 flags are %08x", _control87(0, 0)); //kontrola co sie ustawilo
+        //Hprintf("","fpExceptEnable ",HMLV_INFO,"control87 flags are %08x", _control87(0, 0)); //kontrola co sie ustawilo
 }
 
@@ -106 +106 @@
 {
         unsigned int was=_clear87(); //trzeba czyscic zeby nie bylo exception...
-        //FMprintf("","fpExceptDisable",FMLV_INFO,"control87 status before clear was %08x", was);
+        //Hprintf("","fpExceptDisable",HMLV_INFO,"control87 status before clear was %08x", was);
         _control87(fp_control_word_muted, 0xffffffff);
-        //FMprintf("","fpExceptDisable",FMLV_INFO,"control87 flags are %08x", _control87(0, 0)); //kontrola co sie ustawilo
+        //Hprintf("","fpExceptDisable",HMLV_INFO,"control87 flags are %08x", _control87(0, 0)); //kontrola co sie ustawilo
 }
 

cpp/common/nonstd_stdio.cpp

@@ -241 +241 @@
 
 #ifdef __ANDROID__
-#include "framsg.h"
+#include "hmessage.h"
 #include "nonstd.h"
 #include "nonstd_stl.h"
@@ -247 +247 @@
 {
         string respath=getAppResourcesDir();
-        //printFM("Opening '%s', mode='%s'",path,mode);
-        //printFM("getAppResourcesDir()='%s'",respath.c_str());
+        //printH("Opening '%s', mode='%s'",path,mode);
+        //printH("getAppResourcesDir()='%s'",respath.c_str());
         NvFile *rfile=NULL; //can only read
         FILE *rwfile=NULL;
@@ -255 +255 @@
                 path+=respath.length(); //strip the prefix, we need a relative path in assets
                 if (strstr(mode,"w"))
-                        printFM("Warning: attempt to open a read-only resource '%s' in writable mode '%s'",path,mode);
+                        printH("Warning: attempt to open a read-only resource '%s' in writable mode '%s'",path,mode);
                 rfile=NvFOpen(path); //"mode" not supported! can only read
-                //printFM("Opened RES file as %p",rfile);
+                //printH("Opened RES file as %p",rfile);
                 if (rfile==NULL) return NULL;
         } else //a "normal" access (HOME)
         {
                 rwfile=fopen(path,mode);
-                //printFM("Opened HOME file as %p",rwfile);
+                //printH("Opened HOME file as %p",rwfile);
                 if (rwfile==NULL) return NULL;
         }

cpp/common/stl-util.cpp

@@ -9 +9 @@
 #include "Convert.h"
 #include "nonstd.h"
-#include "framsg.h"
+#include "hmessage.h"
 #include <assert.h>
 #ifdef USE_VIRTFILE
@@ -107 +107 @@
         }
         if (warn_on_missing_file && !ok)
-                FMprintf("stl-util", "readCompleteFile", FMLV_WARN, "Couldn't open file '%s'", filename);
+                Hprintf("stl-util", "readCompleteFile", HMLV_WARN, "Couldn't open file '%s'", filename);
         return ok;
 }
@@ -137 +137 @@
         }
         if (warn_on_fail && !ok)
-                FMprintf("stl-util", "writeCompleteFile", FMLV_WARN, "couldn't write file '%s'", filename);
+                Hprintf("stl-util", "writeCompleteFile", HMLV_WARN, "couldn't write file '%s'", filename);
         return ok;
 }