ICU-535 Fixed some compiler warnings.
X-SVN-Rev: 4265
This commit is contained in:
parent
9a188e4b0b
commit
88ed16533f
@ -43,6 +43,24 @@
|
||||
|
||||
static UCollator *myCollation;
|
||||
|
||||
/* perform test with strength PRIMARY */
|
||||
static void TestPrimary(void);
|
||||
|
||||
/* perform test with strength SECONDARY */
|
||||
static void TestSecondary(void);
|
||||
|
||||
/* perform test with strength tertiary */
|
||||
static void TestTertiary(void);
|
||||
|
||||
/*perform tests with strength Identical */
|
||||
static void TestIdentical(void);
|
||||
|
||||
/* perform extra tests */
|
||||
static void TestExtra(void);
|
||||
|
||||
/* Test jitterbug 581 */
|
||||
static void TestJB581(void);
|
||||
|
||||
#endif
|
||||
|
||||
static const UChar DEFAULTRULEARRAY[] =
|
||||
|
@ -30,23 +30,6 @@
|
||||
/* tests comparison of custom collation with different strengths */
|
||||
void doTest(UCollator*, const UChar* source, const UChar* target, UCollationResult result);
|
||||
|
||||
/* perform test with strength PRIMARY */
|
||||
static void TestPrimary(void);
|
||||
|
||||
/* perform test with strength SECONDARY */
|
||||
static void TestSecondary(void);
|
||||
|
||||
/* perform test with strength tertiary */
|
||||
static void TestTertiary(void);
|
||||
|
||||
/*perform tests with strength Identical */
|
||||
static void TestIdentical(void);
|
||||
|
||||
/* perform extra tests */
|
||||
static void TestExtra(void);
|
||||
|
||||
/* Test jitterbug 581 */
|
||||
static void TestJB581(void);
|
||||
|
||||
|
||||
|
||||
|
@ -119,37 +119,6 @@ const static int32_t results[TESTLOCALES][TOTALTESTSET] = {
|
||||
{ 19, 22, 21, 24, 23, 25, 12, 13, 9, 0, 17, 16, 28, 26, 27, 15, 18, 14, 1, 11, 2, 3, 4, 5, 20, 6, 8, 10, 7, 29 }
|
||||
};
|
||||
|
||||
static UChar*
|
||||
my_strncpy(UChar *dst,
|
||||
const UChar *src,
|
||||
int32_t n)
|
||||
{
|
||||
UChar *anchor = dst; /* save the start of result string */
|
||||
|
||||
if (!n) return dst;
|
||||
while(n--)
|
||||
*dst++ = *src++;
|
||||
*dst = 0x0000;
|
||||
return anchor;
|
||||
}
|
||||
|
||||
static UChar*
|
||||
my_strcat(UChar *dst,
|
||||
const UChar *src,
|
||||
int32_t n)
|
||||
{
|
||||
UChar *anchor = dst; /* save a pointer to start of dst */
|
||||
|
||||
if (!n) return dst;
|
||||
|
||||
dst += n;
|
||||
while (*src != 0x0000)
|
||||
*dst++ = *src++;
|
||||
*dst = 0x0000;
|
||||
|
||||
return anchor;
|
||||
}
|
||||
|
||||
void addRuleBasedCollTest(TestNode** root)
|
||||
{
|
||||
addTest(root, &TestG7Locales, "tscoll/cg7coll/TestG7Locales");
|
||||
|
@ -1,4 +1,3 @@
|
||||
/*
|
||||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2001, International Business Machines Corporation and
|
||||
|
@ -1,5 +1,3 @@
|
||||
/*
|
||||
|
||||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2001, International Business Machines Corporation and
|
||||
|
@ -1,5 +1,3 @@
|
||||
/*
|
||||
|
||||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2001, International Business Machines Corporation and
|
||||
|
Loading…
Reference in New Issue
Block a user