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
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user