Merge "Making DALi core internals typesafe using guaranteed types; uint8_t, uint32_t...

[platform/core/uifw/dali-core.git] / dali / public-api / common / dali-common.cpp

diff --git a/dali/public-api/common/dali-common.cpp b/dali/public-api/common/dali-common.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 7117774..42d1331
--- a/dali/public-api/common/dali-common.cpp
+++ b/dali/public-api/common/dali-common.cpp
@@ -38,7 +38,7 @@ namespace Dali
 
 namespace
 {
-const int MAX_NUM_STACK_FRAMES = 25;
+const int32_t MAX_NUM_STACK_FRAMES = 25;
 }
 
 std::string Demangle(const char* symbol)
@@ -74,7 +74,7 @@ std::string Demangle(const char* symbol)
         mangledSymbol[tokenLength] = '\0';
 
         size_t size;
-        int    status;
+        int32_t    status;
         char*  demangled=NULL;
         demangled = abi::__cxa_demangle( mangledSymbol, NULL, &size, &status );
         if( demangled != NULL )
@@ -110,35 +110,18 @@ DALI_CORE_API DaliException::DaliException( const char* location, const char* co
 
   DALI_LOG_ERROR_NOFN("Backtrace:\n");
 
-  std::string tmpString("\n=== DALi Native Excetion Info ===");
-  //appending condition
-  tmpString.append("\nCONDITION: ");
-  tmpString.append(condition);
-  //appending back-trace
-  tmpString.append("\nBACKTRACE: \n");
-
   void* frameArray[MAX_NUM_STACK_FRAMES];
-  int nSize = backtrace(frameArray, MAX_NUM_STACK_FRAMES);
+  int32_t nSize = backtrace(frameArray, MAX_NUM_STACK_FRAMES);
   char** symbols = backtrace_symbols(frameArray, nSize);
-  for(int i=1; i< nSize; i++)
+  for(int32_t i=1; i< nSize; i++)
   {
     std::string demangled_symbol = Demangle(symbols[i]);
     DALI_LOG_ERROR_NOFN("[%02d]   %s\n", i, demangled_symbol.c_str() );
-
-    tmpString.append("[");
-    tmpString.append(std::to_string(i));
-    tmpString.append("]  ");
-    tmpString.append(demangled_symbol);
-    tmpString.append("\n");
   }
   free(symbols);
-
-  tmpString.append("=================================\n\0");
-
-  info = static_cast<char*>(malloc( tmpString.size() * sizeof(char)) );
-  strncpy(info, tmpString.c_str(), tmpString.size());
 }
 
+
 #else // BACKTRACE_ENABLED
 
 DALI_CORE_API DaliException::DaliException( const char* location, const char* condition )