From 49619ab27ac2dfb98e0e2b24b9902283e77c993a Mon Sep 17 00:00:00 2001 From: Rahul Dadhich Date: Wed, 11 May 2016 12:25:54 +0530 Subject: [PATCH] corrected PO strings. Change-Id: I2fb95b5e229a86412d0230608987ea8b7ffe1083 Signed-off-by: Rahul Dadhich --- inc/gallery.h | 2 +- inc/util/gl-debug.h | 44 +++++++++++-------------------------------- inc/util/gl-strings.h | 4 ++-- inc/util/gl-util.h | 2 +- src/util/gl-fs.c | 2 +- src/util/gl-util.c | 2 +- widget/inc/gl_widget_debug.h | 25 +++--------------------- widget/src/gl_widget_create.c | 1 - 8 files changed, 20 insertions(+), 62 deletions(-) diff --git a/inc/gallery.h b/inc/gallery.h index a80d5b0..9e3da1b 100644 --- a/inc/gallery.h +++ b/inc/gallery.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "gl-data.h" #include "gl-util.h" diff --git a/inc/util/gl-debug.h b/inc/util/gl-debug.h index fba2c73..9ffe627 100755 --- a/inc/util/gl-debug.h +++ b/inc/util/gl-debug.h @@ -46,37 +46,15 @@ extern "C" #ifdef _USE_DLOG_ -#ifndef LOG_DEBUG -#define LOG_DEBUG LOG_TAG -#endif -#ifndef LOGD -#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg) -#endif -#ifndef LOGW -#define LOGW(fmt, arg...) dlog_print(DLOG_INFO, 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_LOGE -#define SECURE_LOGE(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg) -#endif - -#define gl_dbg(fmt, arg...) LOGD(true, FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg) -#define gl_dbgI(fmt, arg...) LOGI(true, FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg) -#define gl_dbgW(fmt, arg...) LOGW(true, FONT_COLOR_CYAN fmt FONT_COLOR_RESET, ##arg) -#define gl_dbgE(fmt, arg...) LOGE(true, FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg) +#define gl_dbg(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define gl_dbgI(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define gl_dbgW(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define gl_dbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) -#define GL_PROFILE_IN gl_dbg("%s LAUNCH [gallery:Application:%s:IN] %s", LOG_DEBUG, __FUNCTION__) -#define GL_PROFILE_OUT gl_dbg("%s LAUNCH [gallery:Application:%s:OUT] %s", LOG_DEBUG, __FUNCTION__) -#define GL_PROFILE_F_IN(func) gl_dbg(LOG_DEBUG, "LAUNCH","[gallery:Application:"func":IN]") -#define GL_PROFILE_F_OUT(func) gl_dbg(LOG_DEBUG, "LAUNCH","[gallery:Application:"func":OUT]") +#define GL_PROFILE_IN gl_dbg(" LAUNCH [gallery:Application:%s:IN] " , __FUNCTION__) +#define GL_PROFILE_OUT gl_dbg(" LAUNCH [gallery:Application:%s:OUT]", __FUNCTION__) +#define GL_PROFILE_F_IN(func) gl_dbg("LAUNCH","[gallery:Application:"func":IN]") +#define GL_PROFILE_F_OUT(func) gl_dbg("LAUNCH","[gallery:Application:"func":OUT]") #else @@ -92,9 +70,9 @@ extern "C" #endif #ifdef _USE_SECURE_LOG_ -#define gl_sdbg(fmt, arg...) SECURE_LOGD(true, FONT_COLOR_BLUE fmt FONT_COLOR_RESET, ##arg) -#define gl_sdbgW(fmt, arg...) SECURE_LOGI(true, FONT_COLOR_GREEN fmt FONT_COLOR_RESET, ##arg) -#define gl_sdbgE(fmt, arg...) SECURE_LOGE(true, FONT_COLOR_RED fmt FONT_COLOR_RESET, ##arg) +#define gl_sdbg(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define gl_sdbgW(fmt, arg...) dlog_print(DLOG_INFO, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define gl_sdbgE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) #endif diff --git a/inc/util/gl-strings.h b/inc/util/gl-strings.h index 3ab3550..02548f6 100755 --- a/inc/util/gl-strings.h +++ b/inc/util/gl-strings.h @@ -78,8 +78,8 @@ extern "C" #define GL_STR_DELETE_COMFIRMATION dgettext("sys_string", "IDS_COM_POP_DELETE_Q") #define GL_STR_SELECTED dgettext("sys_string", "IDS_COM_POP_SELECTED") #define GL_STR_ADDED dgettext("gallery", "IDS_COM_POP_ADDED") -#define GL_STR_MOVED dgettext("sys_string", "IDS_COM_POP_MOVED") -#define GL_STR_COPIED dgettext("sys_string", "IDS_COM_POP_COPIED_P") +#define GL_STR_MOVED dgettext("gallery", "IDS_COM_POP_MOVED") +#define GL_STR_COPIED dgettext("gallery", "IDS_COM_POP_COPIED_P") #define GL_STR_SELECT_ALL dgettext("sys_string", "IDS_COM_BODY_SELECT_ALL") #define GL_STR_NO_FILES_SELECTED dgettext("sys_string", GL_STR_ID_NO_FILES_SELECTED) #define GL_STR_APPLICATION_NOT_INSTALLED dgettext("sys_string", "IDS_COM_BODY_APPLICATION_NOT_INSTALLED") diff --git a/inc/util/gl-util.h b/inc/util/gl-util.h index 09efab3..3980b94 100755 --- a/inc/util/gl-util.h +++ b/inc/util/gl-util.h @@ -24,7 +24,7 @@ extern "C" { #include "gl-data.h" #include "gallery.h" -#include +#include /* File system related String definition */ diff --git a/src/util/gl-fs.c b/src/util/gl-fs.c index d490f5f..c5c2f99 100644 --- a/src/util/gl-fs.c +++ b/src/util/gl-fs.c @@ -27,7 +27,7 @@ #include "gl-thread-util.h" #include "gl-file-util.h" #include "gl-util.h" -#include +#include static int __gl_fs_free_node(gl_node_info_s *pnode) { diff --git a/src/util/gl-util.c b/src/util/gl-util.c index 5b246fc..515e950 100644 --- a/src/util/gl-util.c +++ b/src/util/gl-util.c @@ -21,7 +21,7 @@ #endif #include #include -#include +#include #include "gl-debug.h" #include "gallery.h" #include "gl-albums.h" diff --git a/widget/inc/gl_widget_debug.h b/widget/inc/gl_widget_debug.h index 6548c24..a7eacb7 100644 --- a/widget/inc/gl_widget_debug.h +++ b/widget/inc/gl_widget_debug.h @@ -18,29 +18,10 @@ #ifndef GL_WIDGET_DEBUG_H #define GL_WIDGET_DEBUG_H -#ifndef LOGD -#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg) -#endif -#ifndef LOGW -#define LOGW(fmt, arg...) dlog_print(DLOG_INFO, 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_LOGE -#define SECURE_LOGE(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, ##arg) -#endif - #if !defined(FLOG) -#define DbgPrint(format, arg...) LOGD(true, format, ##arg) -#define ErrPrint(format, arg...) LOGE(true, format, ##arg) -#define WarnPrint(format, arg...) LOGW(true, format, ##arg) +#define DbgPrint(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define ErrPrint(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) +#define WarnPrint(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "[%s : %05d]" fmt "\n", __func__, __LINE__, ##arg) #else extern FILE *__file_log_fp; #define DbgPrint(format, arg...) do { fprintf(__file_log_fp, "[LOG] [%s/%s:%d] " format, util_basename(__FILE__), __func__, __LINE__, ##arg); fflush(__file_log_fp); } while (0) diff --git a/widget/src/gl_widget_create.c b/widget/src/gl_widget_create.c index e358b98..8611d5b 100644 --- a/widget/src/gl_widget_create.c +++ b/widget/src/gl_widget_create.c @@ -23,7 +23,6 @@ #include #include #include "gl_widget_debug.h" -#include "gl-data-type.h" #include "gl_widget.h" #include -- 2.7.4