From d026a4b55091531c5eb985029f66f72489448fc5 Mon Sep 17 00:00:00 2001 From: shatty Date: Tue, 9 Nov 2004 03:49:40 +0000 Subject: [PATCH] search all standard names before looking at aliases git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9878 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/textencoding/CharacterSetRoster.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kits/textencoding/CharacterSetRoster.cpp b/src/kits/textencoding/CharacterSetRoster.cpp index 7ce1475cf5..346c2dbc31 100644 --- a/src/kits/textencoding/CharacterSetRoster.cpp +++ b/src/kits/textencoding/CharacterSetRoster.cpp @@ -92,6 +92,7 @@ BCharacterSetRoster::FindCharacterSetByPrintName(char * name) const BCharacterSet * BCharacterSetRoster::FindCharacterSetByName(char * name) { + // first search standard names and mime names for (int id = 0 ; (id < character_sets_by_id_count) ; id++) { if (strcmp(character_sets_by_id[id]->GetName(),name) == 0) { return character_sets_by_id[id]; @@ -100,6 +101,9 @@ BCharacterSetRoster::FindCharacterSetByName(char * name) if ((mime != NULL) && (strcmp(mime,name) == 0)) { 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++) { if (strcmp(character_sets_by_id[id]->AliasAt(alias),name) == 0) { return character_sets_by_id[id];