AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-21249 Fix warnings about uninitialized variables in locid.cpp

Browse Source
This commit is contained in:
Jeff Genovy 2020-09-30 14:48:18 -07:00
parent 9b9db682e1
commit 6c9655060b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/common/locid.cpp
View File

@ -1252,11 +1252,11 @@ AliasReplacer::replaceLanguage(
continue;
}
const char* replacedLanguage;
const char* replacedScript;
const char* replacedRegion;
const char* replacedVariant;
const char* replacedExtensions;
const char* replacedLanguage = nullptr;
const char* replacedScript = nullptr;
const char* replacedRegion = nullptr;
const char* replacedVariant = nullptr;
const char* replacedExtensions = nullptr;
parseLanguageReplacement(replacement,
replacedLanguage,
replacedScript,
@ -1266,7 +1266,7 @@ AliasReplacer::replaceLanguage(
toBeFreed,
status);
replacedLanguage =
uprv_strcmp(replacedLanguage, "und") == 0 ?
(replacedLanguage != nullptr && uprv_strcmp(replacedLanguage, "und") == 0) ?
language : replacedLanguage;
replacedScript = deleteOrReplace(script, nullptr, replacedScript);
replacedRegion = deleteOrReplace(region, searchRegion, replacedRegion);