fix sdk build break after macro remove

Change-Id: I4eabd20164a2de31e93dd4e963bc99f68d1035bf

diff --git a/inc/log.h b/inc/log.h
index 3831fad..329497f 100755 (executable)
--- a/inc/log.h
+++ b/inc/log.h
@@ -26,18 +26,6 @@
 #undef LOG_TAG
 #define LOG_TAG "TASK_MGR"
 
-#if !defined(_D)
-#define _D(fmt, arg...) LOGD(fmt"\n", ##arg)
-#endif
-
-#if !defined(_W)
-#define _W(fmt, arg...) LOGW(fmt"\n", ##arg)
-#endif
-
-#if !defined(_E)
-#define _E(fmt, arg...) LOGE(fmt"\n", ##arg)
-#endif
-
 #if !defined(_SD)
 #define _SD(fmt, arg...) SECURE_LOGD(fmt"\n", ##arg)
 #endif
@@ -110,6 +98,19 @@
        } \
 }
 
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+#if !defined(_D)
+#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(_W)
+#define _W(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
+
+#if !defined(_E)
+#define _E(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg)
+#endif
 
 
 #endif //__TASK_MGR_LOG_H__

diff --git a/src/util.c b/src/util.c
index ab815fa..0c59acb 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -143,13 +143,13 @@ const char *util_get_file_path(app_subdir dir, const char *relative)
                prefix = app_get_external_shared_data_path();
                break;
        default:
-               LOGE("Not handled directory type.");
+               _E("Not handled directory type.");
                return NULL;
        }
        size_t res = eina_file_path_join(buf, sizeof(buf), prefix, relative);
        free(prefix);
        if (res > sizeof(buf)) {
-               LOGE("Path exceeded PATH_MAX");
+               _E("Path exceeded PATH_MAX");
                return NULL;
        }