Add define and log for deprecated API

Change-Id: I5bf70ab907fcfba5d2858097c3180670da598d78
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>

diff --git a/include/user-awareness-internal.h b/include/user-awareness-internal.h
index cc7ab06fe92a11ad72bf99e2b3557a7b267d203b..4b0a16b7eae5a77daa075819f57c9d9f334c09d5 100755 (executable)
--- a/include/user-awareness-internal.h
+++ b/include/user-awareness-internal.h
@@ -18,6 +18,8 @@
 #ifndef __TIZEN_CAPI_NETWORK_USER_AWARENESS_INTERNAL_H__
 #define __TIZEN_CAPI_NETWORK_USER_AWARENESS_INTERNAL_H__
 
+#include <tizen.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -57,7 +59,7 @@ extern "C" {
  * @see ua_service_foreach_added_user()
  * @see ua_user_destroy()
  */
-int ua_user_clone(ua_user_h *cloned, ua_user_h origin);
+int ua_user_clone(ua_user_h *cloned, ua_user_h origin) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -81,7 +83,7 @@ int ua_user_clone(ua_user_h *cloned, ua_user_h origin);
  *
  * @see ua_user_get_account()
  */
-int ua_user_get_default_user(ua_user_h *user_handle);
+int ua_user_get_default_user(ua_user_h *user_handle) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -102,9 +104,7 @@ int ua_user_get_default_user(ua_user_h *user_handle);
  *
  * @see ua_user_get_account()
  */
-int ua_user_set_account(
-               ua_user_h user_handle,
-               const char *account);
+int ua_user_set_account(ua_user_h user_handle, const char *account) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -123,9 +123,7 @@ int ua_user_set_account(
  * @pre
  * @post
  */
-int ua_user_set_name(
-               ua_user_h user_handle,
-               const char *name);
+int ua_user_set_name(ua_user_h user_handle, const char *name) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -145,9 +143,7 @@ int ua_user_set_name(
  * @pre
  * @post
  */
-int ua_user_remove_device_by_device_id(
-               const char *device_id,
-               ua_mac_type_e mac_type);
+int ua_user_remove_device_by_device_id(const char *device_id, ua_mac_type_e mac_type) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -170,9 +166,7 @@ int ua_user_remove_device_by_device_id(
  *
  * @see ua_registered_user_cb()
  */
-int ua_user_foreach_added(
-               ua_registered_user_cb foreach_cb,
-               void *user_data);
+int ua_user_foreach_added(ua_registered_user_cb foreach_cb, void *user_data) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -193,9 +187,7 @@ int ua_user_foreach_added(
  *
  * @see ua_service_remove_device()
  */
-int ua_service_add_device(
-               ua_service_h service_handle,
-               ua_device_h device_handle);
+int ua_service_add_device(ua_service_h service_handle, ua_device_h device_handle) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -217,9 +209,7 @@ int ua_service_add_device(
  *
  * @see ua_service_add_device()
  */
-int ua_service_remove_device(
-               ua_service_h service_handle,
-               ua_device_h device_handle);
+int ua_service_remove_device(ua_service_h service_handle, ua_device_h device_handle) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -241,10 +231,9 @@ int ua_service_remove_device(
  *
  * @see ua_service_added_device_cb()
  */
-int ua_service_foreach_added_devices(
-               ua_service_h service_handle,
+int ua_service_foreach_added_devices(ua_service_h service_handle,
                ua_service_added_device_cb foreach_cb,
-               void *user_data);
+               void *user_data) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -264,9 +253,7 @@ int ua_service_foreach_added_devices(
  * @post
  */
 
-int ua_device_set_discriminant(
-               ua_device_h device_handle,
-               bool discriminant);
+int ua_device_set_discriminant(ua_device_h device_handle, bool discriminant) TIZEN_DEPRECATED_API;
 
 /**
  * @internal
@@ -292,7 +279,7 @@ int ua_device_set_discriminant(
 int ua_device_foreach_added_by_user(
                ua_user_h user_handle,
                ua_registered_dev_cb foreach_cb,
-               void *user_data);
+               void *user_data) TIZEN_DEPRECATED_API;
 
 /**
  * @internal

diff --git a/include/user-awareness-log.h b/include/user-awareness-log.h
index f1f33307caf51baeeab2bcc12e0bddf16dd38e43..970f3ed6417ced6fae646decdd088cffbd753b56 100755 (executable)
--- a/include/user-awareness-log.h
+++ b/include/user-awareness-log.h
@@ -47,6 +47,10 @@ extern "C" {
 #define UA_ERR(fmt, arg...) \
        SLOGI_IF(TRUE, LOG_COLOR_RED" "fmt" "LOG_COLOR_RESET, ##arg)
 
+#define UA_DEPRECATED_LOG(origin, substitution) \
+       SLOGI("DEPRECATION WARNING: %s() is deprecated and will be removed " \
+               "from next release. Use %s() instead.", origin, substitution)
+
 #define FUNC_ENTRY UA_DBG("+")
 #define FUNC_EXIT UA_DBG("-")
 

diff --git a/include/user-awareness.h b/include/user-awareness.h
index f08bd1073e10b1fc2b194202fb9b70c27871add5..2baca5ec85b98cd54b4f8d825f53f9514b6fde70 100755 (executable)
--- a/include/user-awareness.h
+++ b/include/user-awareness.h
@@ -20,6 +20,7 @@
 
 #include <stdbool.h>
 #include <glib.h>
+#include <tizen.h>
 #include <tizen_error.h>
 
 #ifdef __cplusplus
@@ -517,7 +518,7 @@ typedef bool (*ua_service_added_user_cb)(
 typedef bool (*ua_service_added_device_cb)(
                ua_service_h service_handle,
                ua_device_h device_handle,
-               void *user_data);
+               void *user_data) TIZEN_DEPRECATED_API;
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
@@ -1024,9 +1025,7 @@ int ua_user_remove(
  *
  * @see ua_user_set_account()
  */
-int ua_user_get_account(
-               ua_user_h user_handle,
-               char **account);
+int ua_user_get_account(ua_user_h user_handle, char **account);
 
 /**
  * @ingroup CAPI_NETWORK_UA_MODULE
@@ -1941,7 +1940,6 @@ int ua_device_get_pairing_required(
  *
  * @see ua_device_set_os_info()
  * @see ua_device_set_wifi_ipv4_address()
- * @see ua_device_set_discriminant()
  */
 int ua_device_update(
                ua_device_h device_handle);

diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c
index 0680e59da16d385977ac826203dc77f7024ef385..dc768f38418cf214d221234867acfa06fc8bfb51 100755 (executable)
--- a/src/user-awareness-device.c
+++ b/src/user-awareness-device.c
@@ -695,6 +695,8 @@ int ua_device_set_discriminant(
 {
        FUNC_ENTRY;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(device_handle);
        ua_dev_info_s *device = (ua_dev_info_s *)device_handle;
@@ -1172,6 +1174,8 @@ int ua_device_foreach_added_by_user(
        FUNC_ENTRY;
        int ret;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        ret = ua_user_foreach_added_devices(user_handle, foreach_cb, user_data);
 
        FUNC_EXIT;

diff --git a/src/user-awareness-service.c b/src/user-awareness-service.c
index 015f4db897a671c82881b5edd6c58be99fdc7366..ee55c7197fbfaa6876b73757cf7ef6a2c54b7936 100755 (executable)
--- a/src/user-awareness-service.c
+++ b/src/user-awareness-service.c
@@ -681,10 +681,11 @@ int ua_service_add_device(ua_service_h service_handle, ua_device_h device_handle
 {
        FUNC_ENTRY;
        int ret;
-
        ua_service_info_s* service_info = (ua_service_info_s*)service_handle;
        ua_dev_info_s* dev_info = (ua_dev_info_s*)device_handle;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(service_handle);
        UA_VALIDATE_INPUT_PARAMETER(device_handle);
@@ -720,10 +721,11 @@ int ua_service_remove_device(ua_service_h service_handle, ua_device_h device_han
 {
        FUNC_ENTRY;
        int ret;
-
        ua_service_info_s* service_info = (ua_service_info_s*)service_handle;
        ua_dev_info_s* dev_info = (ua_dev_info_s*)device_handle;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(service_handle);
        UA_VALIDATE_INPUT_PARAMETER(device_handle);
@@ -946,6 +948,8 @@ int ua_service_foreach_added_devices(
        uam_device_info_s *ptr;
        ua_service_info_s *service = (ua_service_info_s *)service_handle;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(foreach_cb);
        UA_VALIDATE_INPUT_PARAMETER(service_handle);

diff --git a/src/user-awareness-users.c b/src/user-awareness-users.c
index ecdc5da69753ba9ba20fc70a35c419e36fb98561..391f37936845cb865ee92e99a11422bd76b12f64 100755 (executable)
--- a/src/user-awareness-users.c
+++ b/src/user-awareness-users.c
@@ -469,15 +469,17 @@ int ua_user_create(ua_user_h *user_handle)
        return UA_ERROR_NONE;
 }
 
-int ua_user_clone(ua_user_h *dst, ua_user_h src)
+int ua_user_clone(ua_user_h *cloned, ua_user_h origin)
 {
        FUNC_ENTRY;
        ua_user_info_s *user_dst = NULL;
-       ua_user_info_s *user_src = src;
+       ua_user_info_s *user_src = origin;
+
+       UA_DEPRECATED_LOG(__FUNCTION__, "");
 
        UA_CHECK_INIT_STATUS();
-       UA_VALIDATE_INPUT_PARAMETER(dst);
-       UA_VALIDATE_INPUT_PARAMETER(src);
+       UA_VALIDATE_INPUT_PARAMETER(cloned);
+       UA_VALIDATE_INPUT_PARAMETER(origin);
 
        user_dst = g_malloc0(sizeof(ua_user_info_s));
        if (!user_dst) {
@@ -511,7 +513,7 @@ int ua_user_clone(ua_user_h *dst, ua_user_h src)
        }
 
        /* Add user to list of users*/
-       *dst = (ua_user_h)user_dst;
+       *cloned = (ua_user_h)user_dst;
        user_dst->user_handle = (ua_user_h)user_dst;
 
        FUNC_EXIT;
@@ -590,6 +592,8 @@ int ua_user_get_default_user(ua_user_h *user_handle)
        FUNC_ENTRY;
        int ret;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(user_handle);
 
@@ -602,9 +606,10 @@ int ua_user_get_default_user(ua_user_h *user_handle)
 int ua_user_set_account(ua_user_h user_handle, const char *account)
 {
        FUNC_ENTRY;
-
        ua_user_info_s *user = (ua_user_info_s *)user_handle;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(user_handle);
        UA_VALIDATE_INPUT_PARAMETER(account);
@@ -627,9 +632,7 @@ int ua_user_set_account(ua_user_h user_handle, const char *account)
        return UA_ERROR_NONE;
 }
 
-int ua_user_get_account(
-               ua_user_h user_handle,
-               char **account)
+int ua_user_get_account(ua_user_h user_handle, char **account)
 {
        FUNC_ENTRY;
 
@@ -655,14 +658,13 @@ int ua_user_get_account(
        return UA_ERROR_NONE;
 }
 
-int ua_user_set_name(
-               ua_user_h user_handle,
-               const char *name)
+int ua_user_set_name(ua_user_h user_handle, const char *name)
 {
        FUNC_ENTRY;
-
        ua_user_info_s *user = (ua_user_info_s *)user_handle;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(user_handle);
        UA_VALIDATE_INPUT_PARAMETER(name);
@@ -722,12 +724,12 @@ int ua_user_destroy(ua_user_h user_handle)
        return UA_ERROR_NONE;
 }
 
-int ua_user_foreach_added(
-               ua_registered_user_cb foreach_cb,
-               void *user_data)
+int ua_user_foreach_added(ua_registered_user_cb foreach_cb, void *user_data)
 {
        FUNC_ENTRY;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "TODO");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(foreach_cb);
 
@@ -877,6 +879,8 @@ int ua_user_remove_device_by_device_id(const char *device_id,
        FUNC_ENTRY;
        int ret;
 
+       UA_DEPRECATED_LOG(__FUNCTION__, "");
+
        UA_CHECK_INIT_STATUS();
        UA_VALIDATE_INPUT_PARAMETER(device_id);
        retv_if(UA_MAC_TYPE_NONE >= mac_type, UA_ERROR_INVALID_PARAMETER);