Remove needless handle for stc

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

diff --git a/include/stc_mgr_internal.h b/include/stc_mgr_internal.h
index 59fc7a2..57d4209 100755 (executable)
--- a/include/stc_mgr_internal.h
+++ b/include/stc_mgr_internal.h
@@ -403,9 +403,8 @@ int stc_get_restriction_type(stc_h stc, stc_restriction_rule_h rule,
  * @privlevel platform
  * @privilege %http://tizen.org/privilege/network.get
  *
- * @param[in] stc The stc handle
- * @param[in] list The restriction list handle
- * @param[in] rule The restriction rule handle
+ * @param[in] list_h The restriction list handle
+ * @param[in] rule_h The restriction rule handle
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #STC_ERROR_NONE Successful
@@ -443,8 +442,8 @@ int stc_get_restriction_type(stc_h stc, stc_restriction_rule_h rule,
  * @see stc_set_restriction_list()
  * @see stc_unset_restriction_list()
  */
-int stc_add_restriction_rule_to_list(stc_h stc,
-               stc_restriction_list_h list, stc_restriction_rule_h rule);
+int stc_add_restriction_rule_to_list(stc_restriction_list_h list_h,
+                       stc_restriction_rule_h rule_h);
 
 /**
  * @brief Removes the restriction from list.
@@ -452,9 +451,8 @@ int stc_add_restriction_rule_to_list(stc_h stc,
  * @privlevel platform
  * @privilege %http://tizen.org/privilege/network.get
  *
- * @param[in] stc The stc handle
- * @param[in] list The restriction list handle
- * @param[in] rule The restriction rule handle
+ * @param[in] list_h The restriction list handle
+ * @param[in] rule_h The restriction rule handle
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #STC_ERROR_NONE Successful
@@ -492,8 +490,8 @@ int stc_add_restriction_rule_to_list(stc_h stc,
  * @see stc_set_restriction_list()
  * @see stc_unset_restriction_list()
  */
-int stc_remove_restriction_rule_from_list(stc_h stc,
-               stc_restriction_list_h list, stc_restriction_rule_h rule);
+int stc_remove_restriction_rule_from_list(stc_restriction_list_h list_h,
+                       stc_restriction_rule_h rule_h);
 
 /**
  * @brief Gets the restriction from list.
@@ -601,7 +599,7 @@ int stc_foreach_restriction_list(stc_h stc, stc_restriction_list_cb list_cb, voi
  * @privilege %http://tizen.org/privilege/network.get
  *
  * @param[in] stc The stc handle
- * @param[in] list The restriction list handle
+ * @param[in] list_h The restriction list handle
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #STC_ERROR_NONE Successful
@@ -639,7 +637,7 @@ int stc_foreach_restriction_list(stc_h stc, stc_restriction_list_cb list_cb, voi
  * @see stc_foreach_restriction_list()
  * @see stc_unset_restriction_list()
  */
-int stc_set_restriction_list(stc_h stc, stc_restriction_list_h list);
+int stc_set_restriction_list(stc_h stc, stc_restriction_list_h list_h);
 
 /**
  * @brief Unsets the restriction list.
@@ -648,7 +646,7 @@ int stc_set_restriction_list(stc_h stc, stc_restriction_list_h list);
  * @privilege %http://tizen.org/privilege/network.get
  *
  * @param[in] stc The stc handle
- * @param[in] list The restriction list handle
+ * @param[in] list_h The restriction list handle
  *
  * @return 0 on success, otherwise a negative error value
  * @retval #STC_ERROR_NONE Successful
@@ -686,7 +684,7 @@ int stc_set_restriction_list(stc_h stc, stc_restriction_list_h list);
  * @see stc_foreach_restriction_list()
  * @see stc_set_restriction_list()
  */
-int stc_unset_restriction_list(stc_h stc, stc_restriction_list_h list);
+int stc_unset_restriction_list(stc_h stc, stc_restriction_list_h list_h);
 
 /**
 * @}

diff --git a/include/stc_rstn_internal.h b/include/stc_rstn_internal.h
index 613d921..df15b39 100755 (executable)
--- a/include/stc_rstn_internal.h
+++ b/include/stc_rstn_internal.h
@@ -807,7 +807,7 @@ int stc_restriction_rule_get_subscriber_id(stc_restriction_rule_h rule, char **s
  * @privilege %http://tizen.org/privilege/network.get
  * @remarks You must release @a handle using stc_restriction_list_destroy().
  *
- * @param[in] stc The stc handle
+ * @param[in] name The restriction list name
  * @param[out] list The restriction list handle
  *
  * @return 0 on success, otherwise a negative error value
@@ -825,8 +825,7 @@ int stc_restriction_rule_get_subscriber_id(stc_restriction_rule_h rule, char **s
  * @see stc_initialize()
  * @see stc_restriction_list_destroy()
  */
-int stc_restriction_list_create(stc_h stc, stc_restriction_list_h *list,
-                       const char *name);
+int stc_restriction_list_create(const char *name, stc_restriction_list_h *list_h);
 
 /**
  * @brief Destroys the restriction list handle.
@@ -849,7 +848,7 @@ int stc_restriction_list_create(stc_h stc, stc_restriction_list_h *list,
  * @see #stc_restriction_list_h
  * @see stc_restriction_list_create()
  */
-int stc_restriction_list_destroy(stc_restriction_list_h list);
+int stc_restriction_list_destroy(stc_restriction_list_h list_h);
 
 /**
 * @}

diff --git a/src/stc-manager.c b/src/stc-manager.c
index 4bd6b27..bd0ba2d 100755 (executable)
--- a/src/stc-manager.c
+++ b/src/stc-manager.c
@@ -539,74 +539,66 @@ EXPORT_API int stc_get_restriction_type(stc_h stc, stc_restriction_rule_h rule,
        return STC_ERROR_NONE;
 }
 
-EXPORT_API int stc_add_restriction_rule_to_list(stc_h stc,
-               stc_restriction_list_h list, stc_restriction_rule_h rule)
+EXPORT_API int stc_add_restriction_rule_to_list(stc_restriction_list_h list_h,
+                               stc_restriction_rule_h rule_h)
 {
        int ret = STC_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
-       if (!(_stc_handle_check_validity(stc))) {
-               STC_LOGE("Invalid parameter");
-               return STC_ERROR_INVALID_PARAMETER;
-       }
-
-       if (_stc_restriction_check_list_validity(list) == false) {
+       if (_stc_restriction_check_list_validity(list_h) == false) {
                STC_LOGE("Invalid parameter");
                return STC_ERROR_INVALID_PARAMETER;
        }
 
-       if (_stc_restriction_check_rule_validity(rule) == false) {
+       if (_stc_restriction_check_rule_validity(rule_h) == false) {
                STC_LOGE("Invalid parameter");
                return STC_ERROR_INVALID_PARAMETER;
        }
 
-       ret = _stc_restriction_validate_rule(rule);
+       ret = _stc_restriction_validate_rule(rule_h);
        if (ret != STC_ERROR_NONE) {
                STC_LOGE("Invalid restriction rule [%s]",
                        _stc_convert_error_type_to_string(ret));
                return ret;
        }
 
-       if (_stc_restriction_add_rule_to_list(list, rule) == false) {
+       if (_stc_restriction_add_rule_to_list(list_h, rule_h) == false) {
                STC_LOGE("Failed to add restriction rule to list[%s]",
                        _stc_convert_error_type_to_string(ret));
                return ret;
        }
 
+       STC_LOGI("Added restriction rule to list");
+
        return STC_ERROR_NONE;
 }
 
-EXPORT_API int stc_remove_restriction_rule_from_list(stc_h stc,
-               stc_restriction_list_h list, stc_restriction_rule_h rule)
+EXPORT_API int stc_remove_restriction_rule_from_list(stc_restriction_list_h list_h,
+                               stc_restriction_rule_h rule_h)
 {
        int ret = STC_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
-       if (!(_stc_handle_check_validity(stc))) {
+       if (_stc_restriction_check_list_validity(list_h) == false) {
                STC_LOGE("Invalid parameter");
                return STC_ERROR_INVALID_PARAMETER;
        }
 
-       if (_stc_restriction_check_list_validity(list) == false) {
+       if (_stc_restriction_check_rule_validity(rule_h) == false) {
                STC_LOGE("Invalid parameter");
                return STC_ERROR_INVALID_PARAMETER;
        }
 
-       if (_stc_restriction_check_rule_validity(rule) == false) {
-               STC_LOGE("Invalid parameter");
-               return STC_ERROR_INVALID_PARAMETER;
-       }
-
-       ret = _stc_restriction_validate_rule(rule);
+       ret = _stc_restriction_validate_rule(rule_h);
        if (ret != STC_ERROR_NONE) {
                STC_LOGE("Invalid restriction rule [%s]",
                        _stc_convert_error_type_to_string(ret));
                return ret;
        }
 
-       if (_stc_restriction_remove_rule_from_list(list, rule) == false) {
+       if (_stc_restriction_remove_rule_from_list(list_h, rule_h) == false) {
                STC_LOGE("Failed to remove restriction rule from list[%s]",
                        _stc_convert_error_type_to_string(ret));
                return ret;

diff --git a/src/stc-restriction.c b/src/stc-restriction.c
index 6811319..7f61788 100755 (executable)
--- a/src/stc-restriction.c
+++ b/src/stc-restriction.c
@@ -1534,17 +1534,12 @@ EXPORT_API int stc_restriction_rule_get_subscriber_id(stc_restriction_rule_h rul
        return STC_ERROR_NONE;
 }
 
-EXPORT_API int stc_restriction_list_create(stc_h stc, stc_restriction_list_h *list,
-                       const char *name)
+EXPORT_API int stc_restriction_list_create(const char *name,
+                               stc_restriction_list_h *list_h)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
-       if (!(_stc_handle_check_validity(stc))) {
-               STC_LOGE("Invalid parameter");
-               return STC_ERROR_INVALID_PARAMETER;
-       }
-
-       if (list == NULL || name == NULL) {
+       if (list_h == NULL || name == NULL) {
                STC_LOGE("Invalid parameter");
                return STC_ERROR_INVALID_PARAMETER;
        }
@@ -1559,7 +1554,7 @@ EXPORT_API int stc_restriction_list_create(stc_h stc, stc_restriction_list_h *li
        __stc_restriction_init_list(restriction_list, name);
        _stc_restriction_add_list((stc_restriction_list_h)restriction_list);
 
-       *list = (stc_restriction_list_h)restriction_list;
+       *list_h = (stc_restriction_list_h)restriction_list;
        STC_LOGI("Restriction list successfully created [%s]", name);
 
        return STC_ERROR_NONE;