From 40b96f684e8a8ea0ed46423357d888d3c9bb25fe Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Sat, 4 Dec 1999 07:41:07 +0000 Subject: [PATCH] Remove NS_ENSURE macros from my little empire. r=caesar git-svn-id: svn://10.0.0.236/trunk@55278 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/content/src/nsXULElement.cpp | 5 +++-- mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp | 6 ++++-- mozilla/rdf/content/src/nsRDFGenericBuilder.cpp | 6 ++++-- mozilla/rdf/content/src/nsXULElement.cpp | 5 +++-- mozilla/rdf/content/src/nsXULTemplateBuilder.cpp | 6 ++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index 65dcfe237e0..1243e1f0f79 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength, nsCOMPtr global; aDocument->GetScriptGlobalObject(getter_AddRefs(global)); - - NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED); + NS_ASSERTION(global != nsnull, "no script global object"); + if (! global) + return NS_ERROR_UNEXPECTED; nsCOMPtr context; rv = global->GetContext(getter_AddRefs(context)); diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp index fe50b7ed694..5ebfa19e3cf 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns nsCOMPtr global; doc->GetScriptGlobalObject(getter_AddRefs(global)); - NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED); + if (! global) + return NS_ERROR_UNEXPECTED; nsCOMPtr context; global->GetContext(getter_AddRefs(context)); - NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED); + if (! context) + return NS_ERROR_UNEXPECTED; JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext()); NS_ASSERTION(context != nsnull, "no jscontext"); diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp index fe50b7ed694..5ebfa19e3cf 100644 --- a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp +++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp @@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns nsCOMPtr global; doc->GetScriptGlobalObject(getter_AddRefs(global)); - NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED); + if (! global) + return NS_ERROR_UNEXPECTED; nsCOMPtr context; global->GetContext(getter_AddRefs(context)); - NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED); + if (! context) + return NS_ERROR_UNEXPECTED; JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext()); NS_ASSERTION(context != nsnull, "no jscontext"); diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp index 65dcfe237e0..1243e1f0f79 100644 --- a/mozilla/rdf/content/src/nsXULElement.cpp +++ b/mozilla/rdf/content/src/nsXULElement.cpp @@ -3673,8 +3673,9 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText, PRInt32 aTextLength, nsCOMPtr global; aDocument->GetScriptGlobalObject(getter_AddRefs(global)); - - NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED); + NS_ASSERTION(global != nsnull, "no script global object"); + if (! global) + return NS_ERROR_UNEXPECTED; nsCOMPtr context; rv = global->GetContext(getter_AddRefs(context)); diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp index fe50b7ed694..5ebfa19e3cf 100644 --- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp +++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp @@ -2958,11 +2958,13 @@ RDFGenericBuilderImpl::AddDatabasePropertyToHTMLElement(nsIContent* aElement, ns nsCOMPtr global; doc->GetScriptGlobalObject(getter_AddRefs(global)); - NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED); + if (! global) + return NS_ERROR_UNEXPECTED; nsCOMPtr context; global->GetContext(getter_AddRefs(context)); - NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED); + if (! context) + return NS_ERROR_UNEXPECTED; JSContext* jscontext = NS_STATIC_CAST(JSContext*, context->GetNativeContext()); NS_ASSERTION(context != nsnull, "no jscontext");