Disable HERE prefix calculation heuristic if it does not work instead of

asserting that the heuristic always works (it does not).

Polished comments.

More work needed to come up with a better heuristic.

diff --git a/src/debug.cc b/src/debug.cc
index bbd9da8c6dadb29bc19be091bc682eab2e825633..2d32598ee2858257bc3772cb091a7b376500c0a1 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -751,16 +751,15 @@ std::ostringstream (*Debug::CurrentDebug)(NULL);
 const size_t
 BuildPrefixInit()
 {
-
-    /* Anyone moving the src/Debug.cc file MUST record its new location here,
-     * or there will be issues in the debugging statements, possibly fatal!
-     */
-
+    // XXX: This must be kept in sync with the actual debug.cc location
     const char *ThisFileNameTail = "src/debug.cc";
 
-    //leave immediately if misconfigured. Unfortunately not possible to detect at build
     const char *file=__FILE__;
-    assert(strstr(file,ThisFileNameTail)!=NULL);
+
+    // Disable heuristic if it does not work.
+    if (!strstr(file, ThisFileNameTail))
+               return 0;
+
     return strlen(file)-strlen(ThisFileNameTail);
 }