From 2cdcc5b19e1fa15bbaebeffb5fb92fecce6dc4d6 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Thu, 17 Jan 2002 22:12:28 +0000 Subject: [PATCH] Fixing bogus assertions caused by my checkins for bug 118933 and removing unnecessary double null check. trivial change, no reviews. git-svn-id: svn://10.0.0.236/trunk@112403 18797224-902f-48f8-a5cc-f745e15eee43 --- .../dom/src/base/nsScriptNameSpaceManager.cpp | 23 +++++++++---------- .../src/build/nsScriptNameSpaceManager.cpp | 23 +++++++++---------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp index b632ad51581..ed047e1e594 100644 --- a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp @@ -397,20 +397,19 @@ nsScriptNameSpaceManager::RegisterClassName(const char *aClassName, nsGlobalNameStruct *s = AddToHash(NS_ConvertASCIItoUCS2(aClassName)); NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - if (s) { - if (s->mType == nsGlobalNameStruct::eTypeClassConstructor) { - return NS_OK; - } - - // If a external constructor is already defined with aClassName we - // won't overwrite it. - - if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { - return NS_OK; - } + if (s->mType == nsGlobalNameStruct::eTypeClassConstructor) { + return NS_OK; } - NS_ASSERTION(!(s && s->mType != nsGlobalNameStruct::eTypeInterface), + // If a external constructor is already defined with aClassName we + // won't overwrite it. + + if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { + return NS_OK; + } + + NS_ASSERTION(!(s->mType != nsGlobalNameStruct::eTypeNotInitialized && + s->mType != nsGlobalNameStruct::eTypeInterface), "Whaaa, JS environment name clash!"); s->mType = nsGlobalNameStruct::eTypeClassConstructor; diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp index b632ad51581..ed047e1e594 100644 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp @@ -397,20 +397,19 @@ nsScriptNameSpaceManager::RegisterClassName(const char *aClassName, nsGlobalNameStruct *s = AddToHash(NS_ConvertASCIItoUCS2(aClassName)); NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - if (s) { - if (s->mType == nsGlobalNameStruct::eTypeClassConstructor) { - return NS_OK; - } - - // If a external constructor is already defined with aClassName we - // won't overwrite it. - - if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { - return NS_OK; - } + if (s->mType == nsGlobalNameStruct::eTypeClassConstructor) { + return NS_OK; } - NS_ASSERTION(!(s && s->mType != nsGlobalNameStruct::eTypeInterface), + // If a external constructor is already defined with aClassName we + // won't overwrite it. + + if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { + return NS_OK; + } + + NS_ASSERTION(!(s->mType != nsGlobalNameStruct::eTypeNotInitialized && + s->mType != nsGlobalNameStruct::eTypeInterface), "Whaaa, JS environment name clash!"); s->mType = nsGlobalNameStruct::eTypeClassConstructor;