Remove OIC features

Change-Id: Ifbea3e1f5234add9b7ba669016125219f8144503
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/common/ic-utils.c b/common/ic-utils.c
index a7c51d2af75ad5e548b45ac1230420739cd70068..cfea5db0b4dff1b70bcb1837f047433bc4ef5cea 100644 (file)
--- a/common/ic-utils.c
+++ b/common/ic-utils.c
@@ -31,15 +31,11 @@
 
 
 #ifdef TZ_VER_3
-static int _ic_oic_feature = -1;
-static const char *IC_FEATURE_OIC = "http://tizen.org/feature/iot.oic";
+static int _ic_ocf_feature = -1;
 static const char *IC_FEATURE_OCF = "http://tizen.org/feature/iot.ocf";
 
-
-static int _ic_oic_security_feature = -1;
-static const char *IC_FEATURE_OIC_SECURITY = "http://tizen.org/feature/iot.oic.security";
+static int _ic_ocf_security_feature = -1;
 static const char *IC_FEATURE_OCF_SECURITY = "http://tizen.org/feature/iot.ocf.security";
-
 #endif
 
 // TODO: Can't access in user side daemon
@@ -145,41 +141,29 @@ bool ic_utils_check_permission(int permssion)
        return true;
 }
 
-bool ic_utils_check_oic_feature()
+bool ic_utils_check_ocf_feature()
 {
 #ifdef TZ_VER_3
-       if (_ic_oic_feature < 0) {
+       if (_ic_ocf_feature < 0) {
                bool feature_supported = false;
                system_info_get_platform_bool(IC_FEATURE_OCF, &feature_supported);
-               _ic_oic_feature = feature_supported ? 1 : 0;
-
-               // TODO: Remove this code when applied oic name changes
-               if (_ic_oic_feature == 0) {
-                       system_info_get_platform_bool(IC_FEATURE_OIC, &feature_supported);
-                       _ic_oic_feature = feature_supported ? 1 : 0;
-               }
+               _ic_ocf_feature = feature_supported ? 1 : 0;
        }
-       return _ic_oic_feature;
+       return _ic_ocf_feature;
 #else
        return true;
 #endif
 }
 
-bool ic_utils_check_oic_security_feature()
+bool ic_utils_check_ocf_security_feature()
 {
 #ifdef TZ_VER_3
-       if (_ic_oic_security_feature < 0) {
+       if (_ic_ocf_security_feature < 0) {
                bool feature_supported = false;
                system_info_get_platform_bool(IC_FEATURE_OCF_SECURITY, &feature_supported);
-               _ic_oic_security_feature = feature_supported ? 1 : 0;
-
-               // TODO: Remove this code when applied oic name changes
-               if (_ic_oic_security_feature == 0) {
-                       system_info_get_platform_bool(IC_FEATURE_OIC_SECURITY, &feature_supported);
-                       _ic_oic_security_feature = feature_supported ? 1 : 0;
-               }
+               _ic_ocf_security_feature = feature_supported ? 1 : 0;
        }
-       return _ic_oic_security_feature;
+       return _ic_ocf_security_feature;
 #else
        return true;
 #endif

diff --git a/common/ic-utils.h b/common/ic-utils.h
index 74eff17af73c2fc1e9677e3dc2fbfe80bbb0311e..c3ba27a0ea9b6f33a7149bf5222576d7e3e0c3a5 100644 (file)
--- a/common/ic-utils.h
+++ b/common/ic-utils.h
@@ -28,8 +28,8 @@ enum {
 
 char* ic_utils_strdup(const char *src);
 bool ic_utils_check_permission(int permssion);
-bool ic_utils_check_oic_feature();
-bool ic_utils_check_oic_security_feature();
+bool ic_utils_check_ocf_feature();
+bool ic_utils_check_ocf_security_feature();
 int ic_utils_get_platform_info(OCPlatformInfo *platform_info);
 void ic_utils_free_platform_info(OCPlatformInfo *platform_info);
 

diff --git a/lib/icl-attributes.c b/lib/icl-attributes.c
index 3e1c9d1ce4b24e4ca95063b2f01102bba02c2ff6..e12e360792adb7a3602bc700a7cd8cd3a0e907a3 100644 (file)
--- a/lib/icl-attributes.c
+++ b/lib/icl-attributes.c
@@ -39,7 +39,7 @@ API int iotcon_attributes_create(iotcon_attributes_h *ret_attributes)
 {
        iotcon_attributes_h attributes;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_attributes, IOTCON_ERROR_INVALID_PARAMETER);
 
        attributes = calloc(1, sizeof(struct icl_attributes_s));
@@ -77,7 +77,7 @@ API int iotcon_attributes_remove(iotcon_attributes_h attributes, const char *key
        gboolean ret = FALSE;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -102,7 +102,7 @@ API int iotcon_attributes_get_int(iotcon_attributes_h attributes, const char *ke
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -129,7 +129,7 @@ API int iotcon_attributes_add_int(iotcon_attributes_h attributes, const char *ke
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -150,7 +150,7 @@ API int iotcon_attributes_get_bool(iotcon_attributes_h attributes, const char *k
        icl_basic_s *real = NULL;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -177,7 +177,7 @@ API int iotcon_attributes_add_bool(iotcon_attributes_h attributes, const char *k
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -198,7 +198,7 @@ API int iotcon_attributes_get_double(iotcon_attributes_h attributes,
        icl_basic_s *real = NULL;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -225,7 +225,7 @@ API int iotcon_attributes_add_double(iotcon_attributes_h attributes,
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -246,7 +246,7 @@ API int iotcon_attributes_get_str(iotcon_attributes_h attributes, const char *ke
        icl_basic_s *real = NULL;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -273,7 +273,7 @@ API int iotcon_attributes_add_str(iotcon_attributes_h attributes, const char *ke
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -295,7 +295,7 @@ API int iotcon_attributes_get_byte_str(iotcon_attributes_h attributes, const cha
        iotcon_value_h value = NULL;
        icl_val_byte_str_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -324,7 +324,7 @@ API int iotcon_attributes_add_byte_str(iotcon_attributes_h attributes,
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -347,7 +347,7 @@ API int iotcon_attributes_is_null(iotcon_attributes_h attributes, const char *ke
        icl_basic_s *real = NULL;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == is_null, IOTCON_ERROR_INVALID_PARAMETER);
@@ -368,7 +368,7 @@ API int iotcon_attributes_add_null(iotcon_attributes_h attributes, const char *k
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -389,7 +389,7 @@ API int iotcon_attributes_get_list(iotcon_attributes_h attributes, const char *k
        iotcon_value_h value = NULL;
        icl_val_list_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
@@ -416,7 +416,7 @@ API int iotcon_attributes_add_list(iotcon_attributes_h attributes, const char *k
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
@@ -439,7 +439,7 @@ API int iotcon_attributes_get_attributes(iotcon_attributes_h src, const char *ke
        icl_val_attributes_s *real = NULL;
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
@@ -466,7 +466,7 @@ API int iotcon_attributes_add_attributes(iotcon_attributes_h attributes,
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -487,7 +487,7 @@ API int iotcon_attributes_get_type(iotcon_attributes_h attributes, const char *k
 {
        iotcon_value_h value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);
@@ -518,7 +518,7 @@ int icl_attributes_set_value(iotcon_attributes_h attributes, const char *key,
 API int iotcon_attributes_get_keys_count(iotcon_attributes_h attributes,
                unsigned int *count)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == count, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == attributes->hash_table, IOTCON_ERROR_INVALID_PARAMETER);
@@ -536,7 +536,7 @@ API int iotcon_attributes_clone(iotcon_attributes_h attributes,
 
        iotcon_attributes_h temp = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == attributes_clone, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -579,7 +579,7 @@ API int iotcon_attributes_foreach(iotcon_attributes_h attributes,
        GHashTableIter iter;
        gpointer key;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-device.c b/lib/icl-device.c
index 32544d9ffc2da97b750e0b8d94042bf62d9fa58a..115b2eccf443ecc9802927b9ab31806e94d96aec 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -27,7 +27,7 @@
 API int iotcon_device_info_get_property(iotcon_device_info_h device_info,
                iotcon_device_info_e property, char **value)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == device_info, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == value, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -59,7 +59,7 @@ API int iotcon_find_device_info(const char *host_address,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
@@ -86,7 +86,7 @@ API int iotcon_set_device_name(const char *device_name)
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == device_name || '\0' == *device_name, IOTCON_ERROR_INVALID_PARAMETER);
 
        ret = icl_ioty_set_device_info(device_name);
@@ -101,7 +101,7 @@ API int iotcon_set_device_name(const char *device_name)
 API int iotcon_platform_info_get_property(iotcon_platform_info_h platform_info,
                iotcon_platform_info_e property, char **value)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == platform_info, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == value, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -154,7 +154,7 @@ API int iotcon_find_platform_info(const char *host_address,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-ioty-ocprocess.c b/lib/icl-ioty-ocprocess.c
index e72c5671ea40aec93ce1939fcfb1a3a3b40b4b16..9b0d0a918960cac82b4e863ce90b7945329433cd 100644 (file)
--- a/lib/icl-ioty-ocprocess.c
+++ b/lib/icl-ioty-ocprocess.c
@@ -58,7 +58,7 @@ void icl_ioty_ocprocess_start()
 
 API int iotcon_polling_get_interval(int *interval)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == interval, IOTCON_ERROR_INVALID_PARAMETER);
 
        *interval = icl_ioty_polling_interval;
@@ -69,7 +69,7 @@ API int iotcon_polling_get_interval(int *interval)
 
 API int iotcon_polling_set_interval(int interval)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(interval <= ICL_IOTY_TIME_INTERVAL_MIN, IOTCON_ERROR_INVALID_PARAMETER);
 
        icl_ioty_polling_interval = interval;
@@ -84,7 +84,7 @@ API int iotcon_polling_set_interval(int interval)
 
 API int iotcon_polling_invoke(void)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
 
        ic_utils_mutex_lock(IC_UTILS_MUTEX_POLLING);
        ic_utils_cond_signal(IC_UTILS_COND_POLLING);

diff --git a/lib/icl-list.c b/lib/icl-list.c
index f961e59e889198538e821d40c593a6af2382c388..d6561a6e9b6d61d222aec441b5f0b90b35a04c90 100644 (file)
--- a/lib/icl-list.c
+++ b/lib/icl-list.c
@@ -40,7 +40,7 @@ API int iotcon_list_create(iotcon_type_e type, iotcon_list_h *ret_list)
 {
        iotcon_list_h list;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_list, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (type < IOTCON_TYPE_INT || IOTCON_TYPE_ATTRIBUTES < type) {
@@ -67,7 +67,7 @@ API int iotcon_list_add_int(iotcon_list_h list, int val, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_INT != list->type, IOTCON_ERROR_INVALID_TYPE, "Invalid Type(%d)",
                        list->type);
@@ -86,7 +86,7 @@ API int iotcon_list_add_bool(iotcon_list_h list, bool val, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_BOOL != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -105,7 +105,7 @@ API int iotcon_list_add_double(iotcon_list_h list, double val, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_DOUBLE != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -124,7 +124,7 @@ API int iotcon_list_add_str(iotcon_list_h list, char *val, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_STR != list->type, IOTCON_ERROR_INVALID_TYPE,
@@ -145,7 +145,7 @@ API int iotcon_list_add_byte_str(iotcon_list_h list, unsigned char *val, int len
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_BYTE_STR != list->type, IOTCON_ERROR_INVALID_TYPE,
@@ -165,7 +165,7 @@ API int iotcon_list_add_list(iotcon_list_h list, iotcon_list_h val, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_LIST != list->type, IOTCON_ERROR_INVALID_TYPE,
@@ -185,7 +185,7 @@ API int iotcon_list_add_attributes(iotcon_list_h list, iotcon_attributes_h val,
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_ATTRIBUTES != list->type, IOTCON_ERROR_INVALID_TYPE,
@@ -206,7 +206,7 @@ API int iotcon_list_get_nth_int(iotcon_list_h list, int pos, int *val)
        int ival, ret;
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -235,7 +235,7 @@ API int iotcon_list_get_nth_bool(iotcon_list_h list, int pos, bool *val)
        bool bval;
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -264,7 +264,7 @@ API int iotcon_list_get_nth_double(iotcon_list_h list, int pos, double *val)
        double dbval;
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -293,7 +293,7 @@ API int iotcon_list_get_nth_str(iotcon_list_h list, int pos, char **val)
        char *strval;
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -323,7 +323,7 @@ API int iotcon_list_get_nth_byte_str(iotcon_list_h list, int pos,
        int ret, byte_len;
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == val, IOTCON_ERROR_INVALID_PARAMETER);
@@ -354,7 +354,7 @@ API int iotcon_list_get_nth_list(iotcon_list_h src, int pos, iotcon_list_h *dest
        iotcon_value_h value;
        iotcon_list_h list_val;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == src->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
@@ -384,7 +384,7 @@ API int iotcon_list_get_nth_attributes(iotcon_list_h list, int pos,
        iotcon_value_h value;
        iotcon_attributes_h attributes_val;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
@@ -411,7 +411,7 @@ API int iotcon_list_remove_nth(iotcon_list_h list, int pos)
 {
        iotcon_value_h value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == list->list, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -431,7 +431,7 @@ API int iotcon_list_remove_nth(iotcon_list_h list, int pos)
 
 API int iotcon_list_get_type(iotcon_list_h list, iotcon_type_e *type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -443,7 +443,7 @@ API int iotcon_list_get_type(iotcon_list_h list, iotcon_type_e *type)
 
 API int iotcon_list_get_length(iotcon_list_h list, unsigned int *length)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == length, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -472,7 +472,7 @@ API int iotcon_list_foreach_int(iotcon_list_h list, iotcon_list_int_cb cb,
        int index = 0;
        icl_basic_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_INT != list->type, IOTCON_ERROR_INVALID_TYPE, "Invalid Type(%d)",
                        list->type);
@@ -498,7 +498,7 @@ API int iotcon_list_foreach_bool(iotcon_list_h list, iotcon_list_bool_cb cb,
        int index = 0;
        icl_basic_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_BOOL != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -524,7 +524,7 @@ API int iotcon_list_foreach_double(iotcon_list_h list, iotcon_list_double_cb cb,
        int index = 0;
        icl_basic_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_DOUBLE != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -550,7 +550,7 @@ API int iotcon_list_foreach_str(iotcon_list_h list, iotcon_list_str_cb cb,
        int index = 0;
        icl_basic_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_STR != list->type, IOTCON_ERROR_INVALID_TYPE, "Invalid Type(%d)",
                        list->type);
@@ -576,7 +576,7 @@ API int iotcon_list_foreach_byte_str(iotcon_list_h list, iotcon_list_byte_str_cb
        int index = 0;
        icl_val_byte_str_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_BYTE_STR != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -602,7 +602,7 @@ API int iotcon_list_foreach_list(iotcon_list_h list, iotcon_list_list_cb cb,
        GList *cur = NULL;
        icl_val_list_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_LIST != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);
@@ -628,7 +628,7 @@ API int iotcon_list_foreach_attributes(iotcon_list_h list,
        GList *cur = NULL;
        icl_val_attributes_s *real = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == list, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(IOTCON_TYPE_ATTRIBUTES != list->type, IOTCON_ERROR_INVALID_TYPE,
                        "Invalid Type(%d)", list->type);

diff --git a/lib/icl-lite-resource.c b/lib/icl-lite-resource.c
index 5e439e25a6e39fe86bd8877cef7b22aa22738a48..b22e240458358e8f58cba8c237cca60377742cfd 100644 (file)
--- a/lib/icl-lite-resource.c
+++ b/lib/icl-lite-resource.c
@@ -41,7 +41,7 @@ API int iotcon_lite_resource_create(const char *uri_path,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
@@ -65,7 +65,7 @@ API int iotcon_lite_resource_destroy(iotcon_lite_resource_h resource)
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -85,7 +85,7 @@ API int iotcon_lite_resource_update_attributes(iotcon_lite_resource_h resource,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -103,7 +103,7 @@ API int iotcon_lite_resource_update_attributes(iotcon_lite_resource_h resource,
 API int iotcon_lite_resource_get_attributes(iotcon_lite_resource_h resource,
                iotcon_attributes_h *attributes)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-observation.c b/lib/icl-observation.c
index 22a9bc283d6e12e365120db7ba613ba086a179f4..7546ba68608bc2b78c215520bda1a483033dcebd 100644 (file)
--- a/lib/icl-observation.c
+++ b/lib/icl-observation.c
@@ -24,7 +24,7 @@
 
 API int iotcon_observers_create(iotcon_observers_h *ret_observers)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_observers, IOTCON_ERROR_INVALID_PARAMETER);
 
        iotcon_observers_h observers = calloc(1, sizeof(struct icl_observers));
@@ -50,7 +50,7 @@ API void iotcon_observers_destroy(iotcon_observers_h observers)
 
 API int iotcon_observers_add(iotcon_observers_h observers, int obs_id)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == observers, IOTCON_ERROR_INVALID_PARAMETER);
 
        observers->observers_list = g_list_append(observers->observers_list,
@@ -62,7 +62,7 @@ API int iotcon_observers_add(iotcon_observers_h observers, int obs_id)
 
 API int iotcon_observers_remove(iotcon_observers_h observers, int obs_id)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == observers, IOTCON_ERROR_INVALID_PARAMETER);
 
        observers->observers_list = g_list_remove(observers->observers_list,

diff --git a/lib/icl-options.c b/lib/icl-options.c
index 19ad7b2128fbeef2cd74dd3fddf063f0638696c4..0068e9d2127e7ad1281fa2d808dca22ac1f82954 100644 (file)
--- a/lib/icl-options.c
+++ b/lib/icl-options.c
@@ -69,7 +69,7 @@ API int iotcon_options_create(iotcon_options_h *ret_options)
 {
        iotcon_options_h options;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_options, IOTCON_ERROR_INVALID_PARAMETER);
 
        options = calloc(1, sizeof(struct icl_options));
@@ -106,7 +106,7 @@ API void iotcon_options_destroy(iotcon_options_h options)
 API int iotcon_options_add(iotcon_options_h options, unsigned short id,
                const char *data)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < options->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
                        "Don't modify it. It is already set.");
@@ -130,7 +130,7 @@ API int iotcon_options_remove(iotcon_options_h options, unsigned short id)
 {
        gboolean is_removed;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < options->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
                        "Don't modify it. It is already set.");
@@ -149,7 +149,7 @@ API int iotcon_options_lookup(iotcon_options_h options, unsigned short id,
 {
        char *value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == data, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -171,7 +171,7 @@ API int iotcon_options_foreach(iotcon_options_h options,
        GHashTableIter iter;
        gpointer key, value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-presence.c b/lib/icl-presence.c
index 107fb10c28d9e0781a44be7ca445fe6b925eebd0..2a523144447c826d2a27b0eb0129b1b638c82a5b 100644 (file)
--- a/lib/icl-presence.c
+++ b/lib/icl-presence.c
@@ -30,7 +30,7 @@ API int iotcon_start_presence(unsigned int time_to_live)
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
 
@@ -54,7 +54,7 @@ API int iotcon_stop_presence(void)
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
 
@@ -78,7 +78,7 @@ API int iotcon_add_presence_cb(const char *host_address,
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
@@ -118,7 +118,7 @@ API int iotcon_remove_presence_cb(iotcon_presence_h presence)
        FN_CALL;
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
@@ -147,7 +147,7 @@ API int iotcon_remove_presence_cb(iotcon_presence_h presence)
 API int iotcon_presence_get_host_address(iotcon_presence_h presence,
                char **host_address)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -160,7 +160,7 @@ API int iotcon_presence_get_host_address(iotcon_presence_h presence,
 API int iotcon_presence_get_connectivity_type(iotcon_presence_h presence,
                iotcon_connectivity_type_e *connectivity_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -173,7 +173,7 @@ API int iotcon_presence_get_connectivity_type(iotcon_presence_h presence,
 API int iotcon_presence_get_resource_type(iotcon_presence_h presence,
                char **resource_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resource_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -186,7 +186,7 @@ API int iotcon_presence_get_resource_type(iotcon_presence_h presence,
 API int iotcon_presence_response_get_host_address(
                iotcon_presence_response_h response, char **host_address)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -199,7 +199,7 @@ API int iotcon_presence_response_get_host_address(
 API int iotcon_presence_response_get_connectivity_type(
                iotcon_presence_response_h response, iotcon_connectivity_type_e *connectivity_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -212,7 +212,7 @@ API int iotcon_presence_response_get_connectivity_type(
 API int iotcon_presence_response_get_resource_type(
                iotcon_presence_response_h response, char **resource_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resource_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -225,7 +225,7 @@ API int iotcon_presence_response_get_resource_type(
 API int iotcon_presence_response_get_result(iotcon_presence_response_h response,
                iotcon_presence_result_e *result)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == result, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -238,7 +238,7 @@ API int iotcon_presence_response_get_result(iotcon_presence_response_h response,
 API int iotcon_presence_response_get_trigger(iotcon_presence_response_h response,
                iotcon_presence_trigger_e *trigger)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == trigger, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-query.c b/lib/icl-query.c
index a9ec29f23c5a5d627692c946125e26c73e41fc2e..8f020f362bdfdf5ef57a75dd656117a353c787ab 100644 (file)
--- a/lib/icl-query.c
+++ b/lib/icl-query.c
@@ -31,7 +31,7 @@ API int iotcon_query_create(iotcon_query_h *ret_query)
 {
        iotcon_query_h query;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_query, IOTCON_ERROR_INVALID_PARAMETER);
 
        query = calloc(1, sizeof(struct icl_query));
@@ -62,7 +62,7 @@ API int iotcon_query_get_resource_type(iotcon_query_h query,
 {
        char *type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resource_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -81,7 +81,7 @@ API int iotcon_query_get_interface(iotcon_query_h query, char **resource_iface)
 {
        char *iface = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resource_iface, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -103,7 +103,7 @@ API int iotcon_query_set_resource_type(iotcon_query_h query,
        int length_new = 0;
        char *value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(resource_type && (false == icl_resource_check_type(resource_type)),
                        IOTCON_ERROR_INVALID_PARAMETER);
@@ -135,7 +135,7 @@ API int iotcon_query_set_interface(iotcon_query_h query, const char *resource_if
        int length_new = 0;
        char *value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(resource_iface && (false == icl_resource_check_interface(resource_iface)),
                        IOTCON_ERROR_INVALID_PARAMETER);
@@ -165,7 +165,7 @@ API int iotcon_query_add(iotcon_query_h query, const char *key, const char *valu
 {
        int query_len;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == value, IOTCON_ERROR_INVALID_PARAMETER);
@@ -191,7 +191,7 @@ API int iotcon_query_remove(iotcon_query_h query, const char *key)
        int query_len;
        char *value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -218,7 +218,7 @@ API int iotcon_query_lookup(iotcon_query_h query, const char *key, char **data)
 {
        char *value = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == key, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == data, IOTCON_ERROR_INVALID_PARAMETER);
@@ -240,7 +240,7 @@ API int iotcon_query_foreach(iotcon_query_h query, iotcon_query_foreach_cb cb,
        GHashTableIter iter;
        gpointer key, value;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-remote-resource-caching.c b/lib/icl-remote-resource-caching.c
index 812f22ffd6a73ed0628f00cac233dca1ae341218..b56daeeceb7f592751e35c0235447a24060dfe7d 100644 (file)
--- a/lib/icl-remote-resource-caching.c
+++ b/lib/icl-remote-resource-caching.c
@@ -31,7 +31,7 @@ API int iotcon_remote_resource_start_caching(iotcon_remote_resource_h resource,
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -67,7 +67,7 @@ API int iotcon_remote_resource_stop_caching(iotcon_remote_resource_h resource)
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -99,7 +99,7 @@ API int iotcon_remote_resource_get_cached_representation(
                iotcon_remote_resource_h resource,
                iotcon_representation_h *representation)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == representation, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == resource->cached_repr, "No Cached Representation");

diff --git a/lib/icl-remote-resource-crud.c b/lib/icl-remote-resource-crud.c
index e3534a3bf43f5e5b46fe0d5f8a0d7de142a34f38..d59beb87222e469f5242a867e3362815f25b1d77 100644 (file)
--- a/lib/icl-remote-resource-crud.c
+++ b/lib/icl-remote-resource-crud.c
@@ -27,7 +27,7 @@ API int iotcon_remote_resource_get(iotcon_remote_resource_h resource,
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -67,7 +67,7 @@ API int iotcon_remote_resource_put(iotcon_remote_resource_h resource,
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -108,7 +108,7 @@ API int iotcon_remote_resource_post(iotcon_remote_resource_h resource,
 
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -145,7 +145,7 @@ API int iotcon_remote_resource_delete(iotcon_remote_resource_h resource,
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -184,7 +184,7 @@ API int iotcon_remote_resource_observe_register(
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -223,7 +223,7 @@ API int iotcon_remote_resource_observe_deregister(
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-remote-resource-monitoring.c b/lib/icl-remote-resource-monitoring.c
index 42d1b33767bd4b7e50e1098c9e96e199e92281c1..e9bbf79dd05fdd67c750a77e05e98c8ea5eb544b 100644 (file)
--- a/lib/icl-remote-resource-monitoring.c
+++ b/lib/icl-remote-resource-monitoring.c
@@ -30,7 +30,7 @@ API int iotcon_remote_resource_start_monitoring(
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -67,7 +67,7 @@ API int iotcon_remote_resource_stop_monitoring(
 {
        int ret, connectivity_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-remote-resource.c b/lib/icl-remote-resource.c
index 9d6c9d7f7c0fe1e8a88b00b9f0f9264dc83602c0..1cba6edbff99b7fc486a90e6512cd3debef15f22 100644 (file)
--- a/lib/icl-remote-resource.c
+++ b/lib/icl-remote-resource.c
@@ -42,7 +42,7 @@ API int iotcon_find_resource(const char *host_address,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
@@ -80,7 +80,7 @@ API int iotcon_remote_resource_create(const char *host_address,
        FN_CALL;
        iotcon_remote_resource_h resource = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(false == icl_resource_check_uri_path(uri_path),
@@ -194,7 +194,7 @@ API int iotcon_remote_resource_clone(iotcon_remote_resource_h src,
        int ret;
        iotcon_remote_resource_h resource = NULL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -248,7 +248,7 @@ API int iotcon_remote_resource_clone(iotcon_remote_resource_h src,
 API int iotcon_remote_resource_get_uri_path(iotcon_remote_resource_h resource,
                char **uri_path)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -262,7 +262,7 @@ API int iotcon_remote_resource_get_uri_path(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_get_host_address(
                iotcon_remote_resource_h resource, char **host_address)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -276,7 +276,7 @@ API int iotcon_remote_resource_get_host_address(
 API int iotcon_remote_resource_get_connectivity_type(
                iotcon_remote_resource_h resource, iotcon_connectivity_type_e *connectivity_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -290,7 +290,7 @@ API int iotcon_remote_resource_get_connectivity_type(
 API int iotcon_remote_resource_get_device_id(iotcon_remote_resource_h resource,
                char **device_id)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == device_id, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(NULL == resource->device_id, IOTCON_ERROR_NO_DATA,
@@ -306,7 +306,7 @@ API int iotcon_remote_resource_get_device_id(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_get_device_name(iotcon_remote_resource_h resource,
                char **device_name)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == device_name, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(NULL == resource->device_name, IOTCON_ERROR_NO_DATA,
@@ -322,7 +322,7 @@ API int iotcon_remote_resource_get_device_name(iotcon_remote_resource_h resource
 API int iotcon_remote_resource_get_types(iotcon_remote_resource_h resource,
                iotcon_resource_types_h *types)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -336,7 +336,7 @@ API int iotcon_remote_resource_get_types(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_get_interfaces(iotcon_remote_resource_h resource,
                iotcon_resource_interfaces_h *ifaces)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -349,7 +349,7 @@ API int iotcon_remote_resource_get_interfaces(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_get_policies(iotcon_remote_resource_h resource,
                uint8_t *policies)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == policies, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -361,7 +361,7 @@ API int iotcon_remote_resource_get_policies(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_get_options(iotcon_remote_resource_h resource,
                iotcon_options_h *options)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == resource->header_options, "Not Set header options");
@@ -375,7 +375,7 @@ API int iotcon_remote_resource_get_options(iotcon_remote_resource_h resource,
 API int iotcon_remote_resource_set_options(iotcon_remote_resource_h resource,
                iotcon_options_h options)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (options)
@@ -393,7 +393,7 @@ API int iotcon_remote_resource_get_time_interval(int *time_interval)
 {
        int ret, arg_time_interval;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == time_interval, IOTCON_ERROR_INVALID_PARAMETER);
 
        ret = icl_ioty_remote_resource_get_time_interval(&arg_time_interval);
@@ -412,7 +412,7 @@ API int iotcon_remote_resource_set_time_interval(int time_interval)
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(ICL_REMOTE_RESOURCE_MAX_TIME_INTERVAL < time_interval || time_interval <= 0,
                        IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-representation.c b/lib/icl-representation.c
index 6be07f23ed0e6f6a158e1fd2049b120987997928..55e0c442b856381459e6cf4fdd2d484aa07548f9 100644 (file)
--- a/lib/icl-representation.c
+++ b/lib/icl-representation.c
@@ -53,7 +53,7 @@ API int iotcon_representation_create(iotcon_representation_h *ret_repr)
 {
        iotcon_representation_h repr;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_repr, IOTCON_ERROR_INVALID_PARAMETER);
 
        repr = calloc(1, sizeof(struct icl_representation_s));
@@ -104,7 +104,7 @@ API void iotcon_representation_destroy(iotcon_representation_h repr)
 API int iotcon_representation_get_uri_path(iotcon_representation_h repr,
                char **uri_path)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == repr->uri_path, IOTCON_ERROR_NO_DATA);
@@ -117,7 +117,7 @@ API int iotcon_representation_get_uri_path(iotcon_representation_h repr,
 API int iotcon_representation_set_uri_path(iotcon_representation_h repr,
                const char *uri_path)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(false == icl_resource_check_uri_path(uri_path),
@@ -136,7 +136,7 @@ API int iotcon_representation_set_uri_path(iotcon_representation_h repr,
 API int iotcon_representation_get_resource_types(iotcon_representation_h repr,
                iotcon_resource_types_h *types)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == repr->res_types, "Not Set Resource Types");
@@ -149,7 +149,7 @@ API int iotcon_representation_get_resource_types(iotcon_representation_h repr,
 API int iotcon_representation_set_resource_types(iotcon_representation_h repr,
                iotcon_resource_types_h types)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (types)
@@ -166,7 +166,7 @@ API int iotcon_representation_set_resource_types(iotcon_representation_h repr,
 API int iotcon_representation_get_resource_interfaces(
                iotcon_representation_h repr, iotcon_resource_interfaces_h *ifaces)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == repr->interfaces, "Not Set Resource Interfaces");
@@ -179,7 +179,7 @@ API int iotcon_representation_get_resource_interfaces(
 API int iotcon_representation_set_resource_interfaces(
                iotcon_representation_h repr, iotcon_resource_interfaces_h ifaces)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (ifaces)
@@ -196,7 +196,7 @@ API int iotcon_representation_set_resource_interfaces(
 API int iotcon_representation_set_attributes(iotcon_representation_h repr,
                iotcon_attributes_h attributes)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (attributes)
@@ -214,7 +214,7 @@ API int iotcon_representation_set_attributes(iotcon_representation_h repr,
 API int iotcon_representation_get_attributes(iotcon_representation_h repr,
                iotcon_attributes_h *attributes)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == attributes, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -228,7 +228,7 @@ API int iotcon_representation_add_child(iotcon_representation_h parent,
 {
        iotcon_representation_h repr;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -243,7 +243,7 @@ API int iotcon_representation_add_child(iotcon_representation_h parent,
 API int iotcon_representation_remove_child(iotcon_representation_h parent,
                iotcon_representation_h child)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -260,7 +260,7 @@ API int iotcon_representation_foreach_children(iotcon_representation_h parent,
 {
        GList *list, *next;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -278,7 +278,7 @@ API int iotcon_representation_foreach_children(iotcon_representation_h parent,
 API int iotcon_representation_get_child_count(iotcon_representation_h parent,
                unsigned int *count)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == count, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -292,7 +292,7 @@ API int iotcon_representation_get_nth_child(iotcon_representation_h parent,
 {
        iotcon_representation_h repr;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(pos < 0, IOTCON_ERROR_INVALID_PARAMETER);
@@ -320,7 +320,7 @@ API int iotcon_representation_clone(const iotcon_representation_h src,
        iotcon_resource_interfaces_h ifaces;
        iotcon_representation_h cloned_repr, copied_repr;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-request.c b/lib/icl-request.c
index a70850af24a7df027f98369460163533b41d58b2..88e4be4af18fa89a49b9bc30359adc4907adbffc 100644 (file)
--- a/lib/icl-request.c
+++ b/lib/icl-request.c
@@ -21,7 +21,7 @@
 API int iotcon_request_get_host_address(iotcon_request_h request,
                char **host_address)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -34,7 +34,7 @@ API int iotcon_request_get_host_address(iotcon_request_h request,
 API int iotcon_request_get_connectivity_type(iotcon_request_h request,
                iotcon_connectivity_type_e *connectivity_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == connectivity_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -48,7 +48,7 @@ API int iotcon_request_get_connectivity_type(iotcon_request_h request,
 API int iotcon_request_get_representation(iotcon_request_h request,
                iotcon_representation_h *repr)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -61,7 +61,7 @@ API int iotcon_request_get_representation(iotcon_request_h request,
 API int iotcon_request_get_request_type(iotcon_request_h request,
                iotcon_request_type_e *type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -75,7 +75,7 @@ API int iotcon_request_get_request_type(iotcon_request_h request,
 API int iotcon_request_get_options(iotcon_request_h request,
                iotcon_options_h *options)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == request->header_options, "Not Set header options");
@@ -89,7 +89,7 @@ API int iotcon_request_get_options(iotcon_request_h request,
 /* The content of the request should not be freed by user. */
 API int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == query, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == request->query, "Not Set query");
@@ -103,7 +103,7 @@ API int iotcon_request_get_query(iotcon_request_h request, iotcon_query_h *query
 API int iotcon_request_get_observe_type(iotcon_request_h request,
                iotcon_observe_type_e *observe_type)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == observe_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -115,7 +115,7 @@ API int iotcon_request_get_observe_type(iotcon_request_h request,
 
 API int iotcon_request_get_observe_id(iotcon_request_h request, int *observe_id)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == observe_id, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-resource-interfaces.c b/lib/icl-resource-interfaces.c
index ded8d879515fa4801873cd5e440f0acd28abb856..fdc3bc5e155f20ed96031daa133211c2578a66b9 100644 (file)
--- a/lib/icl-resource-interfaces.c
+++ b/lib/icl-resource-interfaces.c
@@ -39,7 +39,7 @@ API int iotcon_resource_interfaces_create(iotcon_resource_interfaces_h *ret_ifac
 {
        iotcon_resource_interfaces_h ifaces;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_ifaces, IOTCON_ERROR_INVALID_PARAMETER);
 
        ifaces = calloc(1, sizeof(struct icl_resource_ifaces));
@@ -97,7 +97,7 @@ API int iotcon_resource_interfaces_add(iotcon_resource_interfaces_h ifaces,
 {
        char *resource_iface;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == iface, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < ifaces->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
@@ -127,7 +127,7 @@ API int iotcon_resource_interfaces_remove(iotcon_resource_interfaces_h ifaces,
        GList *node;
        char *node_data;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == iface, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < ifaces->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
@@ -152,7 +152,7 @@ API int iotcon_resource_interfaces_foreach(iotcon_resource_interfaces_h ifaces,
 {
        GList *node;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -172,7 +172,7 @@ API int iotcon_resource_interfaces_clone(iotcon_resource_interfaces_h src,
        char *resource_iface;
        iotcon_resource_interfaces_h resource_ifaces;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-resource-types.c b/lib/icl-resource-types.c
index 6f42cacb1ad9f9c104dcdffd0ca33f224ed9c9f5..91d5634b0bc3d48df53b444b502617ffefc40ab6 100644 (file)
--- a/lib/icl-resource-types.c
+++ b/lib/icl-resource-types.c
@@ -39,7 +39,7 @@ API int iotcon_resource_types_create(iotcon_resource_types_h *ret_types)
 {
        iotcon_resource_types_h types;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == ret_types, IOTCON_ERROR_INVALID_PARAMETER);
 
        types = calloc(1, sizeof(struct icl_resource_types));
@@ -97,7 +97,7 @@ API int iotcon_resource_types_add(iotcon_resource_types_h types, const char *typ
 {
        char *resource_type;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < types->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
@@ -127,7 +127,7 @@ API int iotcon_resource_types_remove(iotcon_resource_types_h types,
        GList *found_node;
        char *node_data;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == type, IOTCON_ERROR_INVALID_PARAMETER);
        RETVM_IF(1 < types->ref_count, IOTCON_ERROR_INVALID_PARAMETER,
@@ -152,7 +152,7 @@ API int iotcon_resource_types_foreach(iotcon_resource_types_h types,
 {
        GList *node;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -172,7 +172,7 @@ API int iotcon_resource_types_clone(iotcon_resource_types_h src,
        char *resource_type;
        iotcon_resource_types_h resource_types;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == src, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == dest, IOTCON_ERROR_INVALID_PARAMETER);
 

diff --git a/lib/icl-resource.c b/lib/icl-resource.c
index babc0bb5e125d67430fd2edd1e755afc06f14adf..c9182b17ff6f1ed045df7c3225737b4efe8f9338 100644 (file)
--- a/lib/icl-resource.c
+++ b/lib/icl-resource.c
@@ -113,7 +113,7 @@ API int iotcon_resource_create(const char *uri_path,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
@@ -140,7 +140,7 @@ API int iotcon_resource_destroy(iotcon_resource_h resource)
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -161,7 +161,7 @@ API int iotcon_resource_bind_interface(iotcon_resource_h resource,
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -183,7 +183,7 @@ API int iotcon_resource_bind_type(iotcon_resource_h resource,
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
@@ -201,7 +201,7 @@ API int iotcon_resource_bind_type(iotcon_resource_h resource,
 API int iotcon_resource_set_request_handler(iotcon_resource_h resource,
                iotcon_request_handler_cb cb, void *user_data)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -218,7 +218,7 @@ API int iotcon_resource_bind_child_resource(iotcon_resource_h parent,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
@@ -246,7 +246,7 @@ API int iotcon_resource_unbind_child_resource(iotcon_resource_h parent,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
@@ -277,7 +277,7 @@ API int iotcon_resource_unbind_child_resource(iotcon_resource_h parent,
 API int iotcon_resource_get_child_count(iotcon_resource_h resource,
                unsigned int *count)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == count, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -292,7 +292,7 @@ API int iotcon_resource_get_nth_child(iotcon_resource_h parent, int index,
 {
        iotcon_resource_h resource;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(index < 0, IOTCON_ERROR_INVALID_PARAMETER);
@@ -313,7 +313,7 @@ API int iotcon_resource_get_nth_child(iotcon_resource_h parent, int index,
 /* The content of the resource should not be freed by user. */
 API int iotcon_resource_get_uri_path(iotcon_resource_h resource, char **uri_path)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -327,7 +327,7 @@ API int iotcon_resource_get_uri_path(iotcon_resource_h resource, char **uri_path
 API int iotcon_resource_get_types(iotcon_resource_h resource,
                iotcon_resource_types_h *types)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == types, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -340,7 +340,7 @@ API int iotcon_resource_get_types(iotcon_resource_h resource,
 API int iotcon_resource_get_interfaces(iotcon_resource_h resource,
                iotcon_resource_interfaces_h *ifaces)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == ifaces, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -352,7 +352,7 @@ API int iotcon_resource_get_interfaces(iotcon_resource_h resource,
 
 API int iotcon_resource_get_policies(iotcon_resource_h resource, uint8_t *policies)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == policies, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -366,7 +366,7 @@ API int iotcon_resource_notify(iotcon_resource_h resource,
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-response.c b/lib/icl-response.c
index 05f7011862b2c6f0e4d09b87a06482b8d4c4d6d7..3a405bb495c3b8701fd73409a9dfd9aba8d323ad 100644 (file)
--- a/lib/icl-response.c
+++ b/lib/icl-response.c
@@ -36,7 +36,7 @@ API int iotcon_response_create(iotcon_request_h request,
 {
        FN_CALL;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == request, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == response, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -69,7 +69,7 @@ API void iotcon_response_destroy(iotcon_response_h resp)
 API int iotcon_response_get_options(iotcon_response_h resp,
                iotcon_options_h *options)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == options, IOTCON_ERROR_INVALID_PARAMETER);
        WARN_IF(NULL == resp->header_options, "Not Set header options");
@@ -82,7 +82,7 @@ API int iotcon_response_get_options(iotcon_response_h resp,
 API int iotcon_response_get_representation(iotcon_response_h resp,
                iotcon_representation_h *repr)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resp->repr, IOTCON_ERROR_NO_DATA);
@@ -96,7 +96,7 @@ API int iotcon_response_get_representation(iotcon_response_h resp,
 API int iotcon_response_get_result(iotcon_response_h resp,
                iotcon_response_result_e *result)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == result, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -108,7 +108,7 @@ API int iotcon_response_get_result(iotcon_response_h resp,
 API int iotcon_response_set_result(iotcon_response_h resp,
                iotcon_response_result_e result)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (result < IOTCON_RESPONSE_OK || ICL_RESPONSE_RESULT_MAX <= result) {
@@ -124,7 +124,7 @@ API int iotcon_response_set_result(iotcon_response_h resp,
 API int iotcon_response_set_representation(iotcon_response_h resp,
                iotcon_representation_h repr)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (repr)
@@ -142,7 +142,7 @@ API int iotcon_response_set_representation(iotcon_response_h resp,
 API int iotcon_response_set_options(iotcon_response_h resp,
                iotcon_options_h options)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (options)
@@ -161,7 +161,7 @@ API int iotcon_response_send(iotcon_response_h resp)
        FN_CALL;
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
                        IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl.c b/lib/icl.c
index 00071a0536c37d4b5afe5e5baf10ef2cd2e526af..6c6d34fe7d6e4c8192b687615c140b50982f7efd 100644 (file)
--- a/lib/icl.c
+++ b/lib/icl.c
@@ -31,7 +31,7 @@ API int iotcon_secure_initialize(const char *file_path)
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_security_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_security_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission((IC_PERMISSION_INTERNET|IC_PERMISSION_NETWORK_GET)),
                        IOTCON_ERROR_PERMISSION_DENIED);
        // TODO: Consider (NULL == Path)
@@ -56,7 +56,7 @@ API int iotcon_initialize(void)
 {
        int ret;
 
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(false == ic_utils_check_permission((IC_PERMISSION_INTERNET|IC_PERMISSION_NETWORK_GET)),
                        IOTCON_ERROR_PERMISSION_DENIED);
 
@@ -102,7 +102,7 @@ API void iotcon_deinitialize(void)
 
 API int iotcon_get_timeout(int *timeout_seconds)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == timeout_seconds, IOTCON_ERROR_INVALID_PARAMETER);
 
        *timeout_seconds = icl_timeout_seconds;
@@ -113,7 +113,7 @@ API int iotcon_get_timeout(int *timeout_seconds)
 
 API int iotcon_set_timeout(int timeout_seconds)
 {
-       RETV_IF(false == ic_utils_check_oic_feature(), IOTCON_ERROR_NOT_SUPPORTED);
+       RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        if (ICL_TIMEOUT_MAX < timeout_seconds || timeout_seconds <= 0) {
                ERR("timeout_seconds(%d) must be in range from 1 to 3600", timeout_seconds);
                return IOTCON_ERROR_INVALID_PARAMETER;