From 35d3325d8e43d027192b296a17543e10ed9419d3 Mon Sep 17 00:00:00 2001 From: Hyunjee Kim Date: Mon, 21 Aug 2017 09:36:33 +0900 Subject: [PATCH] [i18ninfo] Fix warnings Change-Id: Ic58fc852d5618936a86cb920661269aa66556ac1 Signed-off-by: Hyunjee Kim --- i18ninfo/i18ninfo.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/i18ninfo/i18ninfo.cpp b/i18ninfo/i18ninfo.cpp index 44aae51..13c8e6e 100644 --- a/i18ninfo/i18ninfo.cpp +++ b/i18ninfo/i18ninfo.cpp @@ -102,7 +102,7 @@ i18n_error_code_e error_code; static void __get_available_locales(); static int __get_date_basic_format(); static int __get_date_and_time(char *input_time); -static int __get_number_format(char *input_number); +static int __get_number_format(const char *input_number); static int __get_symbol(); static int __get_language_info(); static int __manage_string_iteration(char *custom_type); @@ -131,7 +131,7 @@ static void __get_available_locales() } } -char *__print_i18n_type_string(char *type, int num) +char *__print_i18n_type_string(const char *type, int num) { char *str = (char*)calloc(300, sizeof(char)); PRINT_DEBUG_LOG("input type: %s, num: %d\n", type, num); @@ -341,7 +341,7 @@ char *__print_i18n_type_string(char *type, int num) return str; } -static char *_date_basic_format_convert(char *input_pattern, int i, char *type) +static char *_date_basic_format_convert(const char *input_pattern, int i, const char *type) { int ret = 0; @@ -351,6 +351,7 @@ static char *_date_basic_format_convert(char *input_pattern, int i, char *type) i18n_uchar pattern[BUF_SIZE] = {0, }; i18n_ustring_copy_ua_n(pattern, input_pattern, BUF_SIZE); ret = i18n_udate_create(I18N_UDATE_PATTERN, I18N_UDATE_PATTERN, default_locale, timezone, -1, pattern, -1, &format_h); + CHECK_ERROR("i18n_udate_create", ret); i18n_udate date_now = 259200000; @@ -367,6 +368,7 @@ static char *_date_basic_format_convert(char *input_pattern, int i, char *type) i18n_uchar *result = (i18n_uchar *) malloc(BUF_SIZE * sizeof(i18n_uchar)); int date_len = 0; ret = i18n_udate_format_date(format_h, date_now, result, BUF_SIZE, NULL, &date_len); + CHECK_ERROR("i18n_udate_format_date", ret); char *s = (char *)malloc(BUF_SIZE * sizeof(char)); i18n_ustring_copy_au(s, result); @@ -547,7 +549,7 @@ static int __get_date_and_time(char *input_time) return 0; } -static int __get_number_format(char *input_number) +static int __get_number_format(const char *input_number) { int ret = 0; @@ -667,7 +669,7 @@ static int __convert_number(char *custom_number) i18n_uchar *number_to_convert; if (!custom_number) { - char *input_number = "abc০১২৩def四五六ⅦⅧⅨ"; + const char *input_number = "abc০১২৩def四五六ⅦⅧⅨ"; printf(" Input number : %s\n", input_number); number_to_convert = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (strlen(input_number) + 1)); @@ -841,7 +843,7 @@ static int __manage_string_iteration(char *input_string) i18n_ubreak_iterator_h boundary; if (!input_string) { - char *input_text = "Twinkle, twinkle, little star. How I wonder what you are"; + const char *input_text = "Twinkle, twinkle, little star. How I wonder what you are"; printf("\nInput string : %s\n", input_text); string_to_examine = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (strlen(input_text) + 1)); @@ -934,7 +936,7 @@ static int __analyze_string(char *custom_string) i18n_uchar *string_to_examine; if (!custom_string) { - char *input_text = "String"; + const char *input_text = "String"; printf("\n Input string : %s\n", input_text); string_to_examine = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (strlen(input_text) + 1)); -- 2.34.1