Corrected logs

Change-Id: I4cae0307a8830f1e387056ce3cc10affaee6e697
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/inc/mf-dlog.h b/inc/mf-dlog.h
index fd62bc3..52e273d 100755 (executable)
--- a/inc/mf-dlog.h
+++ b/inc/mf-dlog.h
@@ -45,41 +45,19 @@
 #define FONT_COLOR_CYAN     "\033[36m"
 #define FONT_COLOR_GRAY     "\033[37m"
 
-#ifndef LOGD
-#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef LOGI
-#define LOGI(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, ##arg)
-#endif
-#ifndef LOGW
-#define LOGW(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, ##arg)
-#endif
-#ifndef LOGE
-#define LOGE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGD
-#define SECURE_LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGI
-#define SECURE_LOGI(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-#ifndef SECURE_LOGW
-#define SECURE_LOGW(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg)
-#endif
-
-#define SECURE_DEBUG(fmt, args...)     SECURE_LOGD(true, FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##args)
-#define SECURE_INFO(fmt, args...)      SECURE_LOGI(true, FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##args)
-#define SECURE_ERROR(fmt, args...)     SECURE_LOGW(true, FONT_COLOR_RED fmt FONT_COLOR_RESET, ##args)//SECURE_LOGE
+#define SECURE_DEBUG(fmt, arg...)      dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define SECURE_INFO(fmt, arg...)       dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
+#define SECURE_ERROR(fmt, arg...)      dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
 
-#define MYFILE_TRACE_DEBUG(fmt, arg...) do { LOGD("[%s][%d] "fmt "\n", __func__, __LINE__, ##arg); } while (0)
-#define MYFILE_TRACE_ERROR(fmt, arg...) do { LOGW("[%s][%d] "fmt"\n", __func__, __LINE__, ##arg); } while (0)//LOGE
+#define MYFILE_TRACE_DEBUG(fmt, arg...) do { dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
+#define MYFILE_TRACE_ERROR(fmt, arg...) do { dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)//LOGE
 
-#define mf_debug(fmt, args...) do { LOGD("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
+#define mf_debug(fmt, arg...)  do { dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
 
-#define mf_error(fmt, arg...)  LOGW(LOG_COLOR_RED"[ %s : %d]   "fmt""LOG_COLOR_RESET, __FUNCTION__, __LINE__,##arg)//LOGE
-#define mf_warning(fmt, args...)       do { LOGW("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
-#define mf_info(fmt, args...)          do { LOGI("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
-#define mf_assert(fmt, args...)        do { LOGW("[ASSERT][%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)//LOGE
+#define mf_error(fmt, arg...)  dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg)//LOGE
+#define mf_warning(fmt, arg...)        do { dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
+#define mf_info(fmt, arg...)           do { dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
+#define mf_assert(fmt, arg...) do { dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)//LOGE
 
 #define t_start        dlog_print(DLOG_DEBUG, "LAUNCH", "[myfile:Application:%s:IN]",__func__)
 
@@ -88,14 +66,14 @@
 
 #define MF_TRACE_BEGIN  while (0) {\
                                        {\
-                                               LOGD("\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
+                                               dlog_print(DLOG_INFO, LOG_TAG, "\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
                                                __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                                        } \
                        };
 
 #define MF_TRACE_END  while (0) {\
                                        {\
-                                               LOGD("\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
+                                               dlog_print(DLOG_INFO, LOG_TAG, "\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
                                                __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                                        } \
                        };

diff --git a/inc/mf-fo-debug.h b/inc/mf-fo-debug.h
index 1e750e8..3219653 100755 (executable)
--- a/inc/mf-fo-debug.h
+++ b/inc/mf-fo-debug.h
@@ -24,24 +24,24 @@
 #include <mf-dlog.h>
 #include <mf-log.h>
 
-#define mf_fo_logd(fmt , args...)              do { LOGD("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
+#define mf_fo_logd(fmt , arg...)               do { dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
 #define mf_fo_loge(fmt , args...)              do {\
-                                                       LOGW("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); \
+                                                       dlog_print(DLOG_WARN, LOG_TAG, "[%s][%d] "fmt"\n", __func__, __LINE__, ##args); \
                                                        MF_LOG_RECORD(fmt,##args); \
                                                   } while (0)//LOGE
-#define mf_fo_logw(fmt , args...)              do { LOGW("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
-#define mf_fo_logi(fmt , args...)              do { LOGI("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
-#define mf_fo_loga(fmt , args...)              do { LOGW("[ASSERT][%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)//LOGE
+#define mf_fo_logw(fmt , arg...)               do { dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
+#define mf_fo_logi(fmt , arg...)               do { dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)
+#define mf_fo_loga(fmt , arg...)               do { dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg); } while (0)//LOGE
 #define FO_TRACE_BEGIN                 do {\
                                        {\
-                                               LOGD("\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
+                                               dlog_print(DLOG_WARN, LOG_TAG, "\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
                                                __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                                        } \
                                } while (0) ;
 
 #define FO_TRACE_END           do {\
                                        {\
-                                               LOGD("\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
+                                               dlog_print(DLOG_WARN, LOG_TAG, "\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
                                                __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                                        } \
                                } while (0) ;

diff --git a/inc/mf-ug-detail-dlog.h b/inc/mf-ug-detail-dlog.h
index 9091f4b..a5bbe74 100755 (executable)
--- a/inc/mf-ug-detail-dlog.h
+++ b/inc/mf-ug-detail-dlog.h
@@ -32,12 +32,12 @@
 
 #if DLOG_ON
 
-#define ug_detail_debug(fmt , args...)    LOGD("[%s][%d]debug message from ug-myfile-efl is : "fmt"\n", __func__, __LINE__, ##args)
-#define myfile_dlog(fmt , args...)        LOGD("[%s][%d]: "fmt"\n", __func__, __LINE__, ##args)
-#define myfile_dlog_assert(fmt , args...) LOGE("[%s]: "fmt"\n", __func__, ##args)
-#define myfile_dlog_func_line()           LOGD("[%s][%d]\n", __func__, __LINE__)
-#define myfile_dlog_func_start()          LOGD("[%s][%d][  START  ]\n", __func__, __LINE__)
-#define myfile_dlog_func_end()            LOGD("[%s][%d][  END  ]\n", __func__, __LINE__)
+#define ug_detail_debug(fmt , args...)    dlog_print(DLOG_WARN, LOG_TAG,"[%s][%d]debug message from ug-myfile-efl is : "fmt"\n", __func__, __LINE__, ##args)
+#define myfile_dlog(fmt , args...)        dlog_print(DLOG_WARN, LOG_TAG,"[%s][%d]: "fmt"\n", __func__, __LINE__, ##args)
+#define myfile_dlog_assert(fmt , args...) dlog_print(DLOG_ERROR, LOG_TAG,"[%s]: "fmt"\n", __func__, ##args)
+#define myfile_dlog_func_line()           dlog_print(DLOG_WARN, LOG_TAG,("[%s][%d]\n", __func__, __LINE__)
+#define myfile_dlog_func_start()          dlog_print(DLOG_WARN, LOG_TAG,"[%s][%d][  START  ]\n", __func__, __LINE__)
+#define myfile_dlog_func_end()            dlog_print(DLOG_WARN, LOG_TAG,"[%s][%d][  END  ]\n", __func__, __LINE__)
 #else
 #define myfile_dlog(fmt , args...)        printf("[MYFILE][%40s:%4d] "fmt"\n", __func__, __LINE__, ##args)
 #define myfile_dlog_assert(fmt , args...) printf("[MYFILE][%40s:%4d][###assert###] "fmt"\n", __func__, __LINE__, ##args)
@@ -50,7 +50,7 @@
 
 #define ug_detail_trace_error(fmt, arg...) \
        do { \
-               LOGE("[%s][%d] "fmt"\n", strrchr(__FILE__, '/')+1, __LINE__, ##arg); \
+               dlog_print(DLOG_ERROR, LOG_TAG,"[%s][%d] "fmt"\n", strrchr(__FILE__, '/')+1, __LINE__, ##arg); \
        } while (0)
 
 #define ug_detail_retvm_if(expr, val, fmt, arg...) \
@@ -79,7 +79,7 @@
 #define UG_DETAIL_TRACE_BEGIN \
        do {\
                {\
-                       LOGD("\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
+                       dlog_print(DLOG_DEBUG, LOG_TAG, "\n\033[0;35mENTER FUNCTION: %s. \033[0m\t%s:%d\n", \
                        __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                } \
        } while (0);
@@ -87,7 +87,7 @@
 #define UG_DETAIL_TRACE_END  \
        do {\
                {\
-                       LOGD("\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
+                       dlog_print(DLOG_DEBUG, LOG_TAG, "\n\033[0;35mEXIT FUNCTION: %s. \033[0m\t%s:%d\n", \
                        __FUNCTION__, (char *)(strrchr(__FILE__, '/')+1), __LINE__);\
                } \
        } while (0);

diff --git a/src/common/mf-media-content.c b/src/common/mf-media-content.c
index cc8c0cc..3540f0a 100755 (executable)
--- a/src/common/mf-media-content.c
+++ b/src/common/mf-media-content.c
@@ -36,7 +36,7 @@ mf_condition_s *mf_media_content_condition_create(char *condition)
 
        memset(filter, 0, sizeof(mf_condition_s));
 
-       SECURE_LOGD("condition [%s]", condition);
+       SECURE_DEBUG("condition [%s]", condition);
        filter->cond = condition;
        filter->collate_type = MEDIA_CONTENT_COLLATE_DEFAULT;
        filter->sort_type = MEDIA_CONTENT_ORDER_DESC;