apply commits

diff --git a/include/tds-provider-common.h b/include/tds-provider-common.h
index 1c7e0688aecc686513197425a6495c7b508a6927..4ed148e4e3c98c706e5d816a59af3ead3555d7fd 100644 (file)
--- a/include/tds-provider-common.h
+++ b/include/tds-provider-common.h
@@ -28,11 +28,11 @@ extern "C" {
 #endif
 
 #undef LOG_TAG
-#define LOG_TAG "BLUETOOTH_TDSP"
+#define LOG_TAG "TDS_PROVIDER"
 
 #ifdef FUNCTION_TRACE
-#define FN_START BT_DBG("[ENTER FUNC]")
-#define FN_END BT_DBG("[EXIT FUNC]")
+#define FN_START TDS_DBG("[ENTER FUNC]")
+#define FN_END TDS_DBG("[EXIT FUNC]")
 #else
 #define FN_START
 #define FN_END
@@ -45,30 +45,27 @@ extern "C" {
 #define LOG_COLOR_BLUE     "\033[36m"
 #define LOG_COLOR_PURPLE   "\033[35m"
 
-#define BT_PERMANENT_LOG(fmt, args...) _bt_permanent_log(fmt, ##args)
+#define TDS_PERMANENT_LOG(fmt, args...) _tds_permanent_log(fmt, ##args)
 
-#define BT_DBG(fmt, args...) \
+#define TDS_DBG(fmt, args...) \
        SLOGD(fmt, ##args)
-#define BT_INFO(fmt, args...) \
+#define TDS_INFO(fmt, args...) \
        SLOGI(fmt, ##args)
-#define BT_ERR(fmt, args...) \
+#define TDS_ERR(fmt, args...) \
        SLOGE(fmt, ##args)
 
-#define BT_INFO_C(fmt, arg...) \
+#define TDS_INFO_C(fmt, arg...) \
        SLOGI_IF(TRUE,  LOG_COLOR_GREEN" "fmt" "LOG_COLOR_RESET, ##arg)
-#define BT_ERR_C(fmt, arg...) \
+#define TDS_ERR_C(fmt, arg...) \
        SLOGI_IF(TRUE,  LOG_COLOR_RED" "fmt" "LOG_COLOR_RESET, ##arg)
 
 #define DBG_SECURE(fmt, args...) SECURE_SLOGD(fmt, ##args)
-#ifdef TIZEN_FEATURE_BT_OBEX
-#define INFO_SECURE(fmt, args...) SECURE_SLOGI(fmt, ##args)
-#endif
 #define ERR_SECURE(fmt, args...) SECURE_SLOGE(fmt, ##args)
 
 #define ret_if(expr) \
        do { \
                if (expr) { \
-                       BT_ERR("(%s) return", #expr); \
+                       TDS_ERR("(%s) return", #expr); \
                        return; \
                } \
        } while (0)
@@ -76,15 +73,15 @@ extern "C" {
 #define retv_if(expr, val) \
        do { \
                if (expr) { \
-                       BT_ERR("(%s) return", #expr); \
+                       TDS_ERR("(%s) return", #expr); \
                        return (val); \
                } \
        } while (0)
 
-#define BT_CHECK_PARAMETER(arg, func) \
+#define TDS_CHECK_PARAMETER(arg, func) \
        do { \
                if (arg == NULL) { \
-                       BT_ERR("%s is NULL", #arg); \
+                       TDS_ERR("%s is NULL", #arg); \
                        func BLUETOOTH_ERROR_INVALID_PARAM; \
                } \
        } while (0)

diff --git a/src/tds-provider-aware.c b/src/tds-provider-aware.c
index f7c8a7acd811bae5ffcc1091b8f4c9cd0ca45321..7f79288507865bba3dfd70333b2ed7e4e80c6ad7 100644 (file)
--- a/src/tds-provider-aware.c
+++ b/src/tds-provider-aware.c
@@ -23,7 +23,7 @@
 
 int _tds_aware_init()
 {
-       BT_DBG("enter");
+       TDS_DBG("enter");
        return 0;
 }
 

diff --git a/src/tds-provider-main.c b/src/tds-provider-main.c
index 5ca11ce336bc046a87f783f28cafbf86b0fd148a..fce30aa74a2a7d261db180085a9cf8d596f8da7f 100644 (file)
--- a/src/tds-provider-main.c
+++ b/src/tds-provider-main.c
@@ -36,7 +36,7 @@ int main()
 
        main_loop = g_main_loop_new(NULL, FALSE);
        if (main_loop == NULL) {
-               BT_ERR("Creating main loop failed");
+               TDS_ERR("Creating main loop failed");
                return EXIT_FAILURE;
        }
 

diff --git a/src/tds-provider-service.c b/src/tds-provider-service.c
index 595743aa35040144cc49da4755578a6780b705ee..fbe393f830fe9acfeb235f2984e25c6763dc8202 100644 (file)
--- a/src/tds-provider-service.c
+++ b/src/tds-provider-service.c
@@ -24,7 +24,7 @@
 
 int _tds_service_init()
 {
-       BT_DBG("enter");
+       TDS_DBG("enter");
        return 0;
 }