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

ICU-3905 Fix some compiler warnings

Browse source 
X-SVN-Rev: 16765
This commit is contained in:
George Rhoten 2004-11-05 05:12:29 +00:00
parent 84578841ec
commit b99285414f
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
icu4c/source/i18n/rbnf.cpp
View file

@ -513,16 +513,22 @@ LocDataParser::nextString() {
}
void
LocDataParser::parseError(const char* str) {
LocDataParser::parseError(const char* /*str*/) {
if (!data) {
return;
}
const UChar* start = p - U_PARSE_CONTEXT_LEN - 1;
if (start < data) start = data;
for (UChar* x = p; --x >= start;) if (!*x) { start = x+1; break; }
if (start < data)
start = data;
for (UChar* x = p; --x >= start;)
if (!*x) {
start = x+1;
break;
}
const UChar* limit = p + U_PARSE_CONTEXT_LEN - 1;
if (limit > e) limit = e;
if (limit > e)
limit = e;
u_strncpy(pe.preContext, start, p-start);
pe.preContext[p-start] = 0;
u_strncpy(pe.postContext, p, limit-p);

4
icu4c/source/i18n/translit.cpp
View file

@ -965,7 +965,7 @@ Transliterator* Transliterator::createBasicInstance(const UnicodeString& id,
umtx_init(&registryMutex);
umtx_lock(&registryMutex);
if (HAVE_REGISTRY) {
t = registry->get(id, alias, pe, ec);
t = registry->get(id, alias, ec);
}
umtx_unlock(&registryMutex);
@ -997,7 +997,7 @@ Transliterator* Transliterator::createBasicInstance(const UnicodeString& id,
// Step 2. reget
umtx_lock(&registryMutex);
if (HAVE_REGISTRY) {
t = registry->reget(id, parser, alias, pe, ec);
t = registry->reget(id, parser, alias, ec);
}
umtx_unlock(&registryMutex);

17
icu4c/source/i18n/transreg.cpp
View file

@ -482,18 +482,16 @@ TransliteratorRegistry::~TransliteratorRegistry() {
Transliterator* TransliteratorRegistry::get(const UnicodeString& ID,
TransliteratorAlias*& aliasReturn,
UParseError& parseError,
UErrorCode& status) {
U_ASSERT(aliasReturn == NULL);
Entry *entry = find(ID);
return (entry == 0) ? 0
: instantiateEntry(ID, entry, aliasReturn, parseError,status);
: instantiateEntry(ID, entry, aliasReturn, status);
}
Transliterator* TransliteratorRegistry::reget(const UnicodeString& ID,
TransliteratorParser& parser,
TransliteratorAlias*& aliasReturn,
UParseError& parseError,
UErrorCode& status) {
U_ASSERT(aliasReturn == NULL);
Entry *entry = find(ID);
@ -559,7 +557,7 @@ Transliterator* TransliteratorRegistry::reget(const UnicodeString& ID,
}
Transliterator *t =
instantiateEntry(ID, entry, aliasReturn, parseError,status);
instantiateEntry(ID, entry, aliasReturn, status);
return t;
}
@ -1145,7 +1143,6 @@ Entry* TransliteratorRegistry::find(UnicodeString& source,
Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID,
Entry *entry,
TransliteratorAlias* &aliasReturn,
UParseError& parseError,
UErrorCode& status) {
Transliterator *t = 0;
U_ASSERT(aliasReturn == 0);
@ -1177,7 +1174,7 @@ Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID
return t;
case Entry::COMPOUND_RBT:
{
UnicodeString id("_", "");
UnicodeString id((UChar)0x005F); /* "_" */
Transliterator *t = new RuleBasedTransliterator(id, entry->u.data);
if (t == 0) {
status = U_MEMORY_ALLOCATION_ERROR;
@ -1213,15 +1210,15 @@ Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID
UnicodeString rules = entry->stringArg;
//ures_close(bundle);
if (U_FAILURE(status)) {
//if (U_FAILURE(status)) {
// We have a failure of some kind. Remove the ID from the
// registry so we don't keep trying. NOTE: This will throw off
// anyone who is, at the moment, trying to iterate over the
// available IDs. That's acceptable since we should never
// really get here except under installation, configuration,
// or unrecoverable run time memory failures.
remove(ID);
} else {
// remove(ID);
//} else {
// If the status indicates a failure, then we don't have any
// rules -- there is probably an installation error. The list
@ -1234,7 +1231,7 @@ Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID
if (aliasReturn == 0) {
status = U_MEMORY_ALLOCATION_ERROR;
}
}
//}
}
return 0;
default:

3
icu4c/source/i18n/transreg.h
View file

@ -174,7 +174,6 @@ class TransliteratorRegistry : public UMemory {
*/
Transliterator* get(const UnicodeString& ID,
TransliteratorAlias*& aliasReturn,
UParseError& parseError,
UErrorCode& status);
/**
@ -195,7 +194,6 @@ class TransliteratorRegistry : public UMemory {
Transliterator* reget(const UnicodeString& ID,
TransliteratorParser& parser,
TransliteratorAlias*& aliasReturn,
UParseError& parseError,
UErrorCode& status);
/**
@ -402,7 +400,6 @@ class TransliteratorRegistry : public UMemory {
Transliterator* instantiateEntry(const UnicodeString& ID,
Entry *entry,
TransliteratorAlias*& aliasReturn,
UParseError& parseError,
UErrorCode& status);
/**