Change internal api's name in stc

- stc_*_imsi() -> stc_*_subscriber_id()

Change-Id: Ie15780c4a3ea1a4313a22e94caedfac1791bddc6
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
index 5d67575f713e05819770faa5b03ffa7e6b5ddd6d..bdaeeb1d875af2695c4c6cd3c94bdba514f9c8fa 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -350,9 +350,9 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
        if (iface_type != STC_IFACE_DATACALL)
                return STC_CALLBACK_CONTINUE;
 
-       ret = stc_restriction_info_get_imsi(info, &imsi);
+       ret = stc_restriction_info_get_subscriber_id(info, &imsi);
        if (STC_ERROR_NONE != ret) {
-               SETTING_TRACE_ERROR("stc_restriction_info_get_imsi error: %s",
+               SETTING_TRACE_ERROR("stc_restriction_info_get_subscriber_id error: %s",
                                                                        get_error_message(ret));
                return STC_CALLBACK_CONTINUE;
        }

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
old mode 100644 (file)
new mode 100755 (executable)
index 45df1ec..6023858
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
@@ -508,7 +508,7 @@ static stc_callback_ret_e _stc_stats_info_cb(stc_error_e result,
        }
        if (iface == STC_IFACE_DATACALL) {
 
-               ret = stc_stats_info_get_imsi(info, &imsi);
+               ret = stc_stats_info_get_subscriber_id(info, &imsi);
                if (STC_ERROR_NONE == ret) {
 
                        SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
@@ -523,7 +523,7 @@ static stc_callback_ret_e _stc_stats_info_cb(stc_error_e result,
                                        setting_view_update(ad.main_view, &ad);
                                }
                } else {
-                       SETTING_TRACE_ERROR("stc_stats_info_get_imsi() error: %s",
+                       SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                get_error_message(ret));
                }
                free(imsi);
@@ -558,7 +558,7 @@ static stc_callback_ret_e _total_stats_cb(stc_error_e result,
 
        if (STC_ERROR_NONE == ret) {
                if (iface_type == STC_IFACE_DATACALL) {
-                       ret = stc_stats_info_get_imsi(info, &imsi);
+                       ret = stc_stats_info_get_subscriber_id(info, &imsi);
                        if (STC_ERROR_NONE == ret) {
 
                                SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
@@ -573,7 +573,7 @@ static stc_callback_ret_e _total_stats_cb(stc_error_e result,
                                        SETTING_TRACE("SIM 2 total in: %lld out: %lld", incoming, outgoing);
                                }
                        } else {
-                               SETTING_TRACE_ERROR("stc_stats_info_get_imsi() error: %s",
+                               SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                        get_error_message(ret));
                        }
                        free(imsi);
@@ -632,7 +632,7 @@ static stc_callback_ret_e _get_restrictions_cb(stc_error_e result,
        SETTING_TRACE_DEBUG("Obtained iface: %d", iface_type);
        if (iface_type == STC_IFACE_DATACALL) {
 
-               ret = stc_restriction_info_get_imsi(info, &imsi);
+               ret = stc_restriction_info_get_subscriber_id(info, &imsi);
                if (STC_ERROR_NONE == ret) {
                        SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
                        if (compare_imsis(ad.imsi_1, imsi)) {
@@ -651,7 +651,7 @@ static stc_callback_ret_e _get_restrictions_cb(stc_error_e result,
                        }
                        setting_view_update(ad.main_view, &ad);
                } else {
-                       SETTING_TRACE_ERROR("stc_stats_info_get_imsi() error: %s",
+                       SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                get_error_message(ret));
                }
                free(imsi);

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
index a2dfeff039ee3c82d8dfb952920bf60e1cfbb829..713d72bc7788f9094f63ee155227d545a1507da5 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
@@ -273,10 +273,10 @@ restrictions_result set_mobile_restriction_rule_parameters(
        if (limit > MAX_LIMIT_IN_BYTES)
                return RESTRICTIONS_VALUE_HIGHTER_THAN_MAX;
 
-       ret = stc_restriction_rule_set_imsi(rule, imsi);
+       ret = stc_restriction_rule_set_subscriber_id(rule, imsi);
        if (STC_ERROR_NONE != ret) {
                (void)(void)stc_restriction_rule_destroy(rule);
-               SETTING_TRACE_ERROR("stc_restriction_rule_set_imsi() error: %s",
+               SETTING_TRACE_ERROR("stc_restriction_rule_set_subscriber_id() error: %s",
                                                                                        get_error_message(ret));
                return RESTRICTIONS_OTHER_ERROR;
        }