mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-15 17:56:54 +00:00
ICU-900 Fixed some compiler warnings
X-SVN-Rev: 4859
This commit is contained in:
George Rhoten
parent
4bf13c79e9
commit
8383c8f1b3
3 changed files with 144 additions and 143 deletions
|
|
@ -465,11 +465,11 @@ void TestSafeClone() {
|
|||
UChar* test1;
|
||||
UChar* test2;
|
||||
UCollator * someCollators [CLONETEST_COLLATOR_COUNT];
|
||||
UCollator * someClonedCollators [CLONETEST_COLLATOR_COUNT];
|
||||
UCollator * col;
|
||||
UCollator * someClonedCollators [CLONETEST_COLLATOR_COUNT];
|
||||
UCollator * col;
|
||||
UErrorCode err = U_ZERO_ERROR;
|
||||
uint8_t buffer [CLONETEST_COLLATOR_COUNT] [U_COL_SAFECLONE_BUFFERSIZE];
|
||||
int32_t bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
uint8_t buffer [CLONETEST_COLLATOR_COUNT] [U_COL_SAFECLONE_BUFFERSIZE];
|
||||
int32_t bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
int index;
|
||||
|
||||
test1=(UChar*)malloc(sizeof(UChar) * 6);
|
||||
|
|
@ -478,83 +478,82 @@ void TestSafeClone() {
|
|||
u_uastrcpy(test2, "abcda");
|
||||
|
||||
/* one default collator & two complex ones */
|
||||
someCollators[0] = ucol_open("en_US", &err);
|
||||
someCollators[1] = ucol_open("ko", &err);
|
||||
someCollators[2] = ucol_open("ja_JP", &err);
|
||||
someCollators[0] = ucol_open("en_US", &err);
|
||||
someCollators[1] = ucol_open("ko", &err);
|
||||
someCollators[2] = ucol_open("ja_JP", &err);
|
||||
|
||||
/* Check the various error & informational states: */
|
||||
/* Check the various error & informational states: */
|
||||
|
||||
/* Null status - just returns NULL */
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, 0))
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null status\n");
|
||||
}
|
||||
/* error status - should return 0 & keep error the same */
|
||||
err = U_MEMORY_ALLOCATION_ERROR;
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err) || err != U_MEMORY_ALLOCATION_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with incoming error status\n");
|
||||
}
|
||||
err = U_ZERO_ERROR;
|
||||
/* Null status - just returns NULL */
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, 0))
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null status\n");
|
||||
}
|
||||
/* error status - should return 0 & keep error the same */
|
||||
err = U_MEMORY_ALLOCATION_ERROR;
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err) || err != U_MEMORY_ALLOCATION_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with incoming error status\n");
|
||||
}
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
/* Null buffer size pointer - just returns NULL & set error to U_ILLEGAL_ARGUMENT_ERROR*/
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], 0, &err) || err != U_ILLEGAL_ARGUMENT_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null bufferSize pointer\n");
|
||||
}
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
/* buffer size pointer is 0 - fill in pbufferSize with a size */
|
||||
bufferSize = 0;
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err) || U_FAILURE(err) || bufferSize <= 0)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed a sizing request ('preflighting')\n");
|
||||
}
|
||||
/* Verify our define is large enough */
|
||||
if (U_COL_SAFECLONE_BUFFERSIZE < bufferSize)
|
||||
{
|
||||
log_err("FAIL: Pre-calculated buffer size is too small\n");
|
||||
}
|
||||
/* Verify we can use this run-time calculated size */
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err)) || U_FAILURE(err))
|
||||
{
|
||||
log_err("FAIL: Collator can't be cloned with run-time size\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
/* size one byte too small - should allocate & let us know */
|
||||
--bufferSize;
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], 0, &bufferSize, &err)) || err != U_SAFECLONE_ALLOCATED_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with too-small buffer size\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
err = U_ZERO_ERROR;
|
||||
bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
/* Null buffer size pointer - just returns NULL & set error to U_ILLEGAL_ARGUMENT_ERROR*/
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], 0, &err) || err != U_ILLEGAL_ARGUMENT_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null bufferSize pointer\n");
|
||||
}
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
/* buffer size pointer is 0 - fill in pbufferSize with a size */
|
||||
bufferSize = 0;
|
||||
if (0 != ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err) || U_FAILURE(err) || bufferSize <= 0)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed a sizing request ('preflighting')\n");
|
||||
}
|
||||
/* Verify our define is large enough */
|
||||
if (U_COL_SAFECLONE_BUFFERSIZE < bufferSize)
|
||||
{
|
||||
log_err("FAIL: Pre-calculated buffer size is too small\n");
|
||||
}
|
||||
/* Verify we can use this run-time calculated size */
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], buffer[0], &bufferSize, &err)) || U_FAILURE(err))
|
||||
{
|
||||
log_err("FAIL: Collator can't be cloned with run-time size\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
/* size one byte too small - should allocate & let us know */
|
||||
--bufferSize;
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], 0, &bufferSize, &err)) || err != U_SAFECLONE_ALLOCATED_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with too-small buffer size\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
err = U_ZERO_ERROR;
|
||||
bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
|
||||
|
||||
/* Null buffer pointer - return Collator & set error to U_SAFECLONE_ALLOCATED_ERROR */
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], 0, &bufferSize, &err)) || err != U_SAFECLONE_ALLOCATED_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null buffer pointer\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
err = U_ZERO_ERROR;
|
||||
/* Null buffer pointer - return Collator & set error to U_SAFECLONE_ALLOCATED_ERROR */
|
||||
if (0 == (col = ucol_safeClone(someCollators[0], 0, &bufferSize, &err)) || err != U_SAFECLONE_ALLOCATED_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null buffer pointer\n");
|
||||
}
|
||||
if (col) ucol_close(col);
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
/* Null Collator - return NULL & set U_ILLEGAL_ARGUMENT_ERROR */
|
||||
if (0 != ucol_safeClone(0, buffer[0], &bufferSize, &err) || err != U_ILLEGAL_ARGUMENT_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null Collator pointer\n");
|
||||
}
|
||||
/* Null Collator - return NULL & set U_ILLEGAL_ARGUMENT_ERROR */
|
||||
if (0 != ucol_safeClone(0, buffer[0], &bufferSize, &err) || err != U_ILLEGAL_ARGUMENT_ERROR)
|
||||
{
|
||||
log_err("FAIL: Cloned Collator failed to deal correctly with null Collator pointer\n");
|
||||
}
|
||||
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
err = U_ZERO_ERROR;
|
||||
|
||||
/* change orig & clone & make sure they are independent */
|
||||
/* change orig & clone & make sure they are independent */
|
||||
|
||||
for (index = 0; index < CLONETEST_COLLATOR_COUNT; index++)
|
||||
{
|
||||
bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
someClonedCollators[index] = ucol_safeClone(someCollators[index], buffer[index], &bufferSize, &err);
|
||||
for (index = 0; index < CLONETEST_COLLATOR_COUNT; index++)
|
||||
{
|
||||
bufferSize = U_COL_SAFECLONE_BUFFERSIZE;
|
||||
someClonedCollators[index] = ucol_safeClone(someCollators[index], buffer[index], &bufferSize, &err);
|
||||
|
||||
ucol_setStrength(someClonedCollators[index], UCOL_TERTIARY);
|
||||
ucol_setStrength(someCollators[index], UCOL_PRIMARY);
|
||||
|
|
@ -565,8 +564,8 @@ void TestSafeClone() {
|
|||
doAssert( (ucol_equal(someCollators[index], test1, u_strlen(test1), test2, u_strlen(test2))), "Result should be \"abcda\" == \"abCda\"");
|
||||
|
||||
ucol_close(someClonedCollators[index]);
|
||||
ucol_close(someCollators[index]);
|
||||
}
|
||||
ucol_close(someCollators[index]);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#include "unicode/utypes.h"
|
||||
#include "unicode/ustring.h"
|
||||
#include "ncnvfbts.h"
|
||||
#include "cmemory.h"
|
||||
#include "cstring.h"
|
||||
|
||||
#define NEW_MAX_BUFFER 999
|
||||
|
||||
|
|
@ -218,7 +220,7 @@ static UBool testConvertFromUnicode(const UChar *source, int sourceLen, const u
|
|||
offset_str[0] = 0;
|
||||
for(p = junkout;p<targ;p++)
|
||||
{
|
||||
sprintf(junk + strlen(junk), "0x%02x, ", (0xFF) & (unsigned int)*p);
|
||||
sprintf(junk + uprv_strlen(junk), "0x%02x, ", (0xFF) & (unsigned int)*p);
|
||||
sprintf(offset_str + strlen(offset_str), "0x%02x, ", (0xFF) & (unsigned int)junokout[p-junkout]);
|
||||
}
|
||||
|
||||
|
|
@ -246,7 +248,7 @@ static UBool testConvertFromUnicode(const UChar *source, int sourceLen, const u
|
|||
if (checkOffsets && (expectOffsets != 0) )
|
||||
{
|
||||
log_verbose("\ncomparing %d offsets..\n", targ-junkout);
|
||||
if(memcmp(junokout,expectOffsets,(targ-junkout) * sizeof(int32_t) )){
|
||||
if(uprv_memcmp(junokout,expectOffsets,(targ-junkout) * sizeof(int32_t) )){
|
||||
log_err("\ndid not get the expected offsets while %s \n", gNuConvTestName);
|
||||
log_err("Got : ");
|
||||
printSeqErr((const unsigned char*)junkout, targ-junkout);
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@
|
|||
*********************************************************************************
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "cstring.h"
|
||||
#include "unicode/uloc.h"
|
||||
#include "unicode/ucnv.h"
|
||||
|
|
@ -58,6 +55,10 @@ static void TestJitterbug255(void);
|
|||
static void TestJitterbug792(void);
|
||||
static void TestEBCDICUS4XML(void);
|
||||
static void TestJitterbug915(void);
|
||||
|
||||
void addTestNewConvert(TestNode** root);
|
||||
|
||||
|
||||
#define NEW_MAX_BUFFER 999
|
||||
|
||||
static int32_t gInBufferSize = NEW_MAX_BUFFER;
|
||||
|
|
@ -2153,7 +2154,7 @@ static int TestJitterbug930(const char* enc){
|
|||
/* writes 42 43 7A into output buffer,
|
||||
* offsets contains -1 -1 -1
|
||||
*/
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -2956,7 +2957,7 @@ TestJIS(){
|
|||
|
||||
static void TestJitterbug915(){
|
||||
/* tests for roundtripping of the below sequence
|
||||
\x1b$)G\x0E#!#"###$#%#&#'#(#)#*#+ / *plane 1 * /
|
||||
\x1b$)G\x0E#!#"###$#%#&#'#(#)#*#+ / *plane 1 * /
|
||||
\x1b$*H\x1bN"!\x1bN""\x1bN"#\x1bN"$\x1bN"% / *plane 2 * /
|
||||
\x1b$+I\x1bO"D\x1bO"E\x1bO"F\x1bO"G\x1bO"H / *plane 3 * /
|
||||
\x1b$+J\x1bO!D\x1bO!E\x1bO"j\x1bO"k\x1bO"l / *plane 4 * /
|
||||
|
|
@ -2964,72 +2965,71 @@ static void TestJitterbug915(){
|
|||
\x1b$+L\x1bO!#\x1bO",\x1bO#N\x1bO!n\x1bO#q / *plane 6 * /
|
||||
\x1b$+M\x1bO"q\x1bO!N\x1bO!j\x1bO#:\x1bO#o / *plane 7 * /
|
||||
*/
|
||||
static char cSource[]={
|
||||
0x1B, 0x24, 0x29, 0x47, 0x0E, 0x23, 0x21, 0x23, 0x22, 0x23,
|
||||
0x23, 0x23, 0x24, 0x23, 0x25, 0x23, 0x26, 0x23, 0x27, 0x23,
|
||||
0x28, 0x23, 0x29, 0x23, 0x2A, 0x23, 0x2B, 0x0F, 0x2F, 0x2A,
|
||||
0x70, 0x6C, 0x61, 0x6E, 0x65, 0x20, 0x31, 0x20, 0x2A, 0x2F,
|
||||
0x0D, 0x0A, 0x1B, 0x24, 0x2A, 0x48, 0x1B, 0x4E, 0x22, 0x21,
|
||||
0x1B, 0x4E, 0x22, 0x22, 0x1B, 0x4E, 0x22, 0x23, 0x1B, 0x4E,
|
||||
0x22, 0x24, 0x1B, 0x4E, 0x22, 0x25, 0x0F, 0x2F, 0x2A, 0x70,
|
||||
0x6C, 0x61, 0x6E, 0x65, 0x32, 0x2A, 0x2F, 0x20, 0x0D, 0x0A,
|
||||
0x1B, 0x24, 0x2B, 0x49, 0x1B, 0x4F, 0x22, 0x44, 0x1B, 0x4F,
|
||||
0x22, 0x45, 0x1B, 0x4F, 0x22, 0x46, 0x1B, 0x4F, 0x22, 0x47,
|
||||
0x1B, 0x4F, 0x22, 0x48, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61,
|
||||
0x6E, 0x65, 0x20, 0x33, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B,
|
||||
0x24, 0x2B, 0x4A, 0x1B, 0x4F, 0x21, 0x44, 0x1B, 0x4F, 0x21,
|
||||
0x45, 0x1B, 0x4F, 0x22, 0x6A, 0x1B, 0x4F, 0x22, 0x6B, 0x1B,
|
||||
0x4F, 0x22, 0x6C, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E,
|
||||
0x65, 0x20, 0x34, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24,
|
||||
0x2B, 0x4B, 0x1B, 0x4F, 0x21, 0x74, 0x1B, 0x4F, 0x22, 0x50,
|
||||
0x1B, 0x4F, 0x22, 0x51, 0x1B, 0x4F, 0x23, 0x37, 0x1B, 0x4F,
|
||||
0x22, 0x5C, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E,
|
||||
0x65, 0x20, 0x35, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24,
|
||||
0x2B, 0x4C, 0x1B, 0x4F, 0x21, 0x23, 0x1B, 0x4F, 0x22, 0x2C,
|
||||
0x1B, 0x4F, 0x23, 0x4E, 0x1B, 0x4F, 0x21, 0x6E, 0x1B, 0x4F,
|
||||
0x23, 0x71, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E, 0x65,
|
||||
0x20, 0x36, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24, 0x2B,
|
||||
0x4D, 0x1B, 0x4F, 0x22, 0x71, 0x1B, 0x4F, 0x21, 0x4E, 0x1B,
|
||||
0x4F, 0x21, 0x6A, 0x1B, 0x4F, 0x23, 0x3A, 0x1B, 0x4F, 0x23,
|
||||
0x6F, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E, 0x65, 0x20,
|
||||
0x37, 0x20, 0x2A, 0x2F,
|
||||
};
|
||||
UChar uTarget[500]={'\0'};
|
||||
UChar* utarget=uTarget;
|
||||
UChar* utargetLimit=uTarget+sizeof(uTarget)/2;
|
||||
static char cSource[]={
|
||||
0x1B, 0x24, 0x29, 0x47, 0x0E, 0x23, 0x21, 0x23, 0x22, 0x23,
|
||||
0x23, 0x23, 0x24, 0x23, 0x25, 0x23, 0x26, 0x23, 0x27, 0x23,
|
||||
0x28, 0x23, 0x29, 0x23, 0x2A, 0x23, 0x2B, 0x0F, 0x2F, 0x2A,
|
||||
0x70, 0x6C, 0x61, 0x6E, 0x65, 0x20, 0x31, 0x20, 0x2A, 0x2F,
|
||||
0x0D, 0x0A, 0x1B, 0x24, 0x2A, 0x48, 0x1B, 0x4E, 0x22, 0x21,
|
||||
0x1B, 0x4E, 0x22, 0x22, 0x1B, 0x4E, 0x22, 0x23, 0x1B, 0x4E,
|
||||
0x22, 0x24, 0x1B, 0x4E, 0x22, 0x25, 0x0F, 0x2F, 0x2A, 0x70,
|
||||
0x6C, 0x61, 0x6E, 0x65, 0x32, 0x2A, 0x2F, 0x20, 0x0D, 0x0A,
|
||||
0x1B, 0x24, 0x2B, 0x49, 0x1B, 0x4F, 0x22, 0x44, 0x1B, 0x4F,
|
||||
0x22, 0x45, 0x1B, 0x4F, 0x22, 0x46, 0x1B, 0x4F, 0x22, 0x47,
|
||||
0x1B, 0x4F, 0x22, 0x48, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61,
|
||||
0x6E, 0x65, 0x20, 0x33, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B,
|
||||
0x24, 0x2B, 0x4A, 0x1B, 0x4F, 0x21, 0x44, 0x1B, 0x4F, 0x21,
|
||||
0x45, 0x1B, 0x4F, 0x22, 0x6A, 0x1B, 0x4F, 0x22, 0x6B, 0x1B,
|
||||
0x4F, 0x22, 0x6C, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E,
|
||||
0x65, 0x20, 0x34, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24,
|
||||
0x2B, 0x4B, 0x1B, 0x4F, 0x21, 0x74, 0x1B, 0x4F, 0x22, 0x50,
|
||||
0x1B, 0x4F, 0x22, 0x51, 0x1B, 0x4F, 0x23, 0x37, 0x1B, 0x4F,
|
||||
0x22, 0x5C, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E,
|
||||
0x65, 0x20, 0x35, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24,
|
||||
0x2B, 0x4C, 0x1B, 0x4F, 0x21, 0x23, 0x1B, 0x4F, 0x22, 0x2C,
|
||||
0x1B, 0x4F, 0x23, 0x4E, 0x1B, 0x4F, 0x21, 0x6E, 0x1B, 0x4F,
|
||||
0x23, 0x71, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E, 0x65,
|
||||
0x20, 0x36, 0x20, 0x2A, 0x2F, 0x0D, 0x0A, 0x1B, 0x24, 0x2B,
|
||||
0x4D, 0x1B, 0x4F, 0x22, 0x71, 0x1B, 0x4F, 0x21, 0x4E, 0x1B,
|
||||
0x4F, 0x21, 0x6A, 0x1B, 0x4F, 0x23, 0x3A, 0x1B, 0x4F, 0x23,
|
||||
0x6F, 0x0F, 0x2F, 0x2A, 0x70, 0x6C, 0x61, 0x6E, 0x65, 0x20,
|
||||
0x37, 0x20, 0x2A, 0x2F,
|
||||
};
|
||||
UChar uTarget[500]={'\0'};
|
||||
UChar* utarget=uTarget;
|
||||
UChar* utargetLimit=uTarget+sizeof(uTarget)/2;
|
||||
|
||||
char cTarget[500]={'\0'};
|
||||
char* ctarget=cTarget;
|
||||
char* ctargetLimit=cTarget+sizeof(cTarget);
|
||||
const char* csource=cSource;
|
||||
char* tempSrc = cSource;
|
||||
UErrorCode err=U_ZERO_ERROR;
|
||||
|
||||
UConverter* conv =ucnv_open("ISO_2022_CN_EXT",&err);
|
||||
if(U_FAILURE(err)) {
|
||||
char cTarget[500]={'\0'};
|
||||
char* ctarget=cTarget;
|
||||
char* ctargetLimit=cTarget+sizeof(cTarget);
|
||||
const char* csource=cSource;
|
||||
char* tempSrc = cSource;
|
||||
UErrorCode err=U_ZERO_ERROR;
|
||||
|
||||
UConverter* conv =ucnv_open("ISO_2022_CN_EXT",&err);
|
||||
if(U_FAILURE(err)) {
|
||||
log_err("Unable to open a iso-2022 converter: %s\n", u_errorName(err));
|
||||
return;
|
||||
}
|
||||
ucnv_toUnicode(conv,&utarget,utargetLimit,&csource,csource+sizeof(cSource),NULL,TRUE,&err);
|
||||
if(U_FAILURE(err)) {
|
||||
ucnv_toUnicode(conv,&utarget,utargetLimit,&csource,csource+sizeof(cSource),NULL,TRUE,&err);
|
||||
if(U_FAILURE(err)) {
|
||||
log_err("iso-2022-CN to Unicode conversion failed: %s\n", u_errorName(err));
|
||||
return;
|
||||
}
|
||||
utargetLimit=utarget;
|
||||
utarget = uTarget;
|
||||
ucnv_fromUnicode(conv,&ctarget,ctargetLimit,(const UChar**)&utarget,utargetLimit,NULL,TRUE,&err);
|
||||
if(U_FAILURE(err)) {
|
||||
utargetLimit=utarget;
|
||||
utarget = uTarget;
|
||||
ucnv_fromUnicode(conv,&ctarget,ctargetLimit,(const UChar**)&utarget,utargetLimit,NULL,TRUE,&err);
|
||||
if(U_FAILURE(err)) {
|
||||
log_err("iso-2022-CN from Unicode conversion failed: %s\n", u_errorName(err));
|
||||
return;
|
||||
}
|
||||
ctargetLimit=ctarget;
|
||||
ctarget =cTarget;
|
||||
while(ctarget<ctargetLimit){
|
||||
if(*(ctarget++) != *(tempSrc++)){
|
||||
ctargetLimit=ctarget;
|
||||
ctarget =cTarget;
|
||||
while(ctarget<ctargetLimit){
|
||||
if(*(ctarget++) != *(tempSrc++)){
|
||||
log_err("Expected : \\x%02X \t Got: \\x%02X\n",*ctarget,(int)*tempSrc) ;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -3138,13 +3138,13 @@ static void
|
|||
TestISO_2022_CN() {
|
||||
/* test input */
|
||||
static const uint16_t in[]={
|
||||
/* jitterbug 951 */
|
||||
0xFF2D, 0xFF49, 0xFF58, 0xFF45, 0xFF44, 0x0020, 0xFF43, 0xFF48, 0xFF41, 0xFF52,
|
||||
0x0020, 0xFF06, 0x0020, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
|
||||
0xFF18, 0xFF19, 0xFF10, 0x0020, 0xFF4E, 0xFF55, 0xFF4D, 0xFF42, 0xFF45, 0xFF52,
|
||||
0x0020, 0xFF54, 0xFF45, 0xFF53, 0xFF54, 0x0020, 0xFF4C, 0xFF49, 0xFF4E, 0xFF45,
|
||||
0x0020, 0x0045, 0x004e, 0x0044,
|
||||
/**/
|
||||
/* jitterbug 951 */
|
||||
0xFF2D, 0xFF49, 0xFF58, 0xFF45, 0xFF44, 0x0020, 0xFF43, 0xFF48, 0xFF41, 0xFF52,
|
||||
0x0020, 0xFF06, 0x0020, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
|
||||
0xFF18, 0xFF19, 0xFF10, 0x0020, 0xFF4E, 0xFF55, 0xFF4D, 0xFF42, 0xFF45, 0xFF52,
|
||||
0x0020, 0xFF54, 0xFF45, 0xFF53, 0xFF54, 0x0020, 0xFF4C, 0xFF49, 0xFF4E, 0xFF45,
|
||||
0x0020, 0x0045, 0x004e, 0x0044,
|
||||
/**/
|
||||
0x4E00, 0x4E00, 0x4E01, 0x4E03, 0x60F6, 0x60F7, 0x60F8, 0x60FB, 0x000D, 0x000A,
|
||||
0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x60FB, 0x60FC, 0x000D, 0x000A,
|
||||
0x4E07, 0x4E08, 0x4E08, 0x4E09, 0x4E0A, 0x4E0B, 0x0042, 0x0043, 0x000D, 0x000A,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue