CAudioError: revise exception string format and the concatenate logic

[Version] 0.5.32
[Issue Type] Revise

Change-Id: I5ec5324f72d838b19a4d39387d82bcaa8ccfca3b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02254b4..1c72833 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -fPIC -Wall -Werror -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 
 IF("${ARCH}" STREQUAL "arm")

diff --git a/include/CAudioIODef.h b/include/CAudioIODef.h
index d400d43..a739eca 100644 (file)
--- a/include/CAudioIODef.h
+++ b/include/CAudioIODef.h
@@ -76,12 +76,12 @@
 #define COLOR_END
 #endif
 
-#define THROW_ERROR_MSG(_x_, _msg_) do {throw  CAudioError((_x_), (_msg_), __BASE_FILE__, __func__, __LINE__);} while (0)
+#define THROW_ERROR_MSG(_x_, _msg_) do {throw  CAudioError((_x_), (_msg_), __FILENAME__, __func__, __LINE__);} while (0)
 
 #define THROW_ERROR_MSG_FORMAT(_x_, _format_, ...) do {                   \
     char _msg_[CAudioError::MSG_LENGTH] = {0, };                       \
     snprintf(_msg_, CAudioError::MSG_LENGTH, _format_, ##__VA_ARGS__); \
-    throw CAudioError((_x_), (_msg_), __BASE_FILE__,  __func__, __LINE__);  \
+    throw CAudioError((_x_), (_msg_), __FILENAME__,  __func__, __LINE__);  \
 } while (0)
 
 #define VALID_POINTER_START(_x_) { \

diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 1a7390d..c95f45c 100644 (file)
--- a/packaging/capi-media-audio-io.spec
+++ b/packaging/capi-media-audio-io.spec
@@ -1,6 +1,6 @@
 Name:           capi-media-audio-io
 Summary:        An Audio Input & Audio Output library in Tizen Native API
-Version:        0.5.31
+Version:        0.5.32
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0

diff --git a/src/cpp/CAudioError.cpp b/src/cpp/CAudioError.cpp
index 3cadc76..66024d8 100644 (file)
--- a/src/cpp/CAudioError.cpp
+++ b/src/cpp/CAudioError.cpp
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <sstream>
 #include <dlog.h>
 #include "CAudioIODef.h"
 
@@ -28,13 +27,11 @@ using namespace tizen_media_audio;
 CAudioError::CAudioError(EError err, const char* msg, const char* file, const char* func, int line) :
     __mError(err),
     __mFullMsg(msg) {
-    char __mErrorMsg[MSG_LENGTH] = { 0, };
+    ostringstream stringStream;
 
-    snprintf(__mErrorMsg, MSG_LENGTH, "[%s|%s|%s(%d)|"
-              COLOR_CYAN   "%s"     COLOR_END "]",
-             __convertErrorToString(__mError), file, func, line, msg);
-
-    __mFullMsg = std::runtime_error{__mErrorMsg};
+    stringStream << "[ " << __convertErrorToString(__mError)
+                 << " | "<< file << ": " << func << "(" << line << ") | " << msg << " ]";
+    __mFullMsg = runtime_error{stringStream.str()};
 }
 
 const char *CAudioError::what() const noexcept {