From 2debaa4ecabba57c04bba9cf3562b7fb9e5551db Mon Sep 17 00:00:00 2001 From: Hyunjee Kim Date: Fri, 21 Jul 2017 09:14:25 +0900 Subject: [PATCH] [i18ninfo] Fix svace errors and warnings Change-Id: I44831fe61d062a83bc62552721570e6887598d90 Signed-off-by: Hyunjee Kim --- i18ninfo/i18ninfo.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/i18ninfo/i18ninfo.cpp b/i18ninfo/i18ninfo.cpp index 624f023..b2b6087 100644 --- a/i18ninfo/i18ninfo.cpp +++ b/i18ninfo/i18ninfo.cpp @@ -36,6 +36,7 @@ static int ASCIIDOC_FLAG = 0; #define PRINT_ASCIIDOC_LOG(fmt) if (ASCIIDOC_FLAG) printf(fmt) + const char *default_locale = I18N_ULOCALE_UK; i18n_uchar default_timezone_id[BUF_SIZE] = {0, }; @@ -567,7 +568,6 @@ static int __get_number_format(char *input_number) PRINT_DEBUG_LOG("Input number = %f\n", my_number); i18n_unumber_format_h num_format = NULL; - i18n_uchar formatted_number[BUF_SIZE]; PRINT_ASCIIDOC_LOG("\n[options=\"header\"]\n"); PRINT_ASCIIDOC_LOG("|===\n"); @@ -580,7 +580,7 @@ static int __get_number_format(char *input_number) CHECK_ERROR("i18n_unumber_create", ret); /* Format the given number according to the given locale. */ - memset(formatted_number, 0, BUF_SIZE); + i18n_uchar formatted_number[BUF_SIZE] = {0, }; i18n_unumber_format_double(num_format, my_number, formatted_number, BUF_SIZE, NULL); /* Display the formatting result. */ @@ -856,6 +856,8 @@ static int __manage_string_iteration(char *input_string) printf("\nInput 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; i18n_ustring_copy_ua(string_to_examine, input_text); } else { char input_text[1000] = {0, }; @@ -863,6 +865,8 @@ 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; i18n_ustring_copy_ua(string_to_examine, input_text); } @@ -883,7 +887,6 @@ static int __manage_string_iteration(char *input_string) int32_t end = i18n_ubrk_next(boundary); i18n_uchar *result = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (end - start + 1)); if (NULL == result) { - free(result); free(string_to_examine); return I18N_ERROR_OUT_OF_MEMORY; } @@ -912,7 +915,6 @@ static int __manage_string_iteration(char *input_string) int32_t start = i18n_ubrk_previous(boundary); i18n_uchar *result = (i18n_uchar *) malloc(sizeof(i18n_uchar) * (end - start + 1)); if (NULL == result) { - free(result); free(string_to_examine); return I18N_ERROR_OUT_OF_MEMORY; } -- 2.7.4