Reduce amount of log output at level=debug.

[flightgear.git] / src / Main / util.cxx

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 2cd15b5b008a7fa9e10d339a7c17f7eafb4acecf..8dd2bd54d92566778e3d456fc754663ce33a998b 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -17,10 +17,10 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H\r
-#  include <config.h>\r
-#endif\r
-\r
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <math.h>
@@ -28,7 +28,6 @@
 #include <cstdlib>
 
 #include <vector>
-using std::vector;
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/SGLimits.hxx>
@@ -43,6 +42,8 @@ using std::vector;
 #include "osgDB/Registry"
 #endif
 
+using std::vector;
+
 // Originally written by Alex Perry.
 double
 fgGetLowPass (double current, double target, double timeratio)
@@ -70,74 +71,20 @@ fgGetLowPass (double current, double target, double timeratio)
     return current;
 }
 
-
-string
-fgUnescape (const char *s)
-{
-    string r;
-    while (*s) {
-        if (*s != '\\') {
-            r += *s++;
-            continue;
-        }
-        if (!*++s)
-            break;
-        if (*s == '\\') {
-            r += '\\';
-        } else if (*s == 'n') {
-            r += '\n';
-        } else if (*s == 'r') {
-            r += '\r';
-        } else if (*s == 't') {
-            r += '\t';
-        } else if (*s == 'v') {
-            r += '\v';
-        } else if (*s == 'f') {
-            r += '\f';
-        } else if (*s == 'a') {
-            r += '\a';
-        } else if (*s == 'b') {
-            r += '\b';
-        } else if (*s == 'x') {
-            if (!*++s)
-                break;
-            int v = 0;
-            for (int i = 0; i < 2 && isxdigit(*s); i++, s++)
-                v = v * 16 + (isdigit(*s) ? *s - '0' : 10 + tolower(*s) - 'a');
-            r += v;
-            continue;
-
-        } else if (*s >= '0' && *s <= '7') {
-            int v = *s++ - '0';
-            for (int i = 0; i < 3 && *s >= '0' && *s <= '7'; i++, s++)
-                v = v * 8 + *s - '0';
-            r += v;
-            continue;
-
-        } else {
-            r += *s;
-        }
-        s++;
-    }
-    return r;
-}
-
-
 // Write out path to validation node and read it back in. A Nasal
 // listener is supposed to replace the path with a validated version
 // or an empty string otherwise.
 const char *fgValidatePath (const char *str, bool write)
 {
-    static SGPropertyNode_ptr r, w;
-    if (!r) {
-        r = fgGetNode("/sim/paths/validate/read", true);
-        r->setAttribute(SGPropertyNode::READ, true);
-        r->setAttribute(SGPropertyNode::WRITE, true);
-
-        w = fgGetNode("/sim/paths/validate/write", true);
-        w->setAttribute(SGPropertyNode::READ, true);
-        w->setAttribute(SGPropertyNode::WRITE, true);
-    }
+    SGPropertyNode_ptr r, w;
+    r = fgGetNode("/sim/paths/validate/read", true);
+    r->setAttribute(SGPropertyNode::READ, true);
+    r->setAttribute(SGPropertyNode::WRITE, true);
+
+    w = fgGetNode("/sim/paths/validate/write", true);
+    w->setAttribute(SGPropertyNode::READ, true);
+    w->setAttribute(SGPropertyNode::WRITE, true);
+
     SGPropertyNode *prop = write ? w : r;
     prop->setStringValue(str);
     const char *result = prop->getStringValue();