Fix ABI issue for enum and parameter type

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

diff --git a/include/stc.h b/include/stc.h
index 686a562a2983e6fd4e8f945f08fd718a9292aff0..a6e1c612280dc611f131bfe645cff732b071a8a8 100755 (executable)
--- a/include/stc.h
+++ b/include/stc.h
@@ -150,8 +150,9 @@ typedef enum {
  * @since_tizen 4.0
  */
 typedef enum {
-       STC_ROAMING_DISABLED,    /**< Not in roaming */
+       STC_ROAMING_UNKNOWN,
        STC_ROAMING_ENABLED,     /**< In roaming */
+       STC_ROAMING_DISABLED,    /**< Not in roaming */
 } stc_roaming_type_e;
 
 /**
@@ -177,8 +178,8 @@ typedef enum {
  */
 typedef enum {
        STC_PROCESS_STATE_UNKNOWN,         /**< Unknown state */
-       STC_PROCESS_STATE_FOREGROUND,      /**< Foreground state */
-       STC_PROCESS_STATE_BACKGROUND,      /**< Background state */
+       STC_PROCESS_STATE_FOREGROUND = 1 << 1,      /**< Foreground state */
+       STC_PROCESS_STATE_BACKGROUND = 1 << 2,      /**< Background state */
 } stc_process_state_e;
 
 /**
@@ -925,7 +926,7 @@ int stc_stats_info_get_iface_type(stc_stats_info_h info,
  * @see stc_stats_info_cb()
  */
 int stc_stats_info_get_counter(stc_stats_info_h info,
-               long long int *incoming, long long int *outgoing);
+               int64_t *incoming, int64_t *outgoing);
 
 /**
  * @brief Gets the roaming type from statistics information.

diff --git a/include/stc_rstn_internal.h b/include/stc_rstn_internal.h
index 6f124d056489b33ffde2708160605fc8ecbd9d5a..76ba58ce099bb2beb69911523f02e75121844e45 100755 (executable)
--- a/include/stc_rstn_internal.h
+++ b/include/stc_rstn_internal.h
@@ -283,7 +283,7 @@ int stc_restriction_rule_set_type(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_get_limit()
  */
 int stc_restriction_rule_set_limit(stc_restriction_rule_h rule,
-                                  long long int data_limit);
+                                  int64_t data_limit);
 
 /**
  * @brief Sets the warning limit for restriction rule.
@@ -310,7 +310,7 @@ int stc_restriction_rule_set_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_get_warning_limit()
  */
 int stc_restriction_rule_set_warning_limit(stc_restriction_rule_h rule,
-                                          long long int data_warn_limit);
+                                          int64_t data_warn_limit);
 
 /**
  * @brief Sets the monthly data limit for restriction rule.
@@ -337,7 +337,7 @@ int stc_restriction_rule_set_warning_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_get_monthly_limit()
  */
 int stc_restriction_rule_set_monthly_limit(stc_restriction_rule_h rule,
-                                          long long int limit);
+                                          int64_t limit);
 
 /**
  * @brief Sets the weekly data limit for restriction rule.
@@ -364,7 +364,7 @@ int stc_restriction_rule_set_monthly_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_get_weekly_limit()
  */
 int stc_restriction_rule_set_weekly_limit(stc_restriction_rule_h rule,
-                                         long long int limit);
+                                         int64_t limit);
 
 /**
  * @brief Sets the daily data limit for restriction rule.
@@ -391,7 +391,7 @@ int stc_restriction_rule_set_weekly_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_get_daily_limit()
  */
 int stc_restriction_rule_set_daily_limit(stc_restriction_rule_h rule,
-                                        long long int limit);
+                                        int64_t limit);
 
 /**
  * @brief Sets the month start date for restriction rule.
@@ -609,7 +609,7 @@ int stc_restriction_rule_get_type(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_set_limit()
  */
 int stc_restriction_rule_get_limit(stc_restriction_rule_h rule,
-                                  long long int *data_limit);
+                                  int64_t *data_limit);
 
 /**
  * @brief Gets the warning limit for restriction rule.
@@ -636,7 +636,7 @@ int stc_restriction_rule_get_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_set_warning_limit()
  */
 int stc_restriction_rule_get_warning_limit(stc_restriction_rule_h rule,
-                                          long long int *data_warn_limit);
+                                          int64_t *data_warn_limit);
 
 /**
  * @brief Gets the montlhy data limit for restriction rule.
@@ -663,7 +663,7 @@ int stc_restriction_rule_get_warning_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_set_monthly_limit()
  */
 int stc_restriction_rule_get_monthly_limit(stc_restriction_rule_h rule,
-                                          long long int *limit);
+                                          int64_t *limit);
 
 /**
  * @brief Gets the weekly data limit for restriction rule.
@@ -690,7 +690,7 @@ int stc_restriction_rule_get_monthly_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_set_weekly_limit()
  */
 int stc_restriction_rule_get_weekly_limit(stc_restriction_rule_h rule,
-                                         long long int *limit);
+                                         int64_t *limit);
 
 /**
  * @brief Gets the daily data limit for restriction rule.
@@ -717,7 +717,7 @@ int stc_restriction_rule_get_weekly_limit(stc_restriction_rule_h rule,
  * @see stc_restriction_rule_set_daily_limit()
  */
 int stc_restriction_rule_get_daily_limit(stc_restriction_rule_h rule,
-                                        long long int *limit);
+                                        int64_t *limit);
 
 /**
  * @brief Gets the month start date for restriction rule.

diff --git a/src/include/stc-info.h b/src/include/stc-info.h
index fbd953807fc5bde88dee1ff0bcfd2de00b2cea2a..846e566b335d402e797b7ac92446289687534ef1 100755 (executable)
--- a/src/include/stc-info.h
+++ b/src/include/stc-info.h
@@ -64,8 +64,8 @@ extern "C" {
 #define STC_STATS_INFO_PROCESS_STATE           "ground"
 
 typedef struct {
-       long long int incoming_bytes;   /** <incoming_bytes is the Total bytes =  Incoming + outgoing */
-       long long int outgoing_bytes;   /** Actual outgoing bytes */
+       int64_t incoming_bytes; /** <incoming_bytes is the Total bytes =  Incoming + outgoing */
+       int64_t outgoing_bytes; /** Actual outgoing bytes */
 } stc_data_counters_s;
 
 typedef struct {

diff --git a/src/include/stc-restriction.h b/src/include/stc-restriction.h
index b60aaabe22085e8344213201d56b66d4248a0041..e84608d401a0b942413edadc2307904be13ef1e0 100755 (executable)
--- a/src/include/stc-restriction.h
+++ b/src/include/stc-restriction.h
@@ -70,11 +70,11 @@ typedef struct {
        char subscriber_id[STC_SUBSCRIBER_ID_LEN];
        stc_iface_type_e iface_type;
        stc_restriction_type_e rstn_type;
-       long long int data_limit;
-       long long int data_warn_limit;
-       long long int monthly_limit;
-       long long int weekly_limit;
-       long long int daily_limit;
+       int64_t data_limit;
+       int64_t data_warn_limit;
+       int64_t monthly_limit;
+       int64_t weekly_limit;
+       int64_t daily_limit;
        int month_start_date;
        stc_roaming_type_e roaming_type;
 } stc_restriction_rule_s;

diff --git a/src/stc-info.c b/src/stc-info.c
index f4cb5d42981425668f8c2e560abaf01d15eafa9a..67d06c2ef8df2a1ff9088e7d8f80f3797ac85dcb 100755 (executable)
--- a/src/stc-info.c
+++ b/src/stc-info.c
@@ -223,7 +223,7 @@ EXPORT_API int stc_stats_info_get_iface_type(stc_stats_info_h info,
 }
 
 EXPORT_API int stc_stats_info_get_counter(stc_stats_info_h info,
-               long long int *incoming, long long int *outgoing)
+               int64_t *incoming, int64_t *outgoing)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -238,7 +238,7 @@ EXPORT_API int stc_stats_info_get_counter(stc_stats_info_h info,
        *incoming = stats_info->cnt.incoming_bytes;
        *outgoing = stats_info->cnt.outgoing_bytes;
 
-       STC_LOGI("Counters incoming[%lld] outgoing[%lld]",
+       STC_LOGI("Counters incoming[%"PRId64"] outgoing[%"PRId64"]",
                *incoming, *outgoing);
 
        return STC_ERROR_NONE;

diff --git a/src/stc-restriction.c b/src/stc-restriction.c
index fb48fd67e566d9ae924add3bf1aafb0f9411ae66..26686d3f9c7f59fa382bdafea16cd54e82dedaa5 100755 (executable)
--- a/src/stc-restriction.c
+++ b/src/stc-restriction.c
@@ -326,19 +326,19 @@ static void __stc_restriction_print_rule(stc_restriction_rule_s *rule)
                STC_LOGD("Type:      [%s]", _stc_convert_rstn_type_to_string(rule->rstn_type));
 
        if (rule->data_limit >= 0)
-               STC_LOGD("Limit:     [%lld] bytes", rule->data_limit);
+               STC_LOGD("Limit:     [%"PRId64"] bytes", rule->data_limit);
 
        if (rule->data_warn_limit >= 0)
-               STC_LOGD("Warning:   [%lld] bytes", rule->data_warn_limit);
+               STC_LOGD("Warning:   [%"PRId64"] bytes", rule->data_warn_limit);
 
        if (rule->monthly_limit >= 0)
-               STC_LOGD("Monthly:   [%lld] bytes", rule->monthly_limit);
+               STC_LOGD("Monthly:   [%"PRId64"] bytes", rule->monthly_limit);
 
        if (rule->weekly_limit >= 0)
-               STC_LOGD("Weekly:    [%lld] bytes", rule->weekly_limit);
+               STC_LOGD("Weekly:    [%"PRId64"] bytes", rule->weekly_limit);
 
        if (rule->daily_limit >= 0)
-               STC_LOGD("Daily:     [%lld] bytes", rule->daily_limit);
+               STC_LOGD("Daily:     [%"PRId64"] bytes", rule->daily_limit);
 
        STC_LOGD("Month start date: [%d]", rule->month_start_date);
 
@@ -689,27 +689,27 @@ stc_error_e _stc_restriction_validate_rule(
        if (restriction_rule->rstn_type == STC_RSTN_TYPE_DROP) {
                STC_RETURN_VAL_IF(restriction_rule->data_limit < -1,
                        STC_ERROR_INVALID_PARAMETER,
-                       "Invalid data limit [%lld] bytes",
+                       "Invalid data limit [%"PRId64"] bytes",
                        restriction_rule->data_limit);
 
                STC_RETURN_VAL_IF(restriction_rule->data_warn_limit < -1,
                        STC_ERROR_INVALID_PARAMETER,
-                       "Invalid data warn limit [%lld] bytes",
+                       "Invalid data warn limit [%"PRId64"] bytes",
                        restriction_rule->data_warn_limit);
 
                STC_RETURN_VAL_IF(restriction_rule->monthly_limit < -1,
                        STC_ERROR_INVALID_PARAMETER,
-                       "Invalid monthly limit [%lld] bytes",
+                       "Invalid monthly limit [%"PRId64"] bytes",
                        restriction_rule->monthly_limit);
 
                STC_RETURN_VAL_IF(restriction_rule->weekly_limit < -1,
                        STC_ERROR_INVALID_PARAMETER,
-                       "Invalid weekly limit [%lld] bytes",
+                       "Invalid weekly limit [%"PRId64"] bytes",
                        restriction_rule->weekly_limit);
 
                STC_RETURN_VAL_IF(restriction_rule->daily_limit < -1,
                        STC_ERROR_INVALID_PARAMETER,
-                       "Invalid daily limit [%lld] bytes",
+                       "Invalid daily limit [%"PRId64"] bytes",
                        restriction_rule->daily_limit);
 
                STC_RETURN_VAL_IF(restriction_rule->month_start_date < 0,
@@ -747,27 +747,27 @@ stc_error_e _stc_restriction_check_set_rule(
 
        STC_RETURN_VAL_IF(restriction_rule->data_limit < -1,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid data limit [%lld] bytes",
+               "Invalid data limit [%"PRId64"] bytes",
                restriction_rule->data_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->data_warn_limit < -1,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid data warn limit [%lld] bytes",
+               "Invalid data warn limit [%"PRId64"] bytes",
                restriction_rule->data_warn_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->monthly_limit < -1,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid monthly limit [%lld] bytes",
+               "Invalid monthly limit [%"PRId64"] bytes",
                restriction_rule->monthly_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->weekly_limit < -1,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid weekly limit [%lld] bytes",
+               "Invalid weekly limit [%"PRId64"] bytes",
                restriction_rule->weekly_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->daily_limit < -1,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid daily limit [%lld] bytes",
+               "Invalid daily limit [%"PRId64"] bytes",
                restriction_rule->daily_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->month_start_date < 0,
@@ -870,12 +870,12 @@ stc_error_e _stc_restriction_check_remove_rule(
 
        STC_RETURN_VAL_IF(restriction_rule->data_limit < 0,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid tx limit [%lld] bytes",
+               "Invalid tx limit [%"PRId64"] bytes",
                restriction_rule->data_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->data_warn_limit < 0,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid rx limit [%lld] bytes",
+               "Invalid rx limit [%"PRId64"] bytes",
                restriction_rule->data_warn_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->roaming_type > STC_ROAMING_ENABLED,
@@ -911,12 +911,12 @@ stc_error_e _stc_restriction_check_exclude_rule(
 
        STC_RETURN_VAL_IF(restriction_rule->data_limit < 0,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid tx limit [%lld] bytes",
+               "Invalid tx limit [%"PRId64"] bytes",
                restriction_rule->data_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->data_warn_limit < 0,
                STC_ERROR_INVALID_PARAMETER,
-               "Invalid rx limit [%lld] bytes",
+               "Invalid rx limit [%"PRId64"] bytes",
                restriction_rule->data_warn_limit);
 
        STC_RETURN_VAL_IF(restriction_rule->roaming_type > STC_ROAMING_ENABLED,
@@ -1276,7 +1276,7 @@ EXPORT_API int stc_restriction_rule_set_type(stc_restriction_rule_h rule,
 }
 
 EXPORT_API int stc_restriction_rule_set_limit(stc_restriction_rule_h rule,
-                                             long long int data_limit)
+                                             int64_t data_limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1293,14 +1293,14 @@ EXPORT_API int stc_restriction_rule_set_limit(stc_restriction_rule_h rule,
 
        restriction_rule->data_limit = data_limit;
 
-       STC_LOGI("Data limit [%lld] bytes", restriction_rule->data_limit);
+       STC_LOGI("Data limit [%"PRId64"] bytes", restriction_rule->data_limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;
 }
 
 EXPORT_API int stc_restriction_rule_set_warning_limit(stc_restriction_rule_h rule,
-                                                     long long int data_warn_limit)
+                                                     int64_t data_warn_limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1317,7 +1317,7 @@ EXPORT_API int stc_restriction_rule_set_warning_limit(stc_restriction_rule_h rul
 
        restriction_rule->data_warn_limit = data_warn_limit;
 
-       STC_LOGI("Data warn limit [%lld] bytes",
+       STC_LOGI("Data warn limit [%"PRId64"] bytes",
                 restriction_rule->data_warn_limit);
 
        STC_UNLOCK;
@@ -1325,7 +1325,7 @@ EXPORT_API int stc_restriction_rule_set_warning_limit(stc_restriction_rule_h rul
 }
 
 EXPORT_API int stc_restriction_rule_set_monthly_limit(stc_restriction_rule_h rule,
-                                                     long long int limit)
+                                                     int64_t limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1342,7 +1342,7 @@ EXPORT_API int stc_restriction_rule_set_monthly_limit(stc_restriction_rule_h rul
 
        restriction_rule->monthly_limit = limit;
 
-       STC_LOGI("Monthly limit [%lld] bytes",
+       STC_LOGI("Monthly limit [%"PRId64"] bytes",
                 restriction_rule->monthly_limit);
 
        STC_UNLOCK;
@@ -1350,7 +1350,7 @@ EXPORT_API int stc_restriction_rule_set_monthly_limit(stc_restriction_rule_h rul
 }
 
 EXPORT_API int stc_restriction_rule_set_weekly_limit(stc_restriction_rule_h rule,
-                                                    long long int limit)
+                                                    int64_t limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1367,7 +1367,7 @@ EXPORT_API int stc_restriction_rule_set_weekly_limit(stc_restriction_rule_h rule
 
        restriction_rule->weekly_limit = limit;
 
-       STC_LOGI("Weekly data limit [%lld] bytes",
+       STC_LOGI("Weekly data limit [%"PRId64"] bytes",
                 restriction_rule->weekly_limit);
 
        STC_UNLOCK;
@@ -1375,7 +1375,7 @@ EXPORT_API int stc_restriction_rule_set_weekly_limit(stc_restriction_rule_h rule
 }
 
 EXPORT_API int stc_restriction_rule_set_daily_limit(stc_restriction_rule_h rule,
-                                                   long long int limit)
+                                                   int64_t limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1392,7 +1392,7 @@ EXPORT_API int stc_restriction_rule_set_daily_limit(stc_restriction_rule_h rule,
 
        restriction_rule->daily_limit = limit;
 
-       STC_LOGI("Daily data limit [%lld] bytes",
+       STC_LOGI("Daily data limit [%"PRId64"] bytes",
                 restriction_rule->daily_limit);
 
        STC_UNLOCK;
@@ -1601,7 +1601,7 @@ EXPORT_API int stc_restriction_rule_get_type(stc_restriction_rule_h rule,
 }
 
 EXPORT_API int stc_restriction_rule_get_limit(stc_restriction_rule_h rule,
-                                             long long int *data_limit)
+                                             int64_t *data_limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1624,14 +1624,14 @@ EXPORT_API int stc_restriction_rule_get_limit(stc_restriction_rule_h rule,
 
        *data_limit = restriction_rule->data_limit;
 
-       STC_LOGI("Data limit [%lld] bytes", *data_limit);
+       STC_LOGI("Data limit [%"PRId64"] bytes", *data_limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;
 }
 
 EXPORT_API int stc_restriction_rule_get_warning_limit(stc_restriction_rule_h rule,
-                                                     long long int *data_warn_limit)
+                                                     int64_t *data_warn_limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1654,14 +1654,14 @@ EXPORT_API int stc_restriction_rule_get_warning_limit(stc_restriction_rule_h rul
 
        *data_warn_limit = restriction_rule->data_warn_limit;
 
-       STC_LOGI("Data Warn limit [%lld] bytes", *data_warn_limit);
+       STC_LOGI("Data Warn limit [%"PRId64"] bytes", *data_warn_limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;
 }
 
 EXPORT_API int stc_restriction_rule_get_monthly_limit(stc_restriction_rule_h rule,
-                                                     long long int *limit)
+                                                     int64_t *limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1684,14 +1684,14 @@ EXPORT_API int stc_restriction_rule_get_monthly_limit(stc_restriction_rule_h rul
 
        *limit = restriction_rule->monthly_limit;
 
-       STC_LOGI("Monthly data limit [%lld] bytes", *limit);
+       STC_LOGI("Monthly data limit [%"PRId64"] bytes", *limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;
 }
 
 EXPORT_API int stc_restriction_rule_get_weekly_limit(stc_restriction_rule_h rule,
-                                                    long long int *limit)
+                                                    int64_t *limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1714,14 +1714,14 @@ EXPORT_API int stc_restriction_rule_get_weekly_limit(stc_restriction_rule_h rule
 
        *limit = restriction_rule->weekly_limit;
 
-       STC_LOGI("Weekly data limit [%lld] bytes", *limit);
+       STC_LOGI("Weekly data limit [%"PRId64"] bytes", *limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;
 }
 
 EXPORT_API int stc_restriction_rule_get_daily_limit(stc_restriction_rule_h rule,
-                                                   long long int *limit)
+                                                   int64_t *limit)
 {
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_STC);
 
@@ -1744,7 +1744,7 @@ EXPORT_API int stc_restriction_rule_get_daily_limit(stc_restriction_rule_h rule,
 
        *limit = restriction_rule->daily_limit;
 
-       STC_LOGI("Daily data limit [%lld] bytes", *limit);
+       STC_LOGI("Daily data limit [%"PRId64"] bytes", *limit);
 
        STC_UNLOCK;
        return STC_ERROR_NONE;

diff --git a/src/stc-statistics.c b/src/stc-statistics.c
index 21361b5564083abd1206c6f4f48b718c32700f52..432d1af226c950e444614125e9218e1aaa7d5e07 100755 (executable)
--- a/src/stc-statistics.c
+++ b/src/stc-statistics.c
@@ -255,8 +255,8 @@ static void __stc_stats_print_info(stc_stats_info_s *info)
 
        STC_LOGD("Roaming:  [%d]", info->roaming_type);
 
-       STC_LOGD("Received: [%lld]", info->cnt.incoming_bytes);
-       STC_LOGD("Sent:     [%lld]", info->cnt.outgoing_bytes);
+       STC_LOGD("Received: [%"PRId64"]", info->cnt.incoming_bytes);
+       STC_LOGD("Sent:     [%"PRId64"]", info->cnt.outgoing_bytes);
 
        if (info->protocol_type != STC_PROTOCOL_UNKNOWN)
                STC_LOGD("Protocol: [%d]", info->protocol_type);

diff --git a/test/restriction.c b/test/restriction.c
index 589d8cc9ba4ed6ec9b798ff00fa25781a6a7b01f..16f4e0fbda944d5d1138eaee6fa0febc3484a5d7 100755 (executable)
--- a/test/restriction.c
+++ b/test/restriction.c
@@ -80,11 +80,11 @@ static stc_callback_ret_e __test_stc_restriction_rule_cb(
        char *subscriber_id = NULL;
        stc_restriction_type_e rstn_type;
        stc_iface_type_e iface_type;
-       long long int data_limit;
-       long long int data_warn_limit;
-       long long int monthly_limit;
-       long long int weekly_limit;
-       long long int daily_limit;
+       int64_t data_limit;
+       int64_t data_warn_limit;
+       int64_t monthly_limit;
+       int64_t weekly_limit;
+       int64_t daily_limit;
        int month_start_date;
        stc_roaming_type_e roaming;
 
@@ -118,23 +118,23 @@ static stc_callback_ret_e __test_stc_restriction_rule_cb(
 
        ret = stc_restriction_rule_get_limit(rule, &data_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Data limit: [%lld]", data_limit);
+               msg("Data limit: [%"PRId64"]", data_limit);
 
        ret = stc_restriction_rule_get_warning_limit(rule, &data_warn_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Warn limit: [%lld]", data_warn_limit);
+               msg("Warn limit: [%"PRId64"]", data_warn_limit);
 
        ret = stc_restriction_rule_get_monthly_limit(rule, &monthly_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Monthly limit: [%lld]", monthly_limit);
+               msg("Monthly limit: [%"PRId64"]", monthly_limit);
 
        ret = stc_restriction_rule_get_weekly_limit(rule, &weekly_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Weekly limit:  [%lld]", weekly_limit);
+               msg("Weekly limit:  [%"PRId64"]", weekly_limit);
 
        ret = stc_restriction_rule_get_daily_limit(rule, &daily_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Daily limit:   [%lld]", weekly_limit);
+               msg("Daily limit:   [%"PRId64"]", weekly_limit);
 
        ret = stc_restriction_rule_get_month_start_date(rule, &month_start_date);
        if (ret == STC_ERROR_NONE)
@@ -208,11 +208,11 @@ static int __test_stc_set_restriction_rule_thread(gpointer data)
 {
        stc_iface_type_e iface_type = (int)strtol(g_iface_type, NULL, 10);
        stc_roaming_type_e roaming = (int)strtol(g_roaming, NULL, 10);
-       long long int data_limit = (long long int)strtol(g_data_limit, NULL, 10);
-       long long int data_warn_limit = (long long int)strtol(g_data_warn_limit, NULL, 10);
-       long long int monthly_limit = (long long int)strtol(g_monthly_limit, NULL, 10);
-       long long int weekly_limit = (long long int)strtol(g_weekly_limit, NULL, 10);
-       long long int daily_limit = (long long int)strtol(g_daily_limit, NULL, 10);
+       int64_t data_limit = (int64_t)strtol(g_data_limit, NULL, 10);
+       int64_t data_warn_limit = (int64_t)strtol(g_data_warn_limit, NULL, 10);
+       int64_t monthly_limit = (int64_t)strtol(g_monthly_limit, NULL, 10);
+       int64_t weekly_limit = (int64_t)strtol(g_weekly_limit, NULL, 10);
+       int64_t daily_limit = (int64_t)strtol(g_daily_limit, NULL, 10);
        int month_start_date = (int)strtol(g_month_start_date, NULL, 10);
        char *app_id = NULL;
        char *subscriber_id = NULL;
@@ -429,7 +429,7 @@ static int __test_stc_set_restriction_rule_thread(gpointer data)
        ret = stc_restriction_rule_get_limit(g_restriction_rule_h, &data_limit);
        THREAD_OUT;
        if (ret == STC_ERROR_NONE)
-               msg(LOG_CYAN "[%c] " LOG_END "Data limit: " LOG_CYAN "[%lld]" LOG_END, buf[0], data_limit);
+               msg(LOG_CYAN "[%c] " LOG_END "Data limit: " LOG_CYAN "[%"PRId64"]" LOG_END, buf[0], data_limit);
 
        data_warn_limit = 0;
        THREAD_IN;
@@ -437,28 +437,28 @@ static int __test_stc_set_restriction_rule_thread(gpointer data)
                                                     &data_warn_limit);
        THREAD_OUT;
        if (ret == STC_ERROR_NONE)
-               msg(LOG_CYAN "[%c] " LOG_END "Warn limit: " LOG_CYAN "[%lld]" LOG_END, buf[0], data_warn_limit);
+               msg(LOG_CYAN "[%c] " LOG_END "Warn limit: " LOG_CYAN "[%"PRId64"]" LOG_END, buf[0], data_warn_limit);
 
        monthly_limit = 0;
        THREAD_IN;
        ret = stc_restriction_rule_get_monthly_limit(g_restriction_rule_h, &monthly_limit);
        THREAD_OUT;
        if (ret == STC_ERROR_NONE)
-               msg(LOG_CYAN "[%c] " LOG_END "Monthly limit: " LOG_CYAN "[%lld]" LOG_END, buf[0], monthly_limit);
+               msg(LOG_CYAN "[%c] " LOG_END "Monthly limit: " LOG_CYAN "[%"PRId64"]" LOG_END, buf[0], monthly_limit);
 
        weekly_limit = 0;
        THREAD_IN;
        ret = stc_restriction_rule_get_weekly_limit(g_restriction_rule_h, &weekly_limit);
        THREAD_OUT;
        if (ret == STC_ERROR_NONE)
-               msg(LOG_CYAN "[%c] " LOG_END "Weekly limit:  " LOG_CYAN "[%lld]" LOG_END, buf[0], weekly_limit);
+               msg(LOG_CYAN "[%c] " LOG_END "Weekly limit:  " LOG_CYAN "[%"PRId64"]" LOG_END, buf[0], weekly_limit);
 
        daily_limit = 0;
        THREAD_IN;
        ret = stc_restriction_rule_get_daily_limit(g_restriction_rule_h, &daily_limit);
        THREAD_OUT;
        if (ret == STC_ERROR_NONE)
-               msg(LOG_CYAN "[%c] " LOG_END "Daily limit:   " LOG_CYAN "[%lld]" LOG_END, buf[0], daily_limit);
+               msg(LOG_CYAN "[%c] " LOG_END "Daily limit:   " LOG_CYAN "[%"PRId64"]" LOG_END, buf[0], daily_limit);
 
        month_start_date = 0;
        THREAD_IN;
@@ -749,11 +749,11 @@ static int __test_stc_restriction_list_add_rule(MManager *mm, struct menu_data *
 {
        stc_iface_type_e iface_type = (int)strtol(g_iface_type, NULL, 10);
        stc_roaming_type_e roaming = (int)strtol(g_roaming, NULL, 10);
-       long long int data_limit = (long long int)strtol(g_data_limit, NULL, 10);
-       long long int data_warn_limit = (long long int)strtol(g_data_warn_limit, NULL, 10);
-       long long int monthly_limit = (long long int)strtol(g_monthly_limit, NULL, 10);
-       long long int weekly_limit = (long long int)strtol(g_weekly_limit, NULL, 10);
-       long long int daily_limit = (long long int)strtol(g_daily_limit, NULL, 10);
+       int64_t data_limit = (int64_t)strtol(g_data_limit, NULL, 10);
+       int64_t data_warn_limit = (int64_t)strtol(g_data_warn_limit, NULL, 10);
+       int64_t monthly_limit = (int64_t)strtol(g_monthly_limit, NULL, 10);
+       int64_t weekly_limit = (int64_t)strtol(g_weekly_limit, NULL, 10);
+       int64_t daily_limit = (int64_t)strtol(g_daily_limit, NULL, 10);
        int month_start_date = (int)strtol(g_month_start_date, NULL, 10);
        char *app_id = NULL;
        char *subscriber_id = NULL;
@@ -950,28 +950,28 @@ static int __test_stc_restriction_list_add_rule(MManager *mm, struct menu_data *
        data_limit = 0;
        ret = stc_restriction_rule_get_limit(rule_h, &data_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Data limit: " LOG_CYAN "[%lld]" LOG_END, data_limit);
+               msg("Data limit: " LOG_CYAN "[%"PRId64"]" LOG_END, data_limit);
 
        data_warn_limit = 0;
        ret = stc_restriction_rule_get_warning_limit(rule_h,
                                                     &data_warn_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Warn limit: " LOG_CYAN "[%lld]" LOG_END, data_warn_limit);
+               msg("Warn limit: " LOG_CYAN "[%"PRId64"]" LOG_END, data_warn_limit);
 
        monthly_limit = 0;
        ret = stc_restriction_rule_get_monthly_limit(rule_h, &monthly_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Monthly limit: " LOG_CYAN "[%lld]" LOG_END, monthly_limit);
+               msg("Monthly limit: " LOG_CYAN "[%"PRId64"]" LOG_END, monthly_limit);
 
        weekly_limit = 0;
        ret = stc_restriction_rule_get_weekly_limit(rule_h, &weekly_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Weekly limit:  " LOG_CYAN "[%lld]" LOG_END, weekly_limit);
+               msg("Weekly limit:  " LOG_CYAN "[%"PRId64"]" LOG_END, weekly_limit);
 
        daily_limit = 0;
        ret = stc_restriction_rule_get_daily_limit(rule_h, &daily_limit);
        if (ret == STC_ERROR_NONE)
-               msg("Daily limit:   " LOG_CYAN "[%lld]" LOG_END, daily_limit);
+               msg("Daily limit:   " LOG_CYAN "[%"PRId64"]" LOG_END, daily_limit);
 
        month_start_date = 0;
        ret = stc_restriction_rule_get_month_start_date(rule_h, &month_start_date);

diff --git a/test/statistics.c b/test/statistics.c
index c4810ade1d7b27313ccf2b5ddc23b9075b9a7672..bf2b0250735761ffc52343e99fbce4c51bbb5271 100755 (executable)
--- a/test/statistics.c
+++ b/test/statistics.c
@@ -83,8 +83,8 @@ static stc_callback_ret_e __test_stc_stats_info_cb(
        time_t from;
        time_t to;
        stc_iface_type_e iface_type;
-       long long int incoming;
-       long long int outgoing;
+       int64_t incoming;
+       int64_t outgoing;
        stc_roaming_type_e roaming;
        stc_protocol_type_e prototype;
        stc_process_state_e procstate;
@@ -109,8 +109,8 @@ static stc_callback_ret_e __test_stc_stats_info_cb(
 
        ret = stc_stats_info_get_counter(info, &incoming, &outgoing);
        if (ret == STC_ERROR_NONE) {
-               msg("Received: [%lld]", incoming);
-               msg("Sent:     [%lld]", outgoing);
+               msg("Received: [%"PRId64"]", incoming);
+               msg("Sent:     [%"PRId64"]", outgoing);
        }
 
        ret = stc_stats_info_get_roaming_type(info, &roaming);