ICU-66108.tar.gz

[apple/icu.git] / icuSources / test / cintltst / ucnvseltst.c

diff --git a/icuSources/test/cintltst/ucnvseltst.c b/icuSources/test/cintltst/ucnvseltst.c
index 7f892663f06a5814f4f46430608241088fc99fe0..7e5138a93b8445c3539f2790c39298b4c23aa419 100644 (file)
--- a/icuSources/test/cintltst/ucnvseltst.c
+++ b/icuSources/test/cintltst/ucnvseltst.c
@@ -1,5 +1,7 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /********************************************************************
 /********************************************************************

- * Copyright (c) 1997-2010, International Business Machines
+ * Copyright (c) 1997-2014, International Business Machines

  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *


@@ -20,12 +22,11 @@
 #include "unicode/utypes.h"
 #include "unicode/ucnvsel.h"
 #include "unicode/ustring.h"
 #include "unicode/utypes.h"
 #include "unicode/ucnvsel.h"
 #include "unicode/ustring.h"

+#include "unicode/utf8.h"

 #include "cmemory.h"
 #include "cstring.h"
 #include "propsvec.h"
 
 #include "cmemory.h"
 #include "cstring.h"
 #include "propsvec.h"
 

-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-

 #define FILENAME_BUFFER 1024
 
 #define TDSRCPATH  ".." U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING
 #define FILENAME_BUFFER 1024
 
 #define TDSRCPATH  ".." U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING


@@ -164,8 +165,8 @@ static FILE *fopenOrError(const char *filename) {
     int32_t needLen;
     FILE *f;
     char fnbuf[FILENAME_BUFFER];
     int32_t needLen;
     FILE *f;
     char fnbuf[FILENAME_BUFFER];

-    const char* directory= ctest_dataSrcDir();
-    needLen = uprv_strlen(directory)+uprv_strlen(TDSRCPATH)+uprv_strlen(filename)+1;
+    const char* directory = ctest_dataSrcDir();
+    needLen = (int32_t)(uprv_strlen(directory) + uprv_strlen(TDSRCPATH) + uprv_strlen(filename) + 1);

     if(needLen > FILENAME_BUFFER) {
         log_err("FAIL: Could not load %s. Filename buffer overflow, needed %d but buffer is %d\n",
                 filename, needLen, FILENAME_BUFFER);
     if(needLen > FILENAME_BUFFER) {
         log_err("FAIL: Could not load %s. Filename buffer overflow, needed %d but buffer is %d\n",
                 filename, needLen, FILENAME_BUFFER);


@@ -239,7 +240,7 @@ text_open(TestText *tt) {
     fclose(f);
     return FALSE;
   }
     fclose(f);
     return FALSE;
   }

-  if (length != fread(tt->text, 1, length, f)) {
+  if (length != (int32_t)fread(tt->text, 1, length, f)) {

     log_err("error reading %ld bytes from test text file\n", (long)length);
     length = 0;
     uprv_free(tt->text);
     log_err("error reading %ld bytes from test text file\n", (long)length);
     length = 0;
     uprv_free(tt->text);


@@ -385,7 +386,7 @@ static void TestSelector()
     return;
   }
   if (!text_open(&text)) {
     return;
   }
   if (!text_open(&text)) {

-    releaseAvailableNames();;
+    releaseAvailableNames();

   }
 
   excluded_sets[0] = uset_openEmpty();
   }
 
   excluded_sets[0] = uset_openEmpty();


@@ -393,7 +394,7 @@ static void TestSelector()
     excluded_sets[i] = uset_open(i*30, i*30+500);
   }
 
     excluded_sets[i] = uset_open(i*30, i*30+500);
   }
 

-  for(testCaseIdx = 0; testCaseIdx < LENGTHOF(getEncodingsFns); testCaseIdx++)
+  for(testCaseIdx = 0; testCaseIdx < UPRV_LENGTHOF(getEncodingsFns); testCaseIdx++)

   {
     int32_t excluded_set_id;
     int32_t num_encodings;
   {
     int32_t excluded_set_id;
     int32_t num_encodings;


@@ -411,7 +412,7 @@ static void TestSelector()
      * The handling of the exclusion set is independent of the
      * set of encodings, so there is no need to test every combination.
      */
      * The handling of the exclusion set is independent of the
      * set of encodings, so there is no need to test every combination.
      */

-    excluded_set_id = testCaseIdx % LENGTHOF(excluded_sets);
+    excluded_set_id = testCaseIdx % UPRV_LENGTHOF(excluded_sets);

     {
       UConverterSelector *sel_rt, *sel_fb;
       char *buffer_fb = NULL;
     {
       UConverterSelector *sel_rt, *sel_fb;
       char *buffer_fb = NULL;


@@ -469,7 +470,7 @@ static void TestSelector()
         verifyResult(ucnvsel_selectForUTF8(sel_rt, s, -1, &status), manual_rt);
         verifyResult(ucnvsel_selectForUTF8(sel_fb, s, -1, &status), manual_fb);
 
         verifyResult(ucnvsel_selectForUTF8(sel_rt, s, -1, &status), manual_rt);
         verifyResult(ucnvsel_selectForUTF8(sel_fb, s, -1, &status), manual_fb);
 

-        u_strFromUTF8(utf16, LENGTHOF(utf16), &length16, s, length8, &status);
+        u_strFromUTF8(utf16, UPRV_LENGTHOF(utf16), &length16, s, length8, &status);

         if (U_FAILURE(status)) {
           log_err("error converting the test text (string %ld) to UTF-16 - %s\n",
                   (long)text.number, u_errorName(status));
         if (U_FAILURE(status)) {
           log_err("error converting the test text (string %ld) to UTF-16 - %s\n",
                   (long)text.number, u_errorName(status));


@@ -506,7 +507,6 @@ static void TestSelector()
 
 /* Improve code coverage of UPropsVectors */
 static void TestUPropsVector() {
 
 /* Improve code coverage of UPropsVectors */
 static void TestUPropsVector() {

-    uint32_t value;

     UErrorCode errorCode = U_ILLEGAL_ARGUMENT_ERROR;
     UPropsVectors *pv = upvec_open(100, &errorCode);
     if (pv != NULL) {
     UErrorCode errorCode = U_ILLEGAL_ARGUMENT_ERROR;
     UPropsVectors *pv = upvec_open(100, &errorCode);
     if (pv != NULL) {