From 191fbca633efad41f4ea4a6698154049cd923728 Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Thu, 3 Jun 1999 20:25:15 +0000 Subject: [PATCH] Replace NS_IS_ERROR() with NS_FAILED(): NS_IS_ERROR() is buggy and redundant. git-svn-id: svn://10.0.0.236/trunk@33569 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp | 4 ++-- mozilla/xpcom/reflect/xptinfo/src/nsInterfaceRecord.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp index b8c16721a23..875b874b4ed 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp @@ -362,7 +362,7 @@ nsInterfaceInfoManager::initInterfaceTables() #endif nsresult nsr = this->indexify_file(fullname); - if (NS_IS_ERROR(nsr)) { + if (NS_FAILED(nsr)) { char *warnstr = PR_smprintf("failed to process typelib file %s", fullname); NS_WARNING(warnstr); @@ -446,7 +446,7 @@ nsInterfaceInfoManager::GetNameForIID(const nsIID* iid, char** name) // Note that this might fail for same-name, different-iid interfaces! nsIID *newid; nsresult isok = GetIIDForName(record->name, &newid); - PR_ASSERT(!(NS_IS_ERROR(isok))); + PR_ASSERT(!(NS_FAILED(isok))); PR_ASSERT(newid->Equals(*newid)); #endif PR_ASSERT(record->name != NULL); diff --git a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceRecord.cpp b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceRecord.cpp index 8f3acfc028b..948704acc54 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceRecord.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/nsInterfaceRecord.cpp @@ -48,7 +48,7 @@ nsInterfaceRecord::GetInfo(nsInterfaceInfo **result) nsInterfaceRecord *parent_record = this->typelibRecord->interfaceRecords[parent_index - 1]; nsresult nsr = parent_record->GetInfo((nsInterfaceInfo **)&parent); - if (NS_IS_ERROR(nsr)) { + if (NS_FAILED(nsr)) { *result = NULL; return nsr; // ? ... or NS_ERROR_FAILURE }