Merge branch 'master' into windows+cc

[ardour.git] / libs / pbd / stacktrace.cc

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index b78f0e93388ec3b5bc926b7cc73709d2f964e0a6..a51dbc934d7d0306ee230937526c4bf8dc52c401 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -35,37 +35,45 @@ PBD::trace_twb ()
 #include <execinfo.h>
 #include <cxxabi.h>
 
-std::string demangle (std::string const & l)
+static std::string 
+symbol_demangle (const std::string& l)
+{
+       int status;
+
+       try {
+               
+               char* realname = abi::__cxa_demangle (l.c_str(), 0, 0, &status);
+               std::string d (realname);
+               free (realname);
+               return d;
+       } catch (std::exception) {
+               
+       }
+
+       return l;
+}
+
+std::string 
+PBD::demangle (std::string const & l)
 {
        std::string::size_type const b = l.find_first_of ("(");
+
        if (b == std::string::npos) {
-               return l;
+               return symbol_demangle (l);
        }
 
        std::string::size_type const p = l.find_last_of ("+");
        if (p == std::string::npos) {
-               return l;
+               return symbol_demangle (l);
        }
 
        if ((p - b) <= 1) {
-               return l;
+               return symbol_demangle (l);
        }
        
        std::string const fn = l.substr (b + 1, p - b - 1);
 
-       int status;
-       try {
-               
-               char* realname = abi::__cxa_demangle (fn.c_str(), 0, 0, &status);
-               std::string d (realname);
-               free (realname);
-               return d;
-               
-       } catch (std::exception) {
-               
-       }
-       
-       return l;
+       return symbol_demangle (fn);
 }
 
 void