Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed non-ANSII compliant code.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@30204 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vidur%netscape.com
1999-05-04 20:53:44 +00:00
parent 7251e24c58
commit 2a6b6dd584
8 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/content/base/src/nsContentList.cpp
View File

@@ -65,11 +65,14 @@ nsContentList::nsContentList(nsIDocument *aDocument,
nsContentList::nsContentList(nsIDocument *aDocument,
nsContentListMatchFunc aFunc,
void* aData,
const nsString* aData,
nsIContent* aRootContent)
{
mFunc = aFunc;
mData = aData;
if (nsnull != aData) {
mData = new nsString(*aData);
// If this fails, fail silently
}
mMatchAtom = nsnull;
mRootContent = aRootContent;
mMatchAll = PR_FALSE;
@@ -100,8 +103,6 @@ nsContentList::~nsContentList()
NS_IF_RELEASE(mMatchAtom);
// XXX This is absolutely gross, since this is allocated
// elsewhere.
if (nsnull != mData) {
delete mData;
}

8
mozilla/content/base/src/nsContentList.h
View File

@@ -26,7 +26,7 @@
#include "nsIDocumentObserver.h"
#include "nsIScriptObjectOwner.h"
typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent, void* aData);
typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent, nsString* aData);
class nsIDocument;
@@ -43,7 +43,7 @@ public:
nsIContent* aRootContent=nsnull);
nsContentList(nsIDocument *aDocument,
nsContentListMatchFunc aFunc,
void* aData,
const nsString* aData,
nsIContent* aRootContent=nsnull);
virtual ~nsContentList();
@@ -133,10 +133,10 @@ protected:
nsIAtom* mMatchAtom;
PRInt32 mMatchNameSpaceId;
nsContentListMatchFunc mFunc;
void* mData;
nsString* mData;
nsVoidArray mContent;
void *mScriptObject;
nsIDocument *mDocument;
nsIDocument* mDocument;
nsIContent* mRootContent;
PRBool mMatchAll;
};

12
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1073,7 +1073,7 @@ nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets)
}
PRBool
nsHTMLDocument::MatchLinks(nsIContent *aContent, void* aData)
nsHTMLDocument::MatchLinks(nsIContent *aContent, nsString* aData)
{
nsIAtom *name;
aContent->GetTag(name);
@@ -1108,7 +1108,7 @@ nsHTMLDocument::GetLinks(nsIDOMHTMLCollection** aLinks)
}
PRBool
nsHTMLDocument::MatchAnchors(nsIContent *aContent, void* aData)
nsHTMLDocument::MatchAnchors(nsIContent *aContent, nsString* aData)
{
nsIAtom *name;
aContent->GetTag(name);
@@ -1358,16 +1358,15 @@ nsHTMLDocument::GetElementById(const nsString& aElementId, nsIDOMElement** aRetu
}
PRBool
nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, void* aData)
nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, nsString* aData)
{
nsresult result;
nsAutoString name;
char* matchName = (char*)aData;
result = aContent->GetAttribute(kNameSpaceID_None,
nsHTMLAtoms::name,
name);
if ((result == NS_OK) && name.Equals(matchName)) {
if ((result == NS_OK) && (nsnull != aData) && name.Equals(*aData)) {
return PR_TRUE;
}
else {
@@ -1379,10 +1378,9 @@ NS_IMETHODIMP
nsHTMLDocument::GetElementsByName(const nsString& aElementName,
nsIDOMNodeList** aReturn)
{
char* name = aElementName.ToNewCString();
nsContentList* elements = new nsContentList(this,
MatchNameAttribute,
name);
&aElementName);
if (nsnull == elements) {
return NS_ERROR_OUT_OF_MEMORY;
}

6
mozilla/content/html/document/src/nsHTMLDocument.h
View File

@@ -163,9 +163,9 @@ protected:
nsIContent *MatchName(nsIContent *aContent, const nsString& aName);
virtual void InternalAddStyleSheet(nsIStyleSheet* aSheet);
static PRBool MatchLinks(nsIContent *aContent, void* aData);
static PRBool MatchAnchors(nsIContent *aContent, void* aData);
static PRBool MatchNameAttribute(nsIContent* aContent, void* aData);
static PRBool MatchLinks(nsIContent *aContent, nsString* aData);
static PRBool MatchAnchors(nsIContent *aContent, nsString* aData);
static PRBool MatchNameAttribute(nsIContent* aContent, nsString* aData);
PRBool GetBodyContent();
nsresult GetBodyElement(nsIDOMHTMLBodyElement** aBody);

9
mozilla/layout/base/src/nsContentList.cpp
View File

@@ -65,11 +65,14 @@ nsContentList::nsContentList(nsIDocument *aDocument,
nsContentList::nsContentList(nsIDocument *aDocument,
nsContentListMatchFunc aFunc,
void* aData,
const nsString* aData,
nsIContent* aRootContent)
{
mFunc = aFunc;
mData = aData;
if (nsnull != aData) {
mData = new nsString(*aData);
// If this fails, fail silently
}
mMatchAtom = nsnull;
mRootContent = aRootContent;
mMatchAll = PR_FALSE;
@@ -100,8 +103,6 @@ nsContentList::~nsContentList()
NS_IF_RELEASE(mMatchAtom);
// XXX This is absolutely gross, since this is allocated
// elsewhere.
if (nsnull != mData) {
delete mData;
}

8
mozilla/layout/base/src/nsContentList.h
View File

@@ -26,7 +26,7 @@
#include "nsIDocumentObserver.h"
#include "nsIScriptObjectOwner.h"
typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent, void* aData);
typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent, nsString* aData);
class nsIDocument;
@@ -43,7 +43,7 @@ public:
nsIContent* aRootContent=nsnull);
nsContentList(nsIDocument *aDocument,
nsContentListMatchFunc aFunc,
void* aData,
const nsString* aData,
nsIContent* aRootContent=nsnull);
virtual ~nsContentList();
@@ -133,10 +133,10 @@ protected:
nsIAtom* mMatchAtom;
PRInt32 mMatchNameSpaceId;
nsContentListMatchFunc mFunc;
void* mData;
nsString* mData;
nsVoidArray mContent;
void *mScriptObject;
nsIDocument *mDocument;
nsIDocument* mDocument;
nsIContent* mRootContent;
PRBool mMatchAll;
};

12
mozilla/layout/html/document/src/nsHTMLDocument.cpp
View File

@@ -1073,7 +1073,7 @@ nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets)
}
PRBool
nsHTMLDocument::MatchLinks(nsIContent *aContent, void* aData)
nsHTMLDocument::MatchLinks(nsIContent *aContent, nsString* aData)
{
nsIAtom *name;
aContent->GetTag(name);
@@ -1108,7 +1108,7 @@ nsHTMLDocument::GetLinks(nsIDOMHTMLCollection** aLinks)
}
PRBool
nsHTMLDocument::MatchAnchors(nsIContent *aContent, void* aData)
nsHTMLDocument::MatchAnchors(nsIContent *aContent, nsString* aData)
{
nsIAtom *name;
aContent->GetTag(name);
@@ -1358,16 +1358,15 @@ nsHTMLDocument::GetElementById(const nsString& aElementId, nsIDOMElement** aRetu
}
PRBool
nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, void* aData)
nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, nsString* aData)
{
nsresult result;
nsAutoString name;
char* matchName = (char*)aData;
result = aContent->GetAttribute(kNameSpaceID_None,
nsHTMLAtoms::name,
name);
if ((result == NS_OK) && name.Equals(matchName)) {
if ((result == NS_OK) && (nsnull != aData) && name.Equals(*aData)) {
return PR_TRUE;
}
else {
@@ -1379,10 +1378,9 @@ NS_IMETHODIMP
nsHTMLDocument::GetElementsByName(const nsString& aElementName,
nsIDOMNodeList** aReturn)
{
char* name = aElementName.ToNewCString();
nsContentList* elements = new nsContentList(this,
MatchNameAttribute,
name);
&aElementName);
if (nsnull == elements) {
return NS_ERROR_OUT_OF_MEMORY;
}

6
mozilla/layout/html/document/src/nsHTMLDocument.h
View File

@@ -163,9 +163,9 @@ protected:
nsIContent *MatchName(nsIContent *aContent, const nsString& aName);
virtual void InternalAddStyleSheet(nsIStyleSheet* aSheet);
static PRBool MatchLinks(nsIContent *aContent, void* aData);
static PRBool MatchAnchors(nsIContent *aContent, void* aData);
static PRBool MatchNameAttribute(nsIContent* aContent, void* aData);
static PRBool MatchLinks(nsIContent *aContent, nsString* aData);
static PRBool MatchAnchors(nsIContent *aContent, nsString* aData);
static PRBool MatchNameAttribute(nsIContent* aContent, nsString* aData);
PRBool GetBodyContent();
nsresult GetBodyElement(nsIDOMHTMLBodyElement** aBody);