organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-18 19:25:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-535 fixed some compiler warnings

Browse source 
X-SVN-Rev: 2353
This commit is contained in:
George Rhoten 2000-08-24 21:40:26 +00:00
parent 0608161b19
commit 5a4b13aa48
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
icu4c/source/i18n/unicode/rbt.h
View file

@ -274,7 +274,7 @@ public:
* or direction is invalid.
* @draft
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UnicodeFilter* adoptedFilter,
@ -288,7 +288,7 @@ public:
* @exception IllegalArgumentException if rules are malformed
* or direction is invalid.
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UnicodeFilter* adoptedFilter,
@ -298,7 +298,7 @@ public:
* Covenience constructor with no filter.
* @draft
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UErrorCode& status);
@ -307,7 +307,7 @@ public:
* Covenience constructor with no filter and FORWARD direction.
* @draft
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const UnicodeString& rules,
UErrorCode& status);
@ -315,7 +315,7 @@ public:
* Covenience constructor with FORWARD direction.
* @draft
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const UnicodeString& rules,
UnicodeFilter* adoptedFilter,
UErrorCode& status);
@ -324,7 +324,7 @@ public:
* Covenience constructor.
* @draft
*/
RuleBasedTransliterator(const UnicodeString& ID,
RuleBasedTransliterator(const UnicodeString& id,
const TransliterationRuleData* theData,
UnicodeFilter* adoptedFilter = 0);
@ -392,13 +392,13 @@ private:
* or direction is invalid.
*/
inline RuleBasedTransliterator::RuleBasedTransliterator(
const UnicodeString& ID,
const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UnicodeFilter* adoptedFilter,
UParseError& parseError,
UErrorCode& status) :
Transliterator(ID, adoptedFilter) {
Transliterator(id, adoptedFilter) {
_construct(rules, direction, status, &parseError);
}
@ -410,12 +410,12 @@ inline RuleBasedTransliterator::RuleBasedTransliterator(
* or direction is invalid.
*/
inline RuleBasedTransliterator::RuleBasedTransliterator(
const UnicodeString& ID,
const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UnicodeFilter* adoptedFilter,
UErrorCode& status) :
Transliterator(ID, adoptedFilter) {
Transliterator(id, adoptedFilter) {
_construct(rules, direction, status);
}
@ -423,11 +423,11 @@ inline RuleBasedTransliterator::RuleBasedTransliterator(
* Covenience constructor with no filter.
*/
inline RuleBasedTransliterator::RuleBasedTransliterator(
const UnicodeString& ID,
const UnicodeString& id,
const UnicodeString& rules,
UTransDirection direction,
UErrorCode& status) :
Transliterator(ID, 0) {
Transliterator(id, 0) {
_construct(rules, direction, status);
}
@ -435,10 +435,10 @@ inline RuleBasedTransliterator::RuleBasedTransliterator(
* Covenience constructor with no filter and FORWARD direction.
*/
inline RuleBasedTransliterator::RuleBasedTransliterator(
const UnicodeString& ID,
const UnicodeString& id,
const UnicodeString& rules,
UErrorCode& status) :
Transliterator(ID, 0) {
Transliterator(id, 0) {
_construct(rules, UTRANS_FORWARD, status);
}
@ -446,11 +446,11 @@ inline RuleBasedTransliterator::RuleBasedTransliterator(
* Covenience constructor with FORWARD direction.
*/
inline RuleBasedTransliterator::RuleBasedTransliterator(
const UnicodeString& ID,
const UnicodeString& id,
const UnicodeString& rules,
UnicodeFilter* adoptedFilter,
UErrorCode& status) :
Transliterator(ID, adoptedFilter) {
Transliterator(id, adoptedFilter) {
_construct(rules, UTRANS_FORWARD, status);
}

39
icu4c/source/test/cintltst/ncnvtst.c
View file

@ -669,6 +669,19 @@ UBool convertFromU( const UChar *source, int sourceLen, const uint8_t *expect,
printSeqErr((const unsigned char*)expect, expectLen);
return FALSE;
}
if(memcmp(buffer, expect, expectLen)){
log_err("String does not match. FROM Unicode to codePage%s\n", codepage);
printf("\nGot:");
printSeqErr((const unsigned char *)buffer, expectLen);
printf("\nExpected:");
printSeqErr((const unsigned char *)expect, expectLen);
return FALSE;
}
else {
log_verbose("Matches!\n");
}
if (expectOffsets != 0){
log_verbose("comparing %d offsets..\n", targ-buffer);
if(memcmp(offsetBuffer,expectOffsets,(targ-buffer) * sizeof(int32_t) )){
@ -683,19 +696,6 @@ UBool convertFromU( const UChar *source, int sourceLen, const uint8_t *expect,
}
}
if(!memcmp(buffer, expect, expectLen)){
log_verbose("Matches!\n");
return TRUE;
}
else {
log_err("String does not match. FROM Unicode to codePage%s\n", codepage);
printf("\nGot:");
printSeqErr((const unsigned char *)buffer, expectLen);
printf("\nExpected:");
printSeqErr((const unsigned char *)expect, expectLen);
return FALSE;
}
return TRUE;
}
@ -762,8 +762,7 @@ UBool convertToU( const uint8_t *source, int sourceLen, const UChar *expect, int
log_verbose("comparing %d uchars (%d bytes)..\n",expectLen,expectLen*2);
if (expectOffsets != 0)
{
if (expectOffsets != 0) {
if(memcmp(offsetBuffer, expectOffsets, (targ-buffer) * sizeof(int32_t))){
log_err("did not get the expected offsets from %s To UNICODE\n", codepage);
@ -782,11 +781,7 @@ UBool convertToU( const uint8_t *source, int sourceLen, const UChar *expect, int
puts("\n");
}
}
if(!memcmp(buffer, expect, expectLen*2)){
log_verbose("Matches!\n");
return TRUE;
}
else {
if(memcmp(buffer, expect, expectLen*2)){
log_err("String does not match. from codePage %s TO Unicode\n", codepage);
printf("\nGot:");
printUSeqErr(buffer, expectLen);
@ -794,7 +789,11 @@ UBool convertToU( const uint8_t *source, int sourceLen, const UChar *expect, int
printUSeqErr(expect, expectLen);
return FALSE;
}
else {
log_verbose("Matches!\n");
}
return TRUE;
}