summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadoslaw Czerski <r.czerski@samsung.com>2016-03-09 17:23:37 +0100
committerRadoslaw Czerski <r.czerski@samsung.com>2016-03-09 17:23:37 +0100
commit598e9ea6cb6b48a8030f3478da46342c890339e6 (patch)
treede858339af00288e27ad2664ca80219d2ced2d8c
parent6381ed170387e03c2470056dd469dce232f8bbfe (diff)
downloadshare-panel-598e9ea6cb6b48a8030f3478da46342c890339e6.tar.gz
share-panel-598e9ea6cb6b48a8030f3478da46342c890339e6.tar.bz2
share-panel-598e9ea6cb6b48a8030f3478da46342c890339e6.zip
The macros have been replaced by dlog_print() function. Secure log macros have been removed. Change-Id: If752ed7d3623f23d20e2ec13ee8a837fd5b18a7b Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>
-rw-r--r--inc/log.h17
-rw-r--r--src/list.c16
2 files changed, 11 insertions, 22 deletions
diff --git a/inc/log.h b/inc/log.h
index 7e5279e..8adf903 100644
--- a/inc/log.h
+++ b/inc/log.h
@@ -28,28 +28,17 @@
#define D_(str) dgettext(PACKAGE, str)
#if !defined(_D)
-#define _D(fmt, arg...) LOGD(fmt"\n", ##arg)
+#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, fmt"\n", ##arg)
#endif
#if !defined(_W)
-#define _W(fmt, arg...) LOGW(fmt"\n", ##arg)
+#define _W(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, fmt"\n", ##arg)
#endif
#if !defined(_E)
-#define _E(fmt, arg...) LOGE(fmt"\n", ##arg)
+#define _E(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, fmt"\n", ##arg)
#endif
-#if !defined(_SD)
-#define _SD(fmt, arg...) SECURE_LOGD(fmt"\n", ##arg)
-#endif
-
-#if !defined(_SW)
-#define _SW(fmt, arg...) SECURE_LOGW(fmt"\n", ##arg)
-#endif
-
-#if !defined(_SE)
-#define _SE(fmt, arg...) SECURE_LOGE(fmt"\n", ##arg)
-#endif
#define retv_if(expr, val) do { \
if(expr) { \
diff --git a/src/list.c b/src/list.c
index a2ca103..ae53102 100644
--- a/src/list.c
+++ b/src/list.c
@@ -36,7 +36,7 @@ static bool __app_control_matched_cb(app_control_h service, const char *appid, v
app_control_get_caller(service, &caller);
- _SD("matched app : [%s]", appid);
+ _D("matched app : [%s]", appid);
if (caller && !strcmp(appid, caller)) {
_D("caller and callee is same");
return true;
@@ -152,13 +152,13 @@ static void __intersect_match_list_with_mime(Eina_List **matchlist, const char *
exist = false;
EINA_LIST_FOREACH(sublist, sub_ln, s_list_data) {
if (!strcmp(m_list_data, s_list_data)) {
- _SD("[%s] is inlcude!", m_list_data);
+ _D("[%s] is inlcude!", m_list_data);
exist = true;
break;
}
}
if (!exist) {
- _SD("[%s] is not include!", m_list_data);
+ _D("[%s] is not include!", m_list_data);
*matchlist = eina_list_remove(*matchlist, m_list_data);
}
}
@@ -177,7 +177,7 @@ static void __trim_uri(app_control_h control)
char *tmp = NULL;
app_control_get_uri(control, &uri);
- _SD("uri : [[[%s]]]", uri);
+ _D("uri : [[[%s]]]", uri);
if (!uri) {
return;
}
@@ -227,7 +227,7 @@ static void __create_multi_share_list(app_control_h control, Eina_List **matchli
Eina_List *l = NULL;
char *tmp = NULL;
- _SD("data_array[%d]= %s", i, data_array[i]);
+ _D("data_array[%d]= %s", i, data_array[i]);
__get_mime(data_array[i], &mime);
if (!mime) {
@@ -243,7 +243,7 @@ static void __create_multi_share_list(app_control_h control, Eina_List **matchli
}
mime_list = eina_list_prepend(mime_list, mime);
- _SD("data_array[%d]= %s", i, data_array[i]);
+ _D("data_array[%d]= %s", i, data_array[i]);
out:
free(data_array[i]);
@@ -318,7 +318,7 @@ static void __make_applist(share_panel_h share_panel, Eina_List *matchlist, Eina
app_info_destroy(app_info);
continue;
}
- _SD("icon_name : [%s]", app_s->name);
+ _D("icon_name : [%s]", app_s->name);
ret = app_info_get_icon(app_info, &app_s->icon);
if (ret != APP_MANAGER_ERROR_NONE) {
@@ -334,7 +334,7 @@ static void __make_applist(share_panel_h share_panel, Eina_List *matchlist, Eina
if (!app_s->icon) {
app_s->icon = strdup(DEFAULT_ICON);
}
- _SD("icon_path : [%s]", app_s->icon);
+ _D("icon_path : [%s]", app_s->icon);
*applist = eina_list_sorted_insert(*applist, __applist_compare, app_s);
}