Bug 443672 - Fix a few nits in nsStringBundle.cpp, r=smontagu

This commit is contained in:
Serge Gautherie 2008-07-09 22:21:24 +02:00
parent b0ead79f2e
commit f2f8c90d1b

View File

@ -469,12 +469,8 @@ nsExtensibleStringBundle::~nsExtensibleStringBundle()
nsresult nsExtensibleStringBundle::GetStringFromID(PRInt32 aID, PRUnichar ** aResult)
{
nsresult rv;
PRUint32 size, i;
size = mBundles.Count();
for (i = 0; i < size; i++) {
const PRUint32 size = mBundles.Count();
for (PRUint32 i = 0; i < size; ++i) {
nsIStringBundle *bundle = mBundles[i];
if (bundle) {
rv = bundle->GetStringFromID(aID, aResult);
@ -489,16 +485,13 @@ nsresult nsExtensibleStringBundle::GetStringFromID(PRInt32 aID, PRUnichar ** aRe
nsresult nsExtensibleStringBundle::GetStringFromName(const PRUnichar *aName,
PRUnichar ** aResult)
{
nsresult res = NS_OK;
PRUint32 size, i;
size = mBundles.Count();
for (i = 0; i < size; i++) {
nsresult rv;
const PRUint32 size = mBundles.Count();
for (PRUint32 i = 0; i < size; ++i) {
nsIStringBundle* bundle = mBundles[i];
if (bundle) {
res = bundle->GetStringFromName(aName, aResult);
if (NS_SUCCEEDED(res))
rv = bundle->GetStringFromName(aName, aResult);
if (NS_SUCCEEDED(rv))
return NS_OK;
}
}
@ -754,7 +747,7 @@ nsStringBundleService::CreateExtensibleBundle(const char* aCategory,
{
if (aResult == NULL) return NS_ERROR_NULL_POINTER;
nsresult res = NS_OK;
nsresult res;
nsExtensibleStringBundle * bundle = new nsExtensibleStringBundle();
if (!bundle) return NS_ERROR_OUT_OF_MEMORY;