From 6587ae7e86ef6274ca783c3395b68aa61800491c Mon Sep 17 00:00:00 2001 From: JinWang An Date: Thu, 13 Jun 2024 16:49:31 +0900 Subject: [PATCH] Fix unreachable code in i18ninfo.cpp Change-Id: I1b9f52d914a6c0ff7a1bb68830c418022cf93907 Signed-off-by: JinWang An --- i18ninfo/i18ninfo.cpp | 181 ++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 122 deletions(-) diff --git a/i18ninfo/i18ninfo.cpp b/i18ninfo/i18ninfo.cpp index f21c8af..e4c0136 100644 --- a/i18ninfo/i18ninfo.cpp +++ b/i18ninfo/i18ninfo.cpp @@ -101,14 +101,14 @@ 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(const char *input_number); -static int __get_symbol(); -static int __get_language_info(); -static int __manage_string_iteration(char *custom_type); -static int __analyze_string(char *custom_string); -static int __get_timezone_info(char *timezone_id); -static int __get_tzdata_version(); +static void __get_date_and_time(char *input_time); +static void __get_number_format(const char *input_number); +static void __get_symbol(); +static void __get_language_info(); +static void __manage_string_iteration(char *custom_type); +static void __analyze_string(char *custom_string); +static void __get_timezone_info(char *timezone_id); +static void __get_tzdata_version(); char *__print_i18n_type_string(char *type, int num); @@ -520,7 +520,7 @@ i18n_udate _time_convert(char *input_time) return date; } -static int __get_date_and_time(char *input_time) +static void __get_date_and_time(char *input_time) { int ret = 0; printf(" - To get various date and time format\n"); @@ -599,10 +599,9 @@ static int __get_date_and_time(char *input_time) CHECK_ERROR("i18n_timezone_destroy", ret); free(timezone_id); PRINT_ASCIIDOC_LOG("|===\n"); - return 0; } -static int __get_number_format(const char *input_number) +static void __get_number_format(const char *input_number) { int ret = 0; printf(" - To get various number format\n"); @@ -663,11 +662,9 @@ static int __get_number_format(const char *input_number) /* Release the decimal number formatter. */ ret = i18n_unumber_destroy(num_format); CHECK_ERROR("i18n_unumber_destroy", ret); - - return 0; } -static int __get_symbol() +static void __get_symbol() { printf(" - To get various number symbol\n"); printf("****************************************\n"); @@ -703,8 +700,6 @@ static int __get_symbol() /* Release the default number formatter object. */ ret = i18n_unumber_destroy(num_format); CHECK_ERROR("i18n_unumber_destroy", ret); - - return 0; } static const char *layout_orientation_converter(i18n_ulocale_layout_type_e type) @@ -728,7 +723,7 @@ static const char *layout_orientation_converter(i18n_ulocale_layout_type_e type) } -static int __get_language_info() +static void __get_language_info() { printf(" - To get language information\n"); printf("****************************************\n"); @@ -797,12 +792,11 @@ static int __get_language_info() CHECK_ERROR("i18n_ulocale_get_variant", ret); printf("| variant code | %s\n", variant); PRINT_ASCIIDOC_LOG("|===\n"); - - return 0; } -static int __manage_string_iteration(char *input_string) +static void __manage_string_iteration(char *input_string) { + int ret = 0; printf(" - To manage the string iteration\n"); printf("****************************************\n"); @@ -815,8 +809,10 @@ static int __manage_string_iteration(char *input_string) printf(" - Input string : %s\n", input_text); string_to_examine = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (strlen(input_text) + 1)); - if(NULL == string_to_examine) - return I18N_ERROR_OUT_OF_MEMORY; + if(NULL == string_to_examine) { + PRINT_ERROR_LOG("malloc", I18N_ERROR_OUT_OF_MEMORY); + return; + } i18n_ustring_copy_ua(string_to_examine, input_text); } else { char input_text[1000] = {0, }; @@ -824,13 +820,14 @@ static int __manage_string_iteration(char *input_string) printf(" - Input string : %s\n", input_text); string_to_examine = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (strlen(input_text) + 1)); - if(NULL == string_to_examine) - return I18N_ERROR_OUT_OF_MEMORY; + if(NULL == string_to_examine) { + PRINT_ERROR_LOG("malloc", I18N_ERROR_OUT_OF_MEMORY); + return; + } i18n_ustring_copy_ua(string_to_examine, input_text); } int i; - int ret = 0; char *iter_type; PRINT_ASCIIDOC_LOG("\n[options=\"header\"]\n"); @@ -847,7 +844,8 @@ static int __manage_string_iteration(char *input_string) i18n_uchar *result = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (end - start + 1)); if (NULL == result) { free(string_to_examine); - return I18N_ERROR_OUT_OF_MEMORY; + PRINT_ERROR_LOG("malloc", I18N_ERROR_OUT_OF_MEMORY); + return; } result[end - start] = '\0'; i18n_ustring_copy_n(result, &string_to_examine[start], end-start); @@ -875,7 +873,8 @@ static int __manage_string_iteration(char *input_string) i18n_uchar *result = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (end - start + 1)); if (NULL == result) { free(string_to_examine); - return I18N_ERROR_OUT_OF_MEMORY; + PRINT_ERROR_LOG("malloc", I18N_ERROR_OUT_OF_MEMORY); + return; } result[end - start] = '\0'; i18n_ustring_copy_n(result, &string_to_examine[start], end-start); @@ -892,11 +891,9 @@ static int __manage_string_iteration(char *input_string) free(string_to_examine); ret = i18n_ubrk_destroy(boundary); CHECK_ERROR("i18n_ubrk_destroy", ret); - - return 0; } -static int __analyze_string(char *custom_string) +static void __analyze_string(char *custom_string) { printf(" - To manage the string\n"); printf("****************************************\n"); @@ -947,8 +944,6 @@ static int __analyze_string(char *custom_string) printf("| To Title | %s\n", s); PRINT_ASCIIDOC_LOG("|===\n"); - - return 0; } bool timezone_cb(const char *timezone_id, void *user_data) @@ -957,7 +952,7 @@ bool timezone_cb(const char *timezone_id, void *user_data) return true; } -static int __get_available_timezone() +static void __get_available_timezone() { int ret = 0; printf(" - To get the list of time zone"); @@ -965,11 +960,9 @@ static int __get_available_timezone() ret = i18n_timezone_foreach_timezone_id(timezone_cb, NULL); CHECK_ERROR("i18n_timezone_foreach_timezone_id", ret); - - return 0; } -static int __get_timezone_info(char *timezone_id) +static void __get_timezone_info(char *timezone_id) { int ret = 0; printf(" - To get time zone information\n"); @@ -1081,17 +1074,13 @@ static int __get_timezone_info(char *timezone_id) CHECK_ERROR("i18n_timezone_destroy", ret); free(timezone_id); free(display_name); - - return 0; } -static int __get_tzdata_version() +static void __get_tzdata_version() { const char *ver = i18n_timezone_get_tzdata_version(); printf("tzdata version : %s\n", ver); printf("****************************************\n"); - - return 0; } static int32_t _get_uchar_length(const char *arr) @@ -1162,7 +1151,7 @@ static int __show_ubidi(char *input_text) return 0; } -int __convert_lunar_calendar(char *input_time) +void __convert_lunar_calendar(char *input_time) { i18n_ucalendar_h ucal_ch, ucal_greg; i18n_ucalendar_create(NULL, -1, "en@calendar=chinese", I18N_UCALENDAR_TRADITIONAL, &ucal_ch); @@ -1194,8 +1183,6 @@ int __convert_lunar_calendar(char *input_time) printf("Solar calendar) year:%d month:%d day:%d\n", year, month+1, day); printf("Lunar calendar) year:%d month:%d day:%d\n", year_ch, month_ch+1, day_ch); - - return 0; } #if (__TIZEN_VER >= 4) @@ -1628,7 +1615,7 @@ static int __test_plural_rules(char *input_number) void allTest() { - int ret = 0, i = 0; + int i = 0; int loc_count; loc_count = i18n_ulocale_count_available(); @@ -1637,45 +1624,42 @@ void allTest() printf("\n== Date and Time Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_date_and_time(NULL); + __get_date_and_time(NULL); printf("\n"); printf("\n== Number Format Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_number_format("3.5"); + __get_number_format("3.5"); printf("\n"); printf("\n== Number Symbol Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_symbol(); + __get_symbol(); printf("\n"); printf("\n== Language Info"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_language_info(); + __get_language_info(); printf("\n"); } printf("\n== String Iteration Test"); printf("\n****************************************\n"); - ret = __manage_string_iteration(NULL); + __manage_string_iteration(NULL); printf("\n"); printf("\n== String Test"); printf("\n****************************************\n"); - ret = __analyze_string(NULL); + __analyze_string(NULL); printf("\n"); printf("\n== Timezone Info"); printf("\n****************************************\n"); - ret = __get_timezone_info(NULL); + __get_timezone_info(NULL); printf("\n"); printf("\n== TZ Data Version Info"); printf("\n****************************************\n"); - ret = __get_tzdata_version(); - if (ret == -1) { - printf("get i18n time zone info list failed\n"); - } + __get_tzdata_version(); } void showAllLocale() @@ -1685,7 +1669,7 @@ void showAllLocale() void showLangInfo(char *locale) { - int ret = 0, i = 0; + int i = 0; int loc_count; if (!locale) { @@ -1695,44 +1679,29 @@ void showLangInfo(char *locale) printf("\n== Language Info"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_language_info(); - if (ret == -1) { - printf("get i18n language info list failed\n"); - } + __get_language_info(); } } else { default_locale = locale; printf("\n== Language Info"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_language_info(); - if (ret == -1) { - printf("get i18n language info list failed\n"); - } + __get_language_info(); } } void showTimezone(char *timezone_id) { - int ret = 0; printf("\n== Timezone Info"); printf("\n****************************************\n"); - ret = __get_timezone_info(timezone_id); - if (ret == -1) { - printf("get i18n time zone info list failed\n"); - } + __get_timezone_info(timezone_id); } void showAllTimezone() { - - int ret = 0; printf("\n== List of Timezone"); printf("\n****************************************\n"); - ret = __get_available_timezone(); - if (ret != 0) { - printf("get the list of time zone failed\n"); - } + __get_available_timezone(); } void showTzdataVersion() @@ -1781,7 +1750,8 @@ void testPluralRules(char *input) void showDatentimeFormat(char *locale) { - int ret = 0, i = 0; + int ret = 0; + int i = 0; int loc_count; if (!locale) { @@ -1810,7 +1780,7 @@ void showDatentimeFormat(char *locale) void testDatentime(char *input, char *locale) { - int ret = 0, i = 0; + int i = 0; int loc_count; if (!locale) { @@ -1820,26 +1790,20 @@ void testDatentime(char *input, char *locale) printf("\n== Date and Time Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_date_and_time(input); - if (ret == -1) { - printf("get i18n date and time list failed\n"); - } + __get_date_and_time(input); } } else { default_locale = locale; printf("\n== Date and Time Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_date_and_time(input); - if (ret == -1) { - printf("get i18n date and time list failed\n"); - } + __get_date_and_time(input); } } void testNumberFormat(char *input, char *locale) { - int ret = 0, i = 0; + int i = 0; int loc_count; if (!input) { @@ -1851,27 +1815,21 @@ void testNumberFormat(char *input, char *locale) printf("\n== Number Format Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_number_format(input); - if (ret == -1) { - printf("get number format list failed\n"); - } + __get_number_format(input); } } else { default_locale = locale; printf("\n== Number Format Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_number_format(input); - if (ret == -1) { - printf("get number format list failed\n"); - } + __get_number_format(input); } } } void testNumberSymbol(char *locale) { - int ret = 0, i = 0; + int i = 0; int loc_count; if (!locale) { @@ -1881,57 +1839,36 @@ void testNumberSymbol(char *locale) printf("\n== Number Symbol Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_symbol(); - if (ret == -1) { - printf("get i18n symbol list failed\n"); - } + __get_symbol(); } } else { default_locale = locale; printf("\n== Number Symbol Test"); printf("\n****************************************"); printf("\n - locales : %s\n", default_locale); - ret = __get_symbol(); - if (ret == -1) { - printf("get i18n symbol list failed\n"); - } + __get_symbol(); } } void testString(char *input) { - int ret = 0; - printf("\n== String Test"); printf("\n****************************************\n"); - ret = __analyze_string(input); - if (ret == -1) { - printf("get i18n string list failed\n"); - } + __analyze_string(input); } void testStringIter(char *input) { - int ret = 0; - printf("\n== String Iteration Test"); printf("\n****************************************\n"); - ret = __manage_string_iteration(input); - if (ret == -1) { - printf("get i18n string iteration list failed\n"); - } + __manage_string_iteration(input); } void convertCalendar(char *input) { - int ret = 0; printf("\n== Convert time to lunar calendar"); printf("\n****************************************\n"); - ret = __convert_lunar_calendar(input); - if (ret == -1) { - printf("get lunar calendar failed\n"); - } - + __convert_lunar_calendar(input); } int main(int argc, char *argv[]) -- 2.34.1