Fix build warnings

Change-Id: Ifc61b9675b9229249fe63e456a7f7d8667aab95d
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/i18ninfo/i18ninfo.cpp b/i18ninfo/i18ninfo.cpp
index 5e032d0..874c451 100644 (file)
--- a/i18ninfo/i18ninfo.cpp
+++ b/i18ninfo/i18ninfo.cpp
@@ -1156,8 +1156,8 @@ static int __show_ubidi(char *input_text)
 int __convert_lunar_calendar(char *input_time)
 {
        i18n_ucalendar_h ucal_ch, ucal_greg;
-       i18n_ucalendar_create(NULL, NULL, "en@calendar=chinese", I18N_UCALENDAR_TRADITIONAL, &ucal_ch);
-       i18n_ucalendar_create(NULL, NULL, "en@calendar=gregorian", I18N_UCALENDAR_TRADITIONAL, &ucal_greg);
+       i18n_ucalendar_create(NULL, -1, "en@calendar=chinese", I18N_UCALENDAR_TRADITIONAL, &ucal_ch);
+       i18n_ucalendar_create(NULL, -1, "en@calendar=gregorian", I18N_UCALENDAR_TRADITIONAL, &ucal_greg);
 
        i18n_udate new_date;
 

diff --git a/src/utils_i18n_format.cpp b/src/utils_i18n_format.cpp
index a16a4b9..622ea9a 100644 (file)
--- a/src/utils_i18n_format.cpp
+++ b/src/utils_i18n_format.cpp
@@ -78,9 +78,8 @@ int i18n_format_format(i18n_format_h format, i18n_formattable_h formattable, cha
     *append_to = (char *) malloc(len+1);
 
     retv_if(*append_to == NULL, I18N_ERROR_OUT_OF_MEMORY);
-    memset(*append_to, 0x0, len+1);
-
-    COPY_STR(*append_to, _append_to, len+1);
+    memcpy(*append_to, _append_to, len);
+       (*append_to)[len] = '\0';
 
     return _i18n_error_mapping(status);
 }

diff --git a/src/utils_i18n_measure_format.cpp b/src/utils_i18n_measure_format.cpp
index 1b0e1f2..85cf063 100644 (file)
--- a/src/utils_i18n_measure_format.cpp
+++ b/src/utils_i18n_measure_format.cpp
@@ -19,7 +19,6 @@
 #include <utils_i18n_private.h>
 
 #include <malloc.h>
-#include <vector>
 #include <unicode/measfmt.h>
 #include <unicode/measure.h>
 
@@ -225,11 +224,13 @@ int i18n_measure_format_format_measures(const i18n_measure_format_h measure_form
                unicode_append_to = UnicodeString(append_to);
        }
 
-       std::vector<Measure> measure_clones;
+
+       Measure* measure_array = (Measure*)malloc(sizeof(Measure) * measures_count);
+       memset((void*)measure_array, 0, sizeof(Measure) * measures_count);
+
        for (int i = 0; i < measures_count; i++) {
-               measure_clones.push_back(*((Measure *)measures[i]));
+               measure_array[i] = *((Measure *)measures[i]);
        }
-       Measure *measure_array = &measure_clones[0];
 
        UnicodeString &result =
                ((MeasureFormat *) measure_format)->formatMeasures(measure_array,

diff --git a/src/utils_i18n_simple_date_format.cpp b/src/utils_i18n_simple_date_format.cpp
index ed97fb6..d7a71c3 100644 (file)
--- a/src/utils_i18n_simple_date_format.cpp
+++ b/src/utils_i18n_simple_date_format.cpp
@@ -177,9 +177,8 @@ int i18n_simple_date_fmt_format_with_field_position(i18n_simple_date_fmt_h simpl
 
     retv_if(*append_to == NULL, I18N_ERROR_OUT_OF_MEMORY);
 
-    memset(*append_to, 0x0, len+1);
-
-    COPY_STR(*append_to, _append_to, len+1);
+       memcpy(*append_to, _append_to, len);
+       (*append_to)[len] = '\0';
 
     return I18N_ERROR_NONE;
 }
@@ -263,9 +262,8 @@ int i18n_simple_date_fmt_to_pattern(i18n_simple_date_fmt_h simple_date_fmt,
 
     retv_if(*pattern == NULL, I18N_ERROR_OUT_OF_MEMORY);
 
-    memset(*pattern, 0x0, len+1);
-
-    COPY_STR(*pattern, _pattern, len+1);
+       memcpy(*pattern, _pattern, len);
+       (*pattern)[len] = '\0';
 
     return I18N_ERROR_NONE;
 }
@@ -305,7 +303,8 @@ int i18n_simple_date_fmt_to_localized_pattern(i18n_simple_date_fmt_h simple_date
 
     memset(*localized_pattern, 0x0, len+1);
 
-    COPY_STR(*localized_pattern, _localized_pattern, len+1);
+       memcpy(*localized_pattern, _localized_pattern, len);
+       (*localized_pattern)[len] = '\0';
 
     return _i18n_error_mapping(status);
 }

diff --git a/src/utils_i18n_ubidi.c b/src/utils_i18n_ubidi.c
index 0914f69..8cf232c 100644 (file)
--- a/src/utils_i18n_ubidi.c
+++ b/src/utils_i18n_ubidi.c
@@ -271,9 +271,8 @@ int i18n_ubidi_get_text(const i18n_ubidi_h ubidi, char **text)
 
        *text = (char *)malloc(len + 1);
        retv_if(*text == NULL, I18N_ERROR_OUT_OF_MEMORY);
-       memset(*text, 0x0, len+1);
-
-       COPY_STR(*text, _text, len + 1);
+       memcpy(*text, _text, len);
+       (*text)[len] = '\0';
 
        return I18N_ERROR_NONE;
 }

diff --git a/src/utils_i18n_ucnv.c b/src/utils_i18n_ucnv.c
index a37b514..89b7951 100644 (file)
--- a/src/utils_i18n_ucnv.c
+++ b/src/utils_i18n_ucnv.c
@@ -542,7 +542,7 @@ int i18n_ucnv_create_standard_names(const char *conv_name, const char *standard,
        i18n_error_code_e i18n_error;
        UErrorCode icu_error = U_ZERO_ERROR;
 
-       enumeration = ucnv_openStandardNames(conv_name, standard, &icu_error);
+       *enumeration = (i18n_uenumeration_h *)ucnv_openStandardNames(conv_name, standard, &icu_error);
        ERR_MAPPING(icu_error, i18n_error);
        I18N_ERR(i18n_error);
 

diff --git a/src/utils_i18n_ucsdet.c b/src/utils_i18n_ucsdet.c
index 8d1388d..02c033f 100644 (file)
--- a/src/utils_i18n_ucsdet.c
+++ b/src/utils_i18n_ucsdet.c
@@ -77,7 +77,7 @@ int i18n_ucsdet_detect(i18n_ucharset_detector_h ucsd, i18n_ucharset_match_h *ucs
        i18n_error_code_e i18n_error;
        UErrorCode icu_error = U_ZERO_ERROR;
 
-       *ucsm = ucsdet_detect(ucsd, &icu_error);
+       *ucsm = (i18n_ucharset_match_h *)ucsdet_detect(ucsd, &icu_error);
        ERR_MAPPING(icu_error, i18n_error);
        I18N_ERR(i18n_error);
 
@@ -91,7 +91,7 @@ int i18n_ucsdet_detect_all(i18n_ucharset_detector_h ucsd, int32_t *matches_found
        i18n_error_code_e i18n_error;
        UErrorCode icu_error = U_ZERO_ERROR;
 
-       *ucsm = ucsdet_detectAll(ucsd, matches_found, &icu_error);
+       *ucsm = (i18n_ucharset_match_h *)ucsdet_detectAll(ucsd, matches_found, &icu_error);
        ERR_MAPPING(icu_error, i18n_error);
        I18N_ERR(i18n_error);
 

diff --git a/src/utils_i18n_uidna.c b/src/utils_i18n_uidna.c
index 95b8de2..3f1f897 100644 (file)
--- a/src/utils_i18n_uidna.c
+++ b/src/utils_i18n_uidna.c
@@ -14,6 +14,7 @@
 *       limitations under the License.
 */
 
+#include <stdlib.h>
 #include <unicode/uidna.h>
 
 #include <utils_i18n_uidna.h>
@@ -222,7 +223,7 @@ int i18n_uidna_info_destroy(i18n_uidna_info_h info)
 {
        retv_if(info == NULL, I18N_ERROR_INVALID_PARAMETER);
 
-       free((UIDNAInfo *)info);
+       free(info);
        info = NULL;
 
        return I18N_ERROR_NONE;

diff --git a/src/utils_i18n_unormalization.c b/src/utils_i18n_unormalization.c
index 94cbdea..e2bd703 100644 (file)
--- a/src/utils_i18n_unormalization.c
+++ b/src/utils_i18n_unormalization.c
@@ -122,7 +122,7 @@ int i18n_unormalization_create_filtered(i18n_unormalizer_h normalizer, const i18
        i18n_error_code_e i18n_error;
        UErrorCode icu_error = U_ZERO_ERROR;
 
-       *normalizer2 = (i18n_unormalizer_h *)unorm2_openFiltered((UNormalizer2 *) normalizer, filter_set, &icu_error);
+       *normalizer2 = (i18n_unormalizer_h *)unorm2_openFiltered((UNormalizer2 *) normalizer, (const USet*)filter_set, &icu_error);
        ERR_MAPPING(icu_error, i18n_error);
        I18N_ERR(i18n_error);
 
@@ -133,7 +133,7 @@ int i18n_unormalization_destroy(i18n_unormalizer_h normalizer)
 {
        retv_if(normalizer == NULL, I18N_ERROR_INVALID_PARAMETER);
 
-       unorm2_close(normalizer);
+       unorm2_close((UNormalizer2 *)normalizer);
 
        return I18N_ERROR_NONE;
 }

diff --git a/src/utils_i18n_ures.c b/src/utils_i18n_ures.c
index 800131b..b375cbd 100644 (file)
--- a/src/utils_i18n_ures.c
+++ b/src/utils_i18n_ures.c
@@ -102,7 +102,7 @@ int i18n_ures_get_string(i18n_ures_h ures, int32_t *len, const i18n_uchar **str_
 
 int i18n_ures_get_UTF8_string(i18n_ures_h ures, char *dest, int32_t *len, i18n_ubool force_copy, const char **str_result)
 {
-       retv_if(ures == NULL || force_copy == NULL, I18N_ERROR_INVALID_PARAMETER);
+       retv_if(ures == NULL, I18N_ERROR_INVALID_PARAMETER);
 
        i18n_error_code_e i18n_error;
        UErrorCode icu_error = U_ZERO_ERROR;

diff --git a/src/utils_i18n_utext.c b/src/utils_i18n_utext.c
index 1cf801c..a5e12ac 100644 (file)
--- a/src/utils_i18n_utext.c
+++ b/src/utils_i18n_utext.c
@@ -180,7 +180,7 @@ int64_t i18n_utext_get_native_index(const i18n_utext_h ut)
 
 void i18n_utext_set_native_index(i18n_utext_h ut, int64_t native_index)
 {
-       if(ut == NULL || native_index == NULL) {
+       if(ut == NULL) {
                set_last_result(I18N_ERROR_INVALID_PARAMETER);
                return;
        }
@@ -193,7 +193,7 @@ void i18n_utext_set_native_index(i18n_utext_h ut, int64_t native_index)
 
 i18n_ubool i18n_utext_move_index32(i18n_utext_h ut, int32_t delta)
 {
-       if(ut == NULL || delta == NULL) {
+       if(ut == NULL) {
                set_last_result(I18N_ERROR_INVALID_PARAMETER);
                return 0;
        }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3cbe77a..cf5303f 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -fpermissive")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -Wall -fpermissive")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 

diff --git a/tests/include/tct_common.h b/tests/include/tct_common.h
index 7465572..a665449 100755 (executable)
--- a/tests/include/tct_common.h
+++ b/tests/include/tct_common.h
@@ -48,42 +48,6 @@ int old_Serr;
        fclose(g_fpLog);\
 }
 
-#define DUMP_UTC_ERRLOG() {\
-       g_Serr = dup(fileno(stderr));\
-       g_fpLogDump = freopen(ERR_UTC_LOG, "w", stderr);\
-       fflush(stderr);\
-}
-
-#define CLOSE_UTC_ERRLOG() {\
-       if(g_fpLogDump) \
-       {\
-               if (g_Serr != -1)\
-               {\
-                       old_Serr = fileno(stderr);\
-                       if(old_Serr != -1)\
-                       {\
-                               dup2(g_Serr, old_Serr);\
-                       }\
-                       close(g_Serr);\
-               }\
-               fclose(g_fpLogDump);\
-       }\
-}
-
-#define PRINT_UTC_LOG(...) {\
-       g_fpLog = fopen(UTC_LOG, "a+");\
-       fprintf(g_fpLog, __VA_ARGS__);\
-       fclose(g_fpLog);\
-}
-
-
-#define PRINT_TC_RESULT(...) {\
-       g_fpLog = fopen(TC_RESULT, "w");\
-       fprintf(g_fpLog, __VA_ARGS__);\
-       fclose(g_fpLog);\
-}
-
-
 #define FREE_MEMORY_TC(buffer) {\
        if ( buffer != NULL )\
 {\

diff --git a/tests/tct-base-utils-core.cpp b/tests/tct-base-utils-core.cpp
index 332e5db..8572b98 100644 (file)
--- a/tests/tct-base-utils-core.cpp
+++ b/tests/tct-base-utils-core.cpp
@@ -60,7 +60,7 @@ TEST(base_utils, base_utils){
     pszGetTCName = (char*)malloc( 256 );
     memset( pszGetTCName, 0x00, 256);
     strcpy( pszGetTCName, "utc_capi_base");
-       int i=0, result=0, nRet=0;
+       int i=0, result=0;
 
        dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, pszGetTCName);
 

diff --git a/tests/tct-base-utils-core_mobile.h b/tests/tct-base-utils-core_mobile.h
index c54a222..088fcec 100644 (file)
--- a/tests/tct-base-utils-core_mobile.h
+++ b/tests/tct-base-utils-core_mobile.h
@@ -2305,11 +2305,9 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_utext_previous32_from_n",utc_capi_base_utils_i18n_utext_previous32_from_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_get_native_index_p",utc_capi_base_utils_i18n_utext_set_get_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_native_index_n1",utc_capi_base_utils_i18n_utext_set_native_index_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_set_native_index_n2",utc_capi_base_utils_i18n_utext_set_native_index_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_native_index_n",utc_capi_base_utils_i18n_utext_get_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_p",utc_capi_base_utils_i18n_utext_move_index32_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_n1",utc_capi_base_utils_i18n_utext_move_index32_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_move_index32_n2",utc_capi_base_utils_i18n_utext_move_index32_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_p",utc_capi_base_utils_i18n_utext_get_previous_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_n",utc_capi_base_utils_i18n_utext_get_previous_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_extract_p",utc_capi_base_utils_i18n_utext_extract_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
@@ -2617,7 +2615,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_ures_get_string_n",utc_capi_base_utils_i18n_ures_get_string_n,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_p",utc_capi_base_utils_i18n_ures_get_UTF8_string_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n1",utc_capi_base_utils_i18n_ures_get_UTF8_string_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
-       {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n2",utc_capi_base_utils_i18n_ures_get_UTF8_string_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_p",utc_capi_base_utils_i18n_ures_get_binary_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n1",utc_capi_base_utils_i18n_ures_get_binary_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n2",utc_capi_base_utils_i18n_ures_get_binary_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},

diff --git a/tests/tct-base-utils-core_tizeniot.h b/tests/tct-base-utils-core_tizeniot.h
index c54a222..088fcec 100755 (executable)
--- a/tests/tct-base-utils-core_tizeniot.h
+++ b/tests/tct-base-utils-core_tizeniot.h
@@ -2305,11 +2305,9 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_utext_previous32_from_n",utc_capi_base_utils_i18n_utext_previous32_from_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_get_native_index_p",utc_capi_base_utils_i18n_utext_set_get_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_native_index_n1",utc_capi_base_utils_i18n_utext_set_native_index_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_set_native_index_n2",utc_capi_base_utils_i18n_utext_set_native_index_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_native_index_n",utc_capi_base_utils_i18n_utext_get_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_p",utc_capi_base_utils_i18n_utext_move_index32_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_n1",utc_capi_base_utils_i18n_utext_move_index32_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_move_index32_n2",utc_capi_base_utils_i18n_utext_move_index32_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_p",utc_capi_base_utils_i18n_utext_get_previous_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_n",utc_capi_base_utils_i18n_utext_get_previous_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_extract_p",utc_capi_base_utils_i18n_utext_extract_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
@@ -2617,7 +2615,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_ures_get_string_n",utc_capi_base_utils_i18n_ures_get_string_n,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_p",utc_capi_base_utils_i18n_ures_get_UTF8_string_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n1",utc_capi_base_utils_i18n_ures_get_UTF8_string_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
-       {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n2",utc_capi_base_utils_i18n_ures_get_UTF8_string_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_p",utc_capi_base_utils_i18n_ures_get_binary_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n1",utc_capi_base_utils_i18n_ures_get_binary_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n2",utc_capi_base_utils_i18n_ures_get_binary_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},

diff --git a/tests/tct-base-utils-core_wearable.h b/tests/tct-base-utils-core_wearable.h
index c54a222..088fcec 100644 (file)
--- a/tests/tct-base-utils-core_wearable.h
+++ b/tests/tct-base-utils-core_wearable.h
@@ -2305,11 +2305,9 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_utext_previous32_from_n",utc_capi_base_utils_i18n_utext_previous32_from_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_get_native_index_p",utc_capi_base_utils_i18n_utext_set_get_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_set_native_index_n1",utc_capi_base_utils_i18n_utext_set_native_index_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_set_native_index_n2",utc_capi_base_utils_i18n_utext_set_native_index_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_native_index_n",utc_capi_base_utils_i18n_utext_get_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_p",utc_capi_base_utils_i18n_utext_move_index32_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_move_index32_n1",utc_capi_base_utils_i18n_utext_move_index32_n1,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
-       {"utc_capi_base_utils_i18n_utext_move_index32_n2",utc_capi_base_utils_i18n_utext_move_index32_n2,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_p",utc_capi_base_utils_i18n_utext_get_previous_native_index_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_get_previous_native_index_n",utc_capi_base_utils_i18n_utext_get_previous_native_index_n,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
        {"utc_capi_base_utils_i18n_utext_extract_p",utc_capi_base_utils_i18n_utext_extract_p,utc_capi_base_utils_utext_startup,utc_capi_base_utils_utext_cleanup},
@@ -2617,7 +2615,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_ures_get_string_n",utc_capi_base_utils_i18n_ures_get_string_n,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_p",utc_capi_base_utils_i18n_ures_get_UTF8_string_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n1",utc_capi_base_utils_i18n_ures_get_UTF8_string_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
-       {"utc_capi_base_utils_i18n_ures_get_UTF8_string_n2",utc_capi_base_utils_i18n_ures_get_UTF8_string_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_p",utc_capi_base_utils_i18n_ures_get_binary_p,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n1",utc_capi_base_utils_i18n_ures_get_binary_n1,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},
        {"utc_capi_base_utils_i18n_ures_get_binary_n2",utc_capi_base_utils_i18n_ures_get_binary_n2,utc_capi_base_utils_ures_startup,utc_capi_base_utils_ures_cleanup},

diff --git a/tests/tct-base-utils_utc_common.h b/tests/tct-base-utils_utc_common.h
index 9f413d9..b2025f7 100644 (file)
--- a/tests/tct-base-utils_utc_common.h
+++ b/tests/tct-base-utils_utc_common.h
@@ -2385,11 +2385,9 @@ int utc_capi_base_utils_i18n_utext_previous32_from_p(void);
 int utc_capi_base_utils_i18n_utext_previous32_from_n(void);
 int utc_capi_base_utils_i18n_utext_set_get_native_index_p(void);
 int utc_capi_base_utils_i18n_utext_set_native_index_n1(void);
-int utc_capi_base_utils_i18n_utext_set_native_index_n2(void);
 int utc_capi_base_utils_i18n_utext_get_native_index_n(void);
 int utc_capi_base_utils_i18n_utext_move_index32_p(void);
 int utc_capi_base_utils_i18n_utext_move_index32_n1(void);
-int utc_capi_base_utils_i18n_utext_move_index32_n2(void);
 int utc_capi_base_utils_i18n_utext_get_previous_native_index_p(void);
 int utc_capi_base_utils_i18n_utext_get_previous_native_index_n(void);
 int utc_capi_base_utils_i18n_utext_extract_p(void);
@@ -2697,7 +2695,6 @@ int utc_capi_base_utils_i18n_ures_get_string_p(void);
 int utc_capi_base_utils_i18n_ures_get_string_n(void);
 int utc_capi_base_utils_i18n_ures_get_UTF8_string_p(void);
 int utc_capi_base_utils_i18n_ures_get_UTF8_string_n1(void);
-int utc_capi_base_utils_i18n_ures_get_UTF8_string_n2(void);
 int utc_capi_base_utils_i18n_ures_get_binary_p(void);
 int utc_capi_base_utils_i18n_ures_get_binary_n1(void);
 int utc_capi_base_utils_i18n_ures_get_binary_n2(void);

diff --git a/tests/utc-capi-base-utils-loc-disp-names.c b/tests/utc-capi-base-utils-loc-disp-names.c
index ba025a9..89da878 100644 (file)
--- a/tests/utc-capi-base-utils-loc-disp-names.c
+++ b/tests/utc-capi-base-utils-loc-disp-names.c
@@ -1,4 +1,5 @@
 #include "assert_local.h"
+#include <string.h>
 #include <utils_i18n.h>
 
 i18n_loc_disp_names_h loc_disp = NULL;

diff --git a/tests/utc-capi-base-utils-uchar.c b/tests/utc-capi-base-utils-uchar.c
index 1b4c246..f25d85a 100644 (file)
--- a/tests/utc-capi-base-utils-uchar.c
+++ b/tests/utc-capi-base-utils-uchar.c
@@ -2822,7 +2822,7 @@ int utc_capi_base_utils_i18n_uchar_char_age_p(void)
     i18n_uversion_info version = {4, 1, 0};
 
 
-    ret = i18n_uchar_char_age(c, &char_age);
+    ret = i18n_uchar_char_age(c, char_age);
     assert_eq(ret, I18N_ERROR_NONE);
     assert_eq(memcmp(char_age, version, 3), 0);
 

diff --git a/tests/utc-capi-base-utils-uchar_iter.c b/tests/utc-capi-base-utils-uchar_iter.c
index 1eb5cb5..2edc677 100644 (file)
--- a/tests/utc-capi-base-utils-uchar_iter.c
+++ b/tests/utc-capi-base-utils-uchar_iter.c
@@ -15,6 +15,7 @@
  */
 
 #include "assert_local.h"
+#include <string.h>
 #include <utils_i18n.h>
 
 #define BUFSIZE 128

diff --git a/tests/utc-capi-base-utils-ucnv.c b/tests/utc-capi-base-utils-ucnv.c
index dd4eb16..1f30b49 100644 (file)
--- a/tests/utc-capi-base-utils-ucnv.c
+++ b/tests/utc-capi-base-utils-ucnv.c
@@ -87,8 +87,6 @@ int utc_capi_base_utils_i18n_ucnv_get_max_bytes_for_string_n2(void)
 int utc_capi_base_utils_i18n_ucnv_compare_names_p(void)
 {
        static const char *equalUTF8[]={ "UTF-8", "utf_8", "u*T@f08", "Utf 8" };
-
-       const char *name1, *name2;
        int result;
 
        for(i = 0; i<3; ++i) {
@@ -1135,7 +1133,6 @@ int utc_capi_base_utils_i18n_ucnv_from_unicode_p(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1201,7 +1198,6 @@ int utc_capi_base_utils_i18n_ucnv_from_unicode_n3(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1223,7 +1219,6 @@ int utc_capi_base_utils_i18n_ucnv_from_unicode_n4(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1245,7 +1240,6 @@ int utc_capi_base_utils_i18n_ucnv_from_unicode_n5(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1267,7 +1261,6 @@ int utc_capi_base_utils_i18n_ucnv_to_unicode_p(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1311,7 +1304,6 @@ int utc_capi_base_utils_i18n_ucnv_to_unicode_n2(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1333,7 +1325,6 @@ int utc_capi_base_utils_i18n_ucnv_to_unicode_n3(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1355,7 +1346,6 @@ int utc_capi_base_utils_i18n_ucnv_to_unicode_n4(void)
        i18n_uchar uchar_as_char_buffer[2] = {2, 2};
        char *chars_ptr = char_buffer;
        i18n_uchar *uchars_ptr = (i18n_uchar *)uchar_as_char_buffer;
-       i18n_uchar *uchars_bad_ptr = (i18n_uchar *)(uchar_as_char_buffer + 1);
 
        ret = i18n_ucnv_create("UTF-8", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1497,7 +1487,6 @@ int utc_capi_base_utils_i18n_ucnv_from_uchars_n5(void)
  */
 int utc_capi_base_utils_i18n_ucnv_from_uchars_n6(void)
 {
-       static const i18n_uchar surrogate[1] = {0xd900};
        char buffer[16];
        int32_t len;
 
@@ -1752,7 +1741,7 @@ int utc_capi_base_utils_i18n_ucnv_get_next_uchar_p(void)
        const char source_data[] = { (char)0xa2, (char)0xae, (char)0xa2 };
        const char *source = source_data;
        const char *source_limit = source_data + sizeof(source_data);
-       i18n_uchar32 result1, result2, result3;
+       i18n_uchar32 result1, result2;
 
        ret = i18n_ucnv_create("ibm-1363", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1778,7 +1767,7 @@ int utc_capi_base_utils_i18n_ucnv_get_next_uchar_n1(void)
        const char source_data[] = { (char)0xa2, (char)0xae, (char)0xa2 };
        const char *source = source_data;
        const char *source_limit = source_data + sizeof(source_data);
-       i18n_uchar32 result1, result2, result3;
+       i18n_uchar32 result3;
 
        ret = i18n_ucnv_create("ibm-1363", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1796,10 +1785,9 @@ int utc_capi_base_utils_i18n_ucnv_get_next_uchar_n1(void)
  */
 int utc_capi_base_utils_i18n_ucnv_get_next_uchar_n2(void)
 {
+       i18n_uchar32 result3;
        const char source_data[] = { (char)0xa2, (char)0xae, (char)0xa2 };
-       const char *source = source_data;
        const char *source_limit = source_data + sizeof(source_data);
-       i18n_uchar32 result1, result2, result3;
 
        ret = i18n_ucnv_create("ibm-1363", &cnv);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1875,7 +1863,7 @@ int utc_capi_base_utils_i18n_ucnv_convert_ex_n2(void)
        const char *src = src_buffer;
 
        i18n_uchar pivot_buffer[100];
-       i18n_uchar *pivot_source, *pivot_target;
+       i18n_uchar *pivot_target;
 
        ret = i18n_ucnv_create("UTF-8", &cnv1);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -1883,7 +1871,7 @@ int utc_capi_base_utils_i18n_ucnv_convert_ex_n2(void)
        ret = i18n_ucnv_create("Shift-JIS", &cnv2);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       pivot_source = pivot_target = pivot_buffer;
+       pivot_target = pivot_buffer;
        ret = i18n_ucnv_convert_ex(cnv2, cnv1, &target, target_buffer+sizeof(target_buffer), &src, NULL, pivot_buffer, NULL, &pivot_target, pivot_buffer+1, true, true);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -1898,9 +1886,8 @@ int utc_capi_base_utils_i18n_ucnv_convert_ex_n2(void)
 int utc_capi_base_utils_i18n_ucnv_convert_ex_n3(void)
 {
        i18n_ucnv_h cnv1, cnv2;
-       char target_buffer[100], src_buffer[100];
+       char target_buffer[100];
        char *target = target_buffer;
-       const char *src = src_buffer;
 
        i18n_uchar pivot_buffer[100];
        i18n_uchar *pivot_source, *pivot_target;
@@ -1956,7 +1943,6 @@ int utc_capi_base_utils_i18n_ucnv_convert_ex_n5(void)
 {
        i18n_ucnv_h cnv1, cnv2;
        char target_buffer[100], src_buffer[100];
-       char *target = target_buffer;
        const char *src = src_buffer;
 
        i18n_uchar pivot_buffer[100];
@@ -2101,8 +2087,6 @@ int utc_capi_base_utils_i18n_ucnv_convert_n1(void)
        int32_t target_limit = 0, source_limit = 0, target_capacity = 0;
 
        const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
-       const uint8_t expected_target[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
-       char *target=0;
        source_limit=I18N_UPRV_LENGTHOF(source);
 
        ret = i18n_ucnv_convert("ibm-1364", "ibm-1363", NULL, target_limit, (const char*)source, source_limit, &target_capacity);
@@ -2121,7 +2105,6 @@ int utc_capi_base_utils_i18n_ucnv_convert_n2(void)
        int32_t target_limit = 0, source_limit = 0, target_capacity = 0;
 
        const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
-       const uint8_t expected_target[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
        char *target=0;
        source_limit=I18N_UPRV_LENGTHOF(source);
 
@@ -2141,12 +2124,10 @@ int utc_capi_base_utils_i18n_ucnv_convert_n2(void)
  */
 int utc_capi_base_utils_i18n_ucnv_convert_n3(void)
 {
-       int32_t target_limit = 0, source_limit = 0, target_capacity = 0;
+       int32_t target_limit = 0, target_capacity = 0;
 
        const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
-       const uint8_t expected_target[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
        char *target=0;
-       source_limit=I18N_UPRV_LENGTHOF(source);
 
        target_limit = target_capacity + 1;
        target = (char *)malloc(sizeof(char) * target_limit);
@@ -2167,7 +2148,6 @@ int utc_capi_base_utils_i18n_ucnv_convert_n4(void)
        int32_t source_limit = 0, target_capacity = 0;
 
        const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
-       const uint8_t expected_target[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
        char *target=0;
        source_limit=I18N_UPRV_LENGTHOF(source);
 
@@ -2187,7 +2167,6 @@ int utc_capi_base_utils_i18n_ucnv_convert_n5(void)
        int32_t target_limit = 0, source_limit = 0, target_capacity = 0;
 
        const uint8_t source[]={ 0x00, 0x04, 0x05, 0x06, 0xa2, 0xb4, 0x00};
-       const uint8_t expected_target[]={ 0x00, 0x37, 0x2d, 0x2e, 0x0e, 0x49, 0x62, 0x0f, 0x00};
        source_limit=I18N_UPRV_LENGTHOF(source);
 
        target_limit = target_capacity + 1;
@@ -2513,11 +2492,6 @@ int utc_capi_base_utils_i18n_ucnv_to_algorithmic_n3(void)
  */
 int utc_capi_base_utils_i18n_ucnv_to_algorithmic_n4(void)
 {
-       static const uint8_t
-               shiftJIS[]={
-                       0x88, 0xea, 0x83, 0x40, 0xa1, 0x84, 0x40
-               };
-
        int32_t length;
        char target[100];
 
@@ -2689,8 +2663,6 @@ int utc_capi_base_utils_i18n_ucnv_create_all_names_p(void)
  */
 int utc_capi_base_utils_i18n_ucnv_create_all_names_n(void)
 {
-       i18n_uenumeration_h enumeration;
-
        ret = i18n_ucnv_create_all_names(NULL);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -2804,7 +2776,7 @@ int utc_capi_base_utils_i18n_ucnv_get_aliases_p(void)
  */
 int utc_capi_base_utils_i18n_ucnv_get_aliases_n(void)
 {
-       const char **aliases;
+       const char **aliases = NULL;
        ret = i18n_ucnv_get_aliases(NULL, aliases);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 

diff --git a/tests/utc-capi-base-utils-ucnvsel.c b/tests/utc-capi-base-utils-ucnvsel.c
index a5d930e..664a354 100644 (file)
--- a/tests/utc-capi-base-utils-ucnvsel.c
+++ b/tests/utc-capi-base-utils-ucnvsel.c
@@ -5,7 +5,6 @@
 #define I18N_UPRV_LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 
 static int ret = I18N_ERROR_NONE;
-static int i;
 static i18n_uconverter_selector_h g_sel;
 
 /**
@@ -28,13 +27,9 @@ void utc_capi_base_utils_ucnvsel_cleanup(void)
 {
 }
 
-static const char **g_available_names = NULL;
-static int32_t g_count_available = 0;
-
 static const char ** get_encodings(int32_t start, int32_t step, int32_t count, int32_t *pCount)
 {
        const char **names;
-       int32_t i;
 
        *pCount = 0;
        if (count <= 0) {
@@ -98,8 +93,6 @@ int utc_capi_base_utils_i18n_ucnvsel_create_n1(void)
  */
 int utc_capi_base_utils_i18n_ucnvsel_create_n2(void)
 {
-       int32_t num_encodings;
-
        i18n_uset_h excluded_set = NULL;
        ret = i18n_uset_create_empty(&excluded_set);
        assert_eq(ret, I18N_ERROR_NONE);
@@ -292,7 +285,7 @@ int utc_capi_base_utils_i18n_ucnvsel_select_for_string_p(void)
 int utc_capi_base_utils_i18n_ucnvsel_select_for_string_n1(void)
 {
        i18n_uenumeration_h enumeration;
-       const i18n_uchar *string;
+       const i18n_uchar *string = NULL;
 
        ret = i18n_ucnvsel_select_for_string(NULL, string, 1, &enumeration);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
@@ -355,7 +348,7 @@ int utc_capi_base_utils_i18n_ucnvsel_select_for_utf8_p(void)
 int utc_capi_base_utils_i18n_ucnvsel_select_for_utf8_n1(void)
 {
        i18n_uenumeration_h enumeration;
-       const char *string;
+       const char *string = NULL;
 
        ret = i18n_ucnvsel_select_for_utf8(NULL, string, 1, &enumeration);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);

diff --git a/tests/utc-capi-base-utils-ucsdet.c b/tests/utc-capi-base-utils-ucsdet.c
index 58e2c31..e86caa1 100644 (file)
--- a/tests/utc-capi-base-utils-ucsdet.c
+++ b/tests/utc-capi-base-utils-ucsdet.c
@@ -8,7 +8,6 @@ static int32_t preflight(const i18n_uchar *src, int32_t length, i18n_ucnv_h cnv)
 static char *extract_bytes(const i18n_uchar *src, int32_t length, const char *codepage, int32_t *byte_length);
 
 static int ret = I18N_ERROR_NONE;
-static int i;
 i18n_ucharset_detector_h ucsd;
 
 /**
@@ -104,7 +103,7 @@ int utc_capi_base_utils_i18n_ucsdet_set_text_p(void)
                "\\u0391\\u0392\\u0393\\u0394\\u0395"
                "Sure would be nice if our source could contain Unicode directly!";
 
-       int32_t byte_length = 0, s_length = 0, d_length = 0;
+       int32_t byte_length = 0, s_length = 0;
        i18n_uchar s[sizeof(ss)];
        char *bytes;
 
@@ -129,7 +128,7 @@ int utc_capi_base_utils_i18n_ucsdet_set_text_p(void)
  */
 int utc_capi_base_utils_i18n_ucsdet_set_text_n(void)
 {
-       ret = i18n_ucsdet_set_text(NULL, NULL, NULL);
+       ret = i18n_ucsdet_set_text(NULL, NULL, 0);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
        return 0;
@@ -199,7 +198,7 @@ int utc_capi_base_utils_i18n_ucsdet_detect_p(void)
                "\\u0391\\u0392\\u0393\\u0394\\u0395"
                "Sure would be nice if our source could contain Unicode directly!";
 
-       int32_t byte_length = 0, s_length = 0, d_length = 0;
+       int32_t byte_length = 0, s_length = 0;
        i18n_uchar s[sizeof(ss)];
        char *bytes;
 
@@ -229,7 +228,6 @@ int utc_capi_base_utils_i18n_ucsdet_detect_p(void)
  */
 int utc_capi_base_utils_i18n_ucsdet_detect_n1(void)
 {
-       int32_t matches_found = 0;
        i18n_ucharset_match_h ucsm = NULL;
 
        ret = i18n_ucsdet_create(&ucsd);
@@ -248,9 +246,6 @@ int utc_capi_base_utils_i18n_ucsdet_detect_n1(void)
  */
 int utc_capi_base_utils_i18n_ucsdet_detect_n2(void)
 {
-       int32_t matches_found = 0;
-       i18n_ucharset_match_h ucsm = NULL;
-
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
@@ -276,7 +271,6 @@ int utc_capi_base_utils_i18n_ucsdet_detect_all_p(void)
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       const char *lang, *name;
        s_length = i18n_ustring_unescape(ss, s, sizeof(ss));
        bytes = extract_bytes(s, s_length, "ISO-8859-1", &byte_length);
 
@@ -336,7 +330,7 @@ int utc_capi_base_utils_i18n_ucsdet_get_name_p(void)
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       const char *lang, *name;
+       const char *name;
        s_length = i18n_ustring_unescape(ss, s, sizeof(ss));
        bytes = extract_bytes(s, s_length, "ISO-8859-1", &byte_length);
 
@@ -403,7 +397,6 @@ int utc_capi_base_utils_i18n_ucsdet_get_confidence_p(void)
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       const char *lang, *name;
        s_length = i18n_ustring_unescape(ss, s, sizeof(ss));
        bytes = extract_bytes(s, s_length, "ISO-8859-1", &byte_length);
 
@@ -472,7 +465,7 @@ int utc_capi_base_utils_i18n_ucsdet_get_language_p(void)
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       const char *lang, *name;
+       const char *lang;
        s_length = i18n_ustring_unescape(ss, s, sizeof(ss));
        bytes = extract_bytes(s, s_length, "ISO-8859-1", &byte_length);
 
@@ -733,7 +726,6 @@ int utc_capi_base_utils_i18n_ucsdet_is_input_filter_enabled_p(void)
        ret = i18n_ucsdet_create(&ucsd);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       const char *lang, *name;
        s_length = i18n_ustring_unescape(ss, s, sizeof(ss));
        bytes = extract_bytes(s, s_length, "ISO-8859-1", &byte_length);
 

diff --git a/tests/utc-capi-base-utils-uidna.c b/tests/utc-capi-base-utils-uidna.c
index 3ff6009..452966c 100644 (file)
--- a/tests/utc-capi-base-utils-uidna.c
+++ b/tests/utc-capi-base-utils-uidna.c
@@ -5,7 +5,6 @@
 #define I18N_UPRV_LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 
 static int ret = I18N_ERROR_NONE;
-static int i;
 static i18n_uidna_h uidna;
 
 /**
@@ -38,7 +37,6 @@ void utc_capi_base_utils_uidna_cleanup(void)
 int utc_capi_base_utils_i18n_uidna_label_to_ascii_p(void)
 {
     static const i18n_uchar fA_sharps16[] = { 0x66, 0x41, 0xdf, 0 };
-    static const i18n_uchar fa_sharps16[] = { 0x66, 0x61, 0xdf, 0 };
 
        i18n_uchar dest[10];
        i18n_uidna_info_h info;

diff --git a/tests/utc-capi-base-utils-unormalization.c b/tests/utc-capi-base-utils-unormalization.c
index 9d63857..9b4ac61 100644 (file)
--- a/tests/utc-capi-base-utils-unormalization.c
+++ b/tests/utc-capi-base-utils-unormalization.c
@@ -506,7 +506,6 @@ int utc_capi_base_utils_i18n_unormalization_get_decomposition_n1(void)
        ret = i18n_unormalization_get_instance(NULL, "nfc", I18N_UNORMALIZATION_COMPOSE_CONTIGUOUS, &normalizer2);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       i18n_uchar decomp[32];
        int32_t length;
        ret = i18n_unormalization_get_decomposition(normalizer2, 0xac01, NULL, 0, &length);
        assert_eq(ret, I18N_ERROR_BUFFER_OVERFLOW);
@@ -544,7 +543,6 @@ int utc_capi_base_utils_i18n_unormalization_get_decomposition_n3(void)
        ret = i18n_unormalization_get_instance(NULL, "nfc", I18N_UNORMALIZATION_COMPOSE_CONTIGUOUS, &normalizer2);
        assert_eq(ret, I18N_ERROR_NONE);
 
-       i18n_uchar decomp[32];
        int32_t length;
        ret = i18n_unormalization_get_decomposition(normalizer2, 0xac01, NULL, 4, &length);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
@@ -777,7 +775,6 @@ int utc_capi_base_utils_i18n_unormalization_compose_pair_n(void)
 
        i18n_uchar a = 0x1100;
        i18n_uchar b = 0x1161;
-       i18n_uchar composite = 0xac00;
 
        i18n_uchar32 result;
        ret = i18n_unormalization_compose_pair(NULL, a, b, &result);

diff --git a/tests/utc-capi-base-utils-ures.c b/tests/utc-capi-base-utils-ures.c
index 84f17f8..595161c 100644 (file)
--- a/tests/utc-capi-base-utils-ures.c
+++ b/tests/utc-capi-base-utils-ures.c
@@ -426,47 +426,6 @@ int utc_capi_base_utils_i18n_ures_get_UTF8_string_n1(void)
 }
 
 /**
- * @testcase utc_capi_base_utils_i18n_ures_get_UTF8_string_n2
- * @since_tizen 6.0
- * @description Calls i18n_ures_get_UTF8_string and checks whether function succeeded.
- */
-int utc_capi_base_utils_i18n_ures_get_UTF8_string_n2(void)
-{
-       i18n_ures_h uresource;
-       int ret = i18n_ures_create("./tests/res/", "testtypes", &uresource);
-       assert_eq(ret, I18N_ERROR_NONE);
-
-       i18n_ures_h item = NULL;
-       int count;
-       i18n_ures_type_e type_result;
-
-       const char *result = NULL;
-       char buffer8[16];
-       int32_t result_len = (int32_t)sizeof(buffer8);
-
-       ret = i18n_ures_get_size(uresource, &count);
-       assert_eq(ret, I18N_ERROR_NONE);
-
-       if(count > 10)
-               count = 10;
-
-       for(int i = 0; i < count; ++i) {
-               ret = i18n_ures_get_by_index(uresource, i, item, &item);
-               assert_eq(ret, I18N_ERROR_NONE);
-
-               ret = i18n_ures_get_type(item, &type_result);
-               assert_eq(ret, I18N_ERROR_NONE);
-
-               if (I18N_URES_STRING == type_result) {
-                       ret = i18n_ures_get_UTF8_string(item, buffer8, &result_len, false, &result);
-                       assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-               }
-       }
-       i18n_ures_destroy(uresource);
-       return 0;
-}
-
-/**
  * @testcase utc_capi_base_utils_i18n_ures_get_binary_p
  * @since_tizen 6.0
  * @description Calls i18n_ures_get_binary and checks whether function succeeded.
@@ -1116,7 +1075,7 @@ int utc_capi_base_utils_i18n_ures_get_next_string_n3(void)
        assert_eq(ret, I18N_ERROR_NONE);
 
        const i18n_uchar *result = NULL;
-       int32_t result_len = NULL;
+       int32_t result_len = 0;
 
        ret = i18n_ures_get_next_string(uresource, &result_len, NULL, &result);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);

diff --git a/tests/utc-capi-base-utils-uscript.c b/tests/utc-capi-base-utils-uscript.c
index addd21b..ac2cf9f 100644 (file)
--- a/tests/utc-capi-base-utils-uscript.c
+++ b/tests/utc-capi-base-utils-uscript.c
@@ -54,7 +54,6 @@ int utc_capi_base_utils_i18n_uscript_get_codes_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_get_codes_n(void)
 {
-       static const i18n_uscript_code_e KOREAN[2] = { I18N_USCRIPT_HANGUL, I18N_USCRIPT_HAN };
        i18n_uscript_code_e scripts[2];
        int32_t len = 0;
 
@@ -89,11 +88,11 @@ int utc_capi_base_utils_i18n_uscript_get_name_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_get_name_n(void)
 {
-       const char * name = i18n_uscript_get_name(I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_get_name(I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       name = i18n_uscript_get_name(I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_get_name(I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -119,11 +118,11 @@ int utc_capi_base_utils_i18n_uscript_get_short_name_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_get_short_name_n(void)
 {
-       const char * name = i18n_uscript_get_short_name(I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_get_short_name(I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       name = i18n_uscript_get_short_name(I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_get_short_name(I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -202,11 +201,11 @@ int utc_capi_base_utils_i18n_uscript_has_script_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_has_script_n(void)
 {
-       i18n_ubool b = i18n_uscript_has_script(0x063f, I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_has_script(0x063f, I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       b = i18n_uscript_has_script(0x063f, I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_has_script(0x063f, I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -345,11 +344,11 @@ int utc_capi_base_utils_i18n_uscript_is_right_to_left_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_is_right_to_left_n(void)
 {
-       i18n_ubool b = i18n_uscript_is_right_to_left(I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_is_right_to_left(I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       b = i18n_uscript_is_right_to_left(I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_is_right_to_left(I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -379,11 +378,11 @@ int utc_capi_base_utils_i18n_uscript_breaks_between_letters_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_breaks_between_letters_n(void)
 {
-       i18n_ubool b = i18n_uscript_breaks_between_letters(I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_breaks_between_letters(I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       b = i18n_uscript_breaks_between_letters(I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_breaks_between_letters(I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
        return 0;
@@ -412,11 +411,11 @@ int utc_capi_base_utils_i18n_uscript_is_cased_p(void)
  */
 int utc_capi_base_utils_i18n_uscript_is_cased_n(void)
 {
-       i18n_ubool b = i18n_uscript_is_cased(I18N_USCRIPT_INVALID_CODE);
+       i18n_uscript_is_cased(I18N_USCRIPT_INVALID_CODE);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
-       b = i18n_uscript_is_cased(I18N_USCRIPT_CODE_LIMIT);
+       i18n_uscript_is_cased(I18N_USCRIPT_CODE_LIMIT);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 

diff --git a/tests/utc-capi-base-utils-utext.c b/tests/utc-capi-base-utils-utext.c
index 17da87d..642f27c 100644 (file)
--- a/tests/utc-capi-base-utils-utext.c
+++ b/tests/utc-capi-base-utils-utext.c
@@ -37,7 +37,6 @@ void utc_capi_base_utils_utext_cleanup(void)
  */
 int utc_capi_base_utils_i18n_utext_create_for_UTF8_p(void)
 {
-       i18n_utext_h *utLoc;
        i18n_uchar32 c;
 
        ret = i18n_utext_create_for_UTF8(NULL, NULL, 0, &uta);
@@ -55,9 +54,6 @@ int utc_capi_base_utils_i18n_utext_create_for_UTF8_p(void)
  */
 int utc_capi_base_utils_i18n_utext_create_for_UTF8_n(void)
 {
-       i18n_utext_h *utLoc;
-       i18n_uchar32 c;
-
        ret = i18n_utext_create_for_UTF8(NULL, NULL, 0, NULL);
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -212,9 +208,7 @@ int utc_capi_base_utils_i18n_utext_native_length_p(void)
  */
 int utc_capi_base_utils_i18n_utext_native_length_n(void)
 {
-       int64_t len;
-
-       len = i18n_utext_native_length(NULL);
+       i18n_utext_native_length(NULL);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -247,9 +241,7 @@ int utc_capi_base_utils_i18n_utext_is_length_expensive_p(void)
  */
 int utc_capi_base_utils_i18n_utext_is_length_expensive_n(void)
 {
-       i18n_ubool b;
-
-       b = i18n_utext_is_length_expensive(NULL);
+       i18n_utext_is_length_expensive(NULL);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -282,9 +274,7 @@ int utc_capi_base_utils_i18n_utext_char32_at_p(void)
  */
 int utc_capi_base_utils_i18n_utext_char32_at_n(void)
 {
-       i18n_uchar32 c;
-
-       c = i18n_utext_char32_at(NULL, 0);
+       i18n_utext_char32_at(NULL, 0);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -317,9 +307,7 @@ int utc_capi_base_utils_i18n_utext_current32_p(void)
  */
 int utc_capi_base_utils_i18n_utext_current32_n(void)
 {
-       i18n_uchar32 c;
-
-       c = i18n_utext_current32(NULL);
+       i18n_utext_current32(NULL);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -354,9 +342,7 @@ int utc_capi_base_utils_i18n_utext_next32_p(void)
  */
 int utc_capi_base_utils_i18n_utext_next32_n(void)
 {
-       i18n_uchar32 c;
-
-       c = i18n_utext_current32(NULL);
+       i18n_utext_current32(NULL);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -392,8 +378,7 @@ int utc_capi_base_utils_i18n_utext_previous32_p(void)
  */
 int utc_capi_base_utils_i18n_utext_previous32_n(void)
 {
-       i18n_uchar32 c;
-       c = i18n_utext_current32(NULL);
+       i18n_utext_current32(NULL);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -426,8 +411,7 @@ int utc_capi_base_utils_i18n_utext_next32_from_p(void)
  */
 int utc_capi_base_utils_i18n_utext_next32_from_n(void)
 {
-       i18n_uchar32 c;
-       c = i18n_utext_next32_from(NULL, 1);
+       i18n_utext_next32_from(NULL, 1);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -460,8 +444,7 @@ int utc_capi_base_utils_i18n_utext_previous32_from_p(void)
  */
 int utc_capi_base_utils_i18n_utext_previous32_from_n(void)
 {
-       i18n_uchar32 c;
-       c = i18n_utext_previous32_from(NULL, 2);
+       i18n_utext_previous32_from(NULL, 2);
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
@@ -504,33 +487,13 @@ int utc_capi_base_utils_i18n_utext_set_native_index_n1(void)
 }
 
 /**
- * @testcase utc_capi_base_utils_i18n_utext_set_native_index_n2
- * @since_tizen 6.0
- * @description Calls i18n_utext_set_native_index and checks whether function succeeded.
- */
-int utc_capi_base_utils_i18n_utext_set_native_index_n2(void)
-{
-       i18n_uchar uString[]  = {0x41, 0x42, 0x43, 0}; //ABC
-       int64_t i;
-
-       ret = i18n_utext_create_for_uchars(NULL, uString, -1, &uta);
-       assert_eq(ret, I18N_ERROR_NONE);
-
-       i18n_utext_set_native_index(uta, NULL);
-       ret = get_last_result();
-       assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-
-       return 0;
-}
-
-/**
  * @testcase utc_capi_base_utils_i18n_utext_get_native_index_n
  * @since_tizen 6.0
  * @description Calls i18n_utext_get_native_index and checks whether function succeeded.
  */
 int utc_capi_base_utils_i18n_utext_get_native_index_n(void)
 {
-       int64_t i = i18n_utext_get_native_index(NULL);
+       i18n_utext_get_native_index(NULL);
 
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
@@ -565,29 +528,7 @@ int utc_capi_base_utils_i18n_utext_move_index32_p(void)
  */
 int utc_capi_base_utils_i18n_utext_move_index32_n1(void)
 {
-       i18n_uchar uString[]  = {0x41, 0x42, 0x43, 0}; //ABC
-       i18n_ubool b;
-
-       ret = i18n_utext_create_for_uchars(NULL, uString, -1, &uta);
-       assert_eq(ret, I18N_ERROR_NONE);
-
-       i18n_utext_set_native_index(uta, 0);
-       b = i18n_utext_move_index32(uta, NULL);
-       ret = get_last_result();
-       assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-
-
-       return 0;
-}
-
-/**
- * @testcase utc_capi_base_utils_i18n_utext_move_index32_n2
- * @since_tizen 6.0
- * @description Calls i18n_utext_move_index32 and checks whether function succeeded.
- */
-int utc_capi_base_utils_i18n_utext_move_index32_n2(void)
-{
-       i18n_ubool b = i18n_utext_move_index32(NULL, 1);
+       i18n_utext_move_index32(NULL, 1);
 
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
@@ -622,7 +563,7 @@ int utc_capi_base_utils_i18n_utext_get_previous_native_index_p(void)
  */
 int utc_capi_base_utils_i18n_utext_get_previous_native_index_n(void)
 {
-       int64_t i = i18n_utext_get_previous_native_index(NULL);
+       i18n_utext_get_previous_native_index(NULL);
 
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
@@ -732,7 +673,7 @@ int utc_capi_base_utils_i18n_utext_has_meta_data_p(void)
  */
 int utc_capi_base_utils_i18n_utext_has_meta_data_n(void)
 {
-       i18n_ubool b = i18n_utext_has_meta_data(NULL);
+       i18n_utext_has_meta_data(NULL);
 
        ret = get_last_result();
        assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);