From e262e13b477e12bc6fc8ebdf5bf2e5110810ff14 Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Sun, 9 Nov 2003 05:45:21 +0000 Subject: [PATCH] bug 225106 : remove redundant charset alias resoultion code (r=smontagu, sr=bz) git-svn-id: svn://10.0.0.236/trunk@149058 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/src/nsCharsetConverterManager.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp index e0105a3cd81..24f08e7ceba 100644 --- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp @@ -431,7 +431,9 @@ nsCharsetConverterManager::GetCharsetLangGroup(const char * aCharset, { // resolve the charset first nsCAutoString charset; - GetCharsetAlias(aCharset, charset); + + nsresult rv = GetCharsetAlias(aCharset, charset); + if (NS_FAILED(rv)) return rv; // fully qualify to possibly avoid vtable call return nsCharsetConverterManager::GetCharsetLangGroupRaw(charset.get(), @@ -452,13 +454,8 @@ nsCharsetConverterManager::GetCharsetLangGroupRaw(const char * aCharset, if (NS_FAILED(res)) return res; } - nsCAutoString alias; - res = GetCharsetAlias(aCharset, alias); - - if (NS_FAILED(res)) return res; - nsAutoString langGroup; - res = GetBundleValue(mDataBundle, alias.get(), NS_LITERAL_STRING(".LangGroup"), langGroup); + res = GetBundleValue(mDataBundle, aCharset, NS_LITERAL_STRING(".LangGroup"), langGroup); *aResult = NS_NewAtom(langGroup); return res;