From bd50e0341cec479ab7f747259a334af244295160 Mon Sep 17 00:00:00 2001 From: Kim Gibyoung Date: Tue, 7 May 2013 22:47:03 +0900 Subject: [PATCH] printf removed Change-Id: I29037623a091c636bbe55fd1f1b807dc4561c26a --- popup-wifidirect/include/wfd-app-util.h | 26 +++++++++----------------- popup-wifidirect/src/wfd-app-client.c | 4 ++-- popup-wifidirect/src/wfd-app-util.c | 2 +- ug-wifidirect/include/wfd_ug.h | 26 +++++++++----------------- ugapp-wifidirect/include/wfd-ugapp-util.h | 24 ++++++++---------------- ugapp-wifidirect/src/wfd-ugapp-util.c | 2 +- 6 files changed, 30 insertions(+), 54 deletions(-) diff --git a/popup-wifidirect/include/wfd-app-util.h b/popup-wifidirect/include/wfd-app-util.h index 1936ab3..b4ba8f4 100755 --- a/popup-wifidirect/include/wfd-app-util.h +++ b/popup-wifidirect/include/wfd-app-util.h @@ -60,23 +60,15 @@ #else /** _DLOG_UTIL */ -#define WDPOP_LOGV(format, args...) \ - printf("[V/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDPOP_LOGD(format, args...) \ - printf("[D/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDPOP_LOGI(format, args...) \ - printf("[I/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDPOP_LOGW(format, args...) \ - printf("[W/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDPOP_LOGE(format, args...) \ - printf("[E/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDPOP_LOGF(format, args...) \ - printf("[F/WIFI_DIRECT_POPUP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) - -#define __WDPOP_LOG_FUNC_ENTER__ \ - printf("[V/WIFI_DIRECT_POPUP] %s: %s()(%4d)> Enter", __FILE__, __FUNCTION__, __LINE__) -#define __WDPOP_LOG_FUNC_EXIT__ \ - printf("[V/WIFI_DIRECT_POPUP] %s: %s()(%4d)> Exit", __FILE__, __FUNCTION__, __LINE__) +#define WDPOP_LOGV(format, args...) +#define WDPOP_LOGD(format, args...) +#define WDPOP_LOGI(format, args...) +#define WDPOP_LOGW(format, args...) +#define WDPOP_LOGE(format, args...) +#define WDPOP_LOGF(format, args...) + +#define __WDPOP_LOG_FUNC_ENTER__ +#define __WDPOP_LOG_FUNC_EXIT__ #endif /** _DLOG_UTIL */ diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c index cc088f2..cc42794 100755 --- a/popup-wifidirect/src/wfd-app-client.c +++ b/popup-wifidirect/src/wfd-app-client.c @@ -606,7 +606,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st if (auto_connection_mode == TRUE) { result = wifi_direct_accept_connection(ad->peer_mac); - printf("wifi_direct_accept_connection() result=[%d]\n", result); + WDPOP_LOGD("wifi_direct_accept_connection() result=[%d]\n", result); } else { if (wps_mode == WIFI_DIRECT_WPS_TYPE_PBC) { WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PBC\n"); @@ -666,7 +666,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st wifi_direct_is_autoconnection_mode(&auto_connection_mode); if (auto_connection_mode == TRUE) { result = wifi_direct_connect(ad->peer_mac); - printf("wifi_direct_accept_connection() result=[%d]\n", result); + WDPOP_LOGD("wifi_direct_accept_connection() result=[%d]\n", result); } else { wfd_prepare_popup(WFD_POP_APRV_CONNECTION_INVITATION_REQ, NULL); } diff --git a/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c index 4e77cc2..7231757 100644 --- a/popup-wifidirect/src/wfd-app-util.c +++ b/popup-wifidirect/src/wfd-app-util.c @@ -67,7 +67,7 @@ int wfd_app_gettid() #ifdef __NR_gettid return syscall(__NR_gettid); #else - fprintf(stderr, "__NR_gettid is not defined, please include linux/unistd.h "); + WDPOP_LOGE("__NR_gettid is not defined, please include linux/unistd.h "); return -1; #endif } diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h index 1697175..fd78c31 100644 --- a/ug-wifidirect/include/wfd_ug.h +++ b/ug-wifidirect/include/wfd_ug.h @@ -54,23 +54,15 @@ #else /** _DLOG_UTIL */ -#define WDUG_LOGV(format, args...) \ - printf("[V/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUG_LOGD(format, args...) \ - printf("[D/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUG_LOGI(format, args...) \ - printf("[I/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUG_LOGW(format, args...) \ - printf("[W/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUG_LOGE(format, args...) \ - printf("[E/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUG_LOGF(format, args...) \ - printf("[F/UG_WIFI_DIRECT] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) - -#define __WDUG_LOG_FUNC_ENTER__ \ - printf("[V/UG_WIFI_DIRECT] %s: %s()(%4d)> Enter", __FILE__, __FUNCTION__, __LINE__) -#define __WDUG_LOG_FUNC_EXIT__ \ - printf("[V/UG_WIFI_DIRECT] %s: %s()(%4d)> Exit", __FILE__, __FUNCTION__, __LINE__) +#define WDUG_LOGV(format, args...) +#define WDUG_LOGD(format, args...) +#define WDUG_LOGI(format, args...) +#define WDUG_LOGW(format, args...) +#define WDUG_LOGE(format, args...) +#define WDUG_LOGF(format, args...) + +#define __WDUG_LOG_FUNC_ENTER__ +#define __WDUG_LOG_FUNC_EXIT__ #endif /** _DLOG_UTIL */ diff --git a/ugapp-wifidirect/include/wfd-ugapp-util.h b/ugapp-wifidirect/include/wfd-ugapp-util.h index 7480a04..434f3a5 100755 --- a/ugapp-wifidirect/include/wfd-ugapp-util.h +++ b/ugapp-wifidirect/include/wfd-ugapp-util.h @@ -55,23 +55,15 @@ } while (0) #else /** _DLOG_UTIL */ -#define WDUA_LOGV(format, args...) \ - printf("[V/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUA_LOGD(format, args...) \ - printf("[D/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUA_LOGI(format, args...) \ - printf("[I/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUA_LOGW(format, args...) \ - printf("[W/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUA_LOGE(format, args...) \ - printf("[E/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) -#define WDUA_LOGF(format, args...) \ - printf("[F/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> "format, __FILE__, __FUNCTION__, __LINE__, ##args) +#define WDUA_LOGV(format, args...) +#define WDUA_LOGD(format, args...) +#define WDUA_LOGI(format, args...) +#define WDUA_LOGW(format, args...) +#define WDUA_LOGE(format, args...) +#define WDUA_LOGF(format, args...) -#define __WDUA_LOG_FUNC_ENTER__\ - printf("[V/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> Enter", __FILE__, __FUNCTION__, __LINE__) -#define __WDUA_LOG_FUNC_EXIT__ \ - printf("[V/WIFI_DIRECT_UGAPP] %s: %s()(%4d)> Exit", __FILE__, __FUNCTION__, __LINE__) +#define __WDUA_LOG_FUNC_ENTER__ +#define __WDUA_LOG_FUNC_EXIT__ #endif /** _DLOG_UTIL */ diff --git a/ugapp-wifidirect/src/wfd-ugapp-util.c b/ugapp-wifidirect/src/wfd-ugapp-util.c index 2009c3c..73c42aa 100644 --- a/ugapp-wifidirect/src/wfd-ugapp-util.c +++ b/ugapp-wifidirect/src/wfd-ugapp-util.c @@ -67,7 +67,7 @@ int wfd_app_gettid() #ifdef __NR_gettid return syscall(__NR_gettid); #else - fprintf(stderr, "__NR_gettid is not defined, please include linux/unistd.h "); + WDUA_LOGE("__NR_gettid is not defined, please include linux/unistd.h "); return -1; #endif } -- 2.7.4