Changeset 375 for cpp/frams/param

Timestamp:

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

Author:

Maciej Komosinski

Message:

Renamed logging functions to more intuitive and simple names

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (5 diffs)
• param.cpp (modified) (12 diffs)
• param.h (modified) (2 diffs)

cpp/frams/param/multiparamload.cpp

@@ -5 +5 @@
 #include "multiparamload.h"
 #include <frams/util/sstringutils.h>
-#include "common/hmessage.h"
+#include "common/log.h"
 #include <ctype.h>
 
@@ -107 +107 @@
         else if (status==BeforeUnknown)
                 {
-                Hprintf("MultiParamLoader","go",HMLV_WARN,"Skipping object '%s'",lastunknown.c_str());
+                logPrintf("MultiParamLoader","go",LOG_WARN,"Skipping object '%s'",lastunknown.c_str());
                 loadObjectNow(&emptyparam,false);
                 continue;
@@ -137 +137 @@
                                 {
                                 const char* thisfilename=file->VgetPath();
-                                Hprintf("MultiParamLoader","go",HMLV_WARN,"invalid \"%s\"%s%s",buf.c_str(),
+                                logPrintf("MultiParamLoader","go",LOG_WARN,"invalid \"%s\"%s%s",buf.c_str(),
                                          (thisfilename?" in ":""),(thisfilename?thisfilename:""));
                                 }
@@ -204 +204 @@
 if (alreadyIncluded(newfilename.c_str()))
         {
-        Hprintf("MultiParamLoader","include",HMLV_WARN,"circular reference ignored (\"%s\")",
+        logPrintf("MultiParamLoader","include",LOG_WARN,"circular reference ignored (\"%s\")",
                     filename.c_str());
         return;
@@ -212 +212 @@
 if (!f)
         {
-        Hprintf("MultiParamLoader","include",HMLV_WARN,"\"%s\" not found",newfilename.c_str());
+        logPrintf("MultiParamLoader","include",LOG_WARN,"\"%s\" not found",newfilename.c_str());
         }
 else

cpp/frams/param/param.cpp

@@ -8 +8 @@
 #include "param.h"
 #include <frams/util/extvalue.h>
-#include "common/hmessage.h"
+#include "common/log.h"
 #include <frams/util/sstringutils.h>
 
@@ -445 +445 @@
                 {
                         SString name(p0, p_len);
-                        Hprintf("ParamInterface", "load", HMLV_WARN, "Ignored unknown property '%s' while reading object '%s'", name.c_str(), getName());
+                        logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unknown property '%s' while reading object '%s'", name.c_str(), getName());
                 }
 
@@ -518 +518 @@
         case 'o':       ret.setObject(getObject(i)); break;
         case 'x':       ret = getExtValue(i); break;
-        default: Hprintf("ParamInterface", "get", HMLV_ERROR, "'%s.%s' is not a field", getName(), id(i));
+        default: logPrintf("ParamInterface", "get", LOG_ERROR, "'%s.%s' is not a field", getName(), id(i));
         }
 }
@@ -562 +562 @@
                         if (v.type == TObj)
                         {
-                                Hprintf("ParamInterface", "set", HMLV_WARN, "Getting integer value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting integer value from object reference (%s)", v.getString().c_str());
                                 return 0;
                         }
@@ -574 +574 @@
                         if (v.type == TObj)
                         {
-                                Hprintf("ParamInterface", "set", HMLV_WARN, "Getting floating point value from object reference (%s)", v.getString().c_str());
+                                logPrintf("ParamInterface", "set", LOG_WARN, "Getting floating point value from object reference (%s)", v.getString().c_str());
                                 return 0;
                         }
@@ -583 +583 @@
         case 'o': return setObject(i, v.getObject());
         case 'x': return setExtValue(i, v);
-        default: Hprintf("ParamInterface", "set", HMLV_ERROR, "'%s.%s' is not a field", getName(), id(i));
+        default: logPrintf("ParamInterface", "set", LOG_ERROR, "'%s.%s' is not a field", getName(), id(i));
         }
         return 0;
@@ -605 +605 @@
                         if ((after == NULL) || (*after))
                         {
-                                Hprintf("ParamInterface", "set", HMLV_WARN, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
+                                logPrintf("ParamInterface", "set", LOG_WARN, "serialization format mismatch in %s.%s", (getName() ? getName() : "<Unknown>"), id(i));
                                 e.setEmpty();
                         }
@@ -690 +690 @@
         }
         if (err!=NULL)
-                Hprintf("SimpleAbstractParam","sanityCheck", HMLV_ERROR,
+                logPrintf("SimpleAbstractParam","sanityCheck", LOG_ERROR,
                 "Invalid ParamEntry for %s.%s (%s)", getName(), pe->id, err);
 }       
@@ -961 +961 @@
         else
         {
-                Hprintf("SimpleAbstractParam", "call", HMLV_ERROR,
+                logPrintf("SimpleAbstractParam", "call", LOG_ERROR,
                         (*pe->type != 'p') ? "'%s.%s' is not a function" : "Internal error - undefined function pointer for '%s.%s'", getName(), pe->id);
                 ret->setInvalid();
@@ -1060 +1060 @@
                         {
                                 SString name(t, (int)(equals_sign - t));
-                                Hprintf("Param", "load2", HMLV_WARN, "Unknown property '%s' while reading object '%s' (ignored)", name.c_str(), getName());
+                                logPrintf("Param", "load2", LOG_WARN, "Unknown property '%s' while reading object '%s' (ignored)", name.c_str(), getName());
                         }
                         t = equals_sign + 1; // t=value
@@ -1070 +1070 @@
 #endif
                         {
-                        Hprintf("Param", "load2", HMLV_WARN, "Missing property name in '%s' (assuming '%s')",
+                        logPrintf("Param", "load2", LOG_WARN, "Missing property name in '%s' (assuming '%s')",
                                 getName(), id(i) ? id(i) : "unknown property?");
                         }
@@ -1092 +1092 @@
                         fields_loaded++;
                         if (ret&(PSET_HITMAX | PSET_HITMIN))
-                                Hprintf("Param", "load2", HMLV_WARN, "Adjusted '%s' in '%s' (was too %s)",
+                                logPrintf("Param", "load2", LOG_WARN, "Adjusted '%s' in '%s' (was too %s)",
                                 id(i), getName(), (ret&PSET_HITMAX) ? "big" : "small");
                         *(char*)valstop = remember;

cpp/frams/param/param.h

@@ -12 +12 @@
 #include <frams/util/statrick.h>
 #include <frams/virtfile/virtfile.h>
-#include <common/hmessage.h>
+#include <common/log.h>
 
 class ExtValue;
@@ -273 +273 @@
                         SString svaluetoset = SString::valueOf(valuetoset); //converts any type to SString
                         SString actual = get(i);
-                        Hprintf("Param", "set", HMLV_WARN, "Setting '%s.%s = %s' exceeded allowed range (too %s). Adjusted to %s.",
+                        logPrintf("Param", "set", LOG_WARN, "Setting '%s.%s = %s' exceeded allowed range (too %s). Adjusted to %s.",
                                 getName(), id(i), svaluetoset.c_str(), (setflags&PSET_HITMAX) ? "big" : "small", actual.c_str());
                 }