organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 23:10:40 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-829 Modified u_strtok_r test to not crash on Linux and removed a memory leak.

Browse source 
X-SVN-Rev: 3511
This commit is contained in:
George Rhoten 2001-01-31 22:20:38 +00:00
parent cf1564b6f8
commit 784c953388
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
icu4c/source/test/cintltst/cucdtst.c
View file

@ -694,7 +694,7 @@ static void TestStringFunctions()
{
for(j=0;j<4;++j)
{
log_verbose("Testing %s \n", austrdup(dataTable[i][j]));
log_verbose("Testing %s \n", u_austrcpy(tempOut, dataTable[i][j]));
u_uastrcpy(temp, "");
u_strcpy(temp,dataTable[i][j]);
@ -773,12 +773,12 @@ static void TestStringFunctions()
log_verbose("Testing u_strtok_r()");
{
const char *string = " , 1 2 3 AHHHHH! 5.5 6 7 , 8\n";
const char string[] = " , 1 2 3 AHHHHH! 5.5 6 7 , 8\n";
const char *tokens[] = {",", "1", "2", "3", "AHHHHH!", "5.5", "6", "7", "8\n"};
const char *delim1 = " ";
const char *delim2 = " ,";
UChar delimBuf[32];
UChar currTokenBuf[32];
UChar delimBuf[sizeof(string)];
UChar currTokenBuf[sizeof(string)];
UChar *state;
uint32_t currToken = 0;
UChar *ptr;
@ -798,12 +798,17 @@ static void TestStringFunctions()
}
if (currToken != sizeof(tokens)/sizeof(tokens[0])) {
log_err("Didn't get correct number of tokens!\n");
log_err("Didn't get correct number of tokens\n");
}
u_uastrcpy(currTokenBuf, "");
if (u_strtok_r(currTokenBuf, delimBuf, &state) != NULL) {
log_err("Didn't get NULL for empty string\n");
}
if (state != NULL) {
log_err("State should be NULL for empty string\n");
}
}
cleanUpDataTable();
/* test u_strcmpCodePointOrder() */
{
/* these strings are in ascending order */
@ -821,6 +826,8 @@ static void TestStringFunctions()
}
}
}
cleanUpDataTable();
}
static void TestStringSearching()