From d56244187438078d9def701c025241455afdc117 Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Wed, 22 Dec 1999 22:47:15 +0000 Subject: [PATCH] Removing warnings. a=don r=waqar git-svn-id: svn://10.0.0.236/trunk@56444 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/events/src/nsEventListenerManager.cpp | 1 - mozilla/content/html/content/src/nsHTMLFormElement.cpp | 8 ++++---- mozilla/content/html/content/src/nsHTMLImageElement.cpp | 2 -- mozilla/layout/events/src/nsEventListenerManager.cpp | 1 - mozilla/layout/html/content/src/nsHTMLFormElement.cpp | 8 ++++---- mozilla/layout/html/content/src/nsHTMLImageElement.cpp | 2 -- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 833cae4319b..aa9ada2fb2f 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -489,7 +489,6 @@ nsresult nsEventListenerManager::SetJSEventListener(nsIScriptContext *aContext, REFNSIID aIID, PRBool aIsString) { - nsIDOMEventListener* theListener = nsnull; nsresult result = NS_OK; nsListenerStruct *ls; diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp index 69657c1cb70..a5d62edf7a2 100644 --- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp @@ -848,16 +848,16 @@ nsFormControlList::GetNamedObject(JSContext* aContext, jsval aID, JSObject** aOb char* str = JS_GetStringBytes(JS_ValueToString(aContext, aID)); nsAutoString name(str); nsCOMPtr document; - nsCOMPtr content; + nsCOMPtr form; *aObj = nsnull; if (nsnull == mForm) { return NS_OK; } - content = do_QueryInterface(mForm); - if (content) { - result = content->GetDocument(*getter_AddRefs(document)); + form = do_QueryInterface(mForm); + if (form) { + result = form->GetDocument(*getter_AddRefs(document)); if (NS_FAILED(result)) { return result; } diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index bedb49fe6b9..b445ddb89b0 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -358,8 +358,6 @@ nsHTMLImageElement::DeleteProperty(JSContext *aContext, JSObject *aObj, jsval aI PRBool nsHTMLImageElement::GetProperty(JSContext *aContext, JSObject *aObj, jsval aID, jsval *aVp) { - PRBool result = PR_TRUE; - // XXX Security manager needs to be called if (JSVAL_IS_STRING(aID)) { char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID)); diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp index 833cae4319b..aa9ada2fb2f 100644 --- a/mozilla/layout/events/src/nsEventListenerManager.cpp +++ b/mozilla/layout/events/src/nsEventListenerManager.cpp @@ -489,7 +489,6 @@ nsresult nsEventListenerManager::SetJSEventListener(nsIScriptContext *aContext, REFNSIID aIID, PRBool aIsString) { - nsIDOMEventListener* theListener = nsnull; nsresult result = NS_OK; nsListenerStruct *ls; diff --git a/mozilla/layout/html/content/src/nsHTMLFormElement.cpp b/mozilla/layout/html/content/src/nsHTMLFormElement.cpp index 69657c1cb70..a5d62edf7a2 100644 --- a/mozilla/layout/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLFormElement.cpp @@ -848,16 +848,16 @@ nsFormControlList::GetNamedObject(JSContext* aContext, jsval aID, JSObject** aOb char* str = JS_GetStringBytes(JS_ValueToString(aContext, aID)); nsAutoString name(str); nsCOMPtr document; - nsCOMPtr content; + nsCOMPtr form; *aObj = nsnull; if (nsnull == mForm) { return NS_OK; } - content = do_QueryInterface(mForm); - if (content) { - result = content->GetDocument(*getter_AddRefs(document)); + form = do_QueryInterface(mForm); + if (form) { + result = form->GetDocument(*getter_AddRefs(document)); if (NS_FAILED(result)) { return result; } diff --git a/mozilla/layout/html/content/src/nsHTMLImageElement.cpp b/mozilla/layout/html/content/src/nsHTMLImageElement.cpp index bedb49fe6b9..b445ddb89b0 100644 --- a/mozilla/layout/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLImageElement.cpp @@ -358,8 +358,6 @@ nsHTMLImageElement::DeleteProperty(JSContext *aContext, JSObject *aObj, jsval aI PRBool nsHTMLImageElement::GetProperty(JSContext *aContext, JSObject *aObj, jsval aID, jsval *aVp) { - PRBool result = PR_TRUE; - // XXX Security manager needs to be called if (JSVAL_IS_STRING(aID)) { char* cString = JS_GetStringBytes(JS_ValueToString(aContext, aID));