summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-05-08 12:25:33 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-05-08 12:25:33 (GMT)
commit1de34f2347b0426ebf9fdd758ae65039dab76a5a (patch)
tree64e0730242677ae62318685b5e79b4db7af61bc7
parent823cad60083f3763afea0b12d6a92bd53fccd884 (diff)
parentbd50e0341cec479ab7f747259a334af244295160 (diff)
downloadug-wifi-direct-1de34f2347b0426ebf9fdd758ae65039dab76a5a.zip
ug-wifi-direct-1de34f2347b0426ebf9fdd758ae65039dab76a5a.tar.gz
ug-wifi-direct-1de34f2347b0426ebf9fdd758ae65039dab76a5a.tar.bz2
Merge branch 'master' into tizen_2.1
-rwxr-xr-xpopup-wifidirect/include/wfd-app-util.h26
-rw-r--r--ug-wifidirect/include/wfd_ug.h26
-rwxr-xr-xugapp-wifidirect/include/wfd-ugapp-util.h24
3 files changed, 26 insertions, 50 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/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 */