i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

search all standard names before looking at aliases

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9878 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-11-09 03:49:40 +00:00
parent f3479d994e
commit d026a4b550
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/textencoding/CharacterSetRoster.cpp
+4
View File
@@ -92,6 +92,7 @@ BCharacterSetRoster::FindCharacterSetByPrintName(char * name)
const BCharacterSet * const BCharacterSet *
BCharacterSetRoster::FindCharacterSetByName(char * name) BCharacterSetRoster::FindCharacterSetByName(char * name)
{ {
// first search standard names and mime names
for (int id = 0 ; (id < character_sets_by_id_count) ; id++) { for (int id = 0 ; (id < character_sets_by_id_count) ; id++) {
if (strcmp(character_sets_by_id[id]->GetName(),name) == 0) { if (strcmp(character_sets_by_id[id]->GetName(),name) == 0) {
return character_sets_by_id[id]; return character_sets_by_id[id];
@@ -100,6 +101,9 @@ BCharacterSetRoster::FindCharacterSetByName(char * name)
if ((mime != NULL) && (strcmp(mime,name) == 0)) { if ((mime != NULL) && (strcmp(mime,name) == 0)) {
return character_sets_by_id[id]; return character_sets_by_id[id];
} }
}
// only after searching all the above names do we look at aliases
for (int id = 0 ; (id < character_sets_by_id_count) ; id++) {
for (int alias = 0 ; (alias < character_sets_by_id[id]->CountAliases()) ; alias++) { for (int alias = 0 ; (alias < character_sets_by_id[id]->CountAliases()) ; alias++) {
if (strcmp(character_sets_by_id[id]->AliasAt(alias),name) == 0) { if (strcmp(character_sets_by_id[id]->AliasAt(alias),name) == 0) {
return character_sets_by_id[id]; return character_sets_by_id[id];