From c4b871aef6508a210e8572fe8ca6d2cbadf775ec Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 21 Sep 1999 02:09:46 +0000 Subject: [PATCH] Eliminate a warning git-svn-id: svn://10.0.0.236/trunk@48480 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsLocation.cpp | 1 - mozilla/dom/src/build/nsDOMFactory.cpp | 30 ++++++++++--------- .../dom/src/events/nsJSDOMEventListener.cpp | 1 - mozilla/htmlparser/src/nsDTDDebug.cpp | 6 ++-- mozilla/htmlparser/src/nsExpatTokenizer.cpp | 2 +- mozilla/parser/htmlparser/src/nsDTDDebug.cpp | 6 ++-- .../htmlparser/src/nsExpatTokenizer.cpp | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mozilla/dom/src/base/nsLocation.cpp b/mozilla/dom/src/base/nsLocation.cpp index 4954ff088a9..d000d21ffb0 100644 --- a/mozilla/dom/src/base/nsLocation.cpp +++ b/mozilla/dom/src/base/nsLocation.cpp @@ -793,7 +793,6 @@ NS_IMETHODIMP LocationImpl::Reload(JSContext *cx, jsval *argv, PRUint32 argc) { // XXX Security manager needs to be called - nsresult result = NS_OK; JSBool force = JS_FALSE; if (argc > 0) { diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp index de67dbb6d42..18b9f2eacc6 100644 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ b/mozilla/dom/src/build/nsDOMFactory.cpp @@ -743,18 +743,20 @@ void XXXDomNeverCalled(); void XXXDomNeverCalled() { nsJSContext* jcx = new nsJSContext(0); - NS_NewScriptGlobalObject(0); - NS_NewScriptNavigator(0, 0, 0, 0); - NS_NewScriptLocation(0, 0, 0, 0); - NS_NewScriptEventListener(0, 0, 0, 0); - NS_NewJSEventListener(0, 0, 0); - NS_NewScriptCSS2Properties(0, 0, 0, 0); - NS_NewScriptCSSStyleSheet(0, 0, 0, 0); - NS_NewScriptStyleSheetCollection(0, 0, 0, 0); - NS_NewScriptCSSStyleRule(0, 0, 0, 0); - NS_NewScriptCSSStyleRuleCollection(0, 0, 0, 0); - NS_NewScriptRange(0, 0, 0, 0); - NS_NewScriptSelection(0, 0, 0, 0); - NS_NewScriptSelectionListener(0, 0, 0, 0); - NS_InitDocumentClass(nsnull, nsnull); + if (jcx) { + NS_NewScriptGlobalObject(0); + NS_NewScriptNavigator(0, 0, 0, 0); + NS_NewScriptLocation(0, 0, 0, 0); + NS_NewScriptEventListener(0, 0, 0, 0); + NS_NewJSEventListener(0, 0, 0); + NS_NewScriptCSS2Properties(0, 0, 0, 0); + NS_NewScriptCSSStyleSheet(0, 0, 0, 0); + NS_NewScriptStyleSheetCollection(0, 0, 0, 0); + NS_NewScriptCSSStyleRule(0, 0, 0, 0); + NS_NewScriptCSSStyleRuleCollection(0, 0, 0, 0); + NS_NewScriptRange(0, 0, 0, 0); + NS_NewScriptSelection(0, 0, 0, 0); + NS_NewScriptSelectionListener(0, 0, 0, 0); + NS_InitDocumentClass(nsnull, nsnull); + } } diff --git a/mozilla/dom/src/events/nsJSDOMEventListener.cpp b/mozilla/dom/src/events/nsJSDOMEventListener.cpp index 63e5bf0c773..b25d3133ad9 100644 --- a/mozilla/dom/src/events/nsJSDOMEventListener.cpp +++ b/mozilla/dom/src/events/nsJSDOMEventListener.cpp @@ -68,7 +68,6 @@ NS_IMPL_RELEASE(nsJSDOMEventListener) nsresult nsJSDOMEventListener::HandleEvent(nsIDOMEvent* aEvent) { - jsval result; jsval argv[1]; JSObject *eventObj; diff --git a/mozilla/htmlparser/src/nsDTDDebug.cpp b/mozilla/htmlparser/src/nsDTDDebug.cpp index 938cb400a59..20d3af9ab87 100644 --- a/mozilla/htmlparser/src/nsDTDDebug.cpp +++ b/mozilla/htmlparser/src/nsDTDDebug.cpp @@ -215,9 +215,9 @@ PRBool CDTDDebug::DebugRecord(char * path, nsString& aURLRef, char * filename) // vectors are stored on the format iof "URL vector filename" // where the vector contains the verification path and // the filename contains the debug source dump - char buffer[513]; - aURLRef.ToCString(buffer,sizeof(buffer)); - sprintf(string,"%s %s %s\r\n", buffer, path, filename); + char ubuffer[513]; + aURLRef.ToCString(ubuffer,sizeof(ubuffer)); + sprintf(string,"%s %s %s\r\n", ubuffer, path, filename); // get the file size, read in the file and parse it line at // a time to check to see if we have already recorded this diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp index 9f82d8b4ed9..b406c6f1b1b 100644 --- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp @@ -432,7 +432,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in } if(newToken) { - if ((s[0] != kNewLine) && (s[0] != CR)) { + if ((s[0] != (XML_Char)kNewLine) && (s[0] != (XML_Char)kCR)) { nsString& theString=newToken->GetStringValueXXX(); theString.Append((PRUnichar *) s,len); } diff --git a/mozilla/parser/htmlparser/src/nsDTDDebug.cpp b/mozilla/parser/htmlparser/src/nsDTDDebug.cpp index 938cb400a59..20d3af9ab87 100644 --- a/mozilla/parser/htmlparser/src/nsDTDDebug.cpp +++ b/mozilla/parser/htmlparser/src/nsDTDDebug.cpp @@ -215,9 +215,9 @@ PRBool CDTDDebug::DebugRecord(char * path, nsString& aURLRef, char * filename) // vectors are stored on the format iof "URL vector filename" // where the vector contains the verification path and // the filename contains the debug source dump - char buffer[513]; - aURLRef.ToCString(buffer,sizeof(buffer)); - sprintf(string,"%s %s %s\r\n", buffer, path, filename); + char ubuffer[513]; + aURLRef.ToCString(ubuffer,sizeof(ubuffer)); + sprintf(string,"%s %s %s\r\n", ubuffer, path, filename); // get the file size, read in the file and parse it line at // a time to check to see if we have already recorded this diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp index 9f82d8b4ed9..b406c6f1b1b 100644 --- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp @@ -432,7 +432,7 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in } if(newToken) { - if ((s[0] != kNewLine) && (s[0] != CR)) { + if ((s[0] != (XML_Char)kNewLine) && (s[0] != (XML_Char)kCR)) { nsString& theString=newToken->GetStringValueXXX(); theString.Append((PRUnichar *) s,len); }