corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing linux bustage; bug 315826

Browse Source
This commit is contained in:
bzbarsky@mit.edu
2006-04-17 01:58:36 +00:00
parent 855fdea48a
commit 41c1695cc0
1 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
parser/xml/src/nsSAXXMLReader.cpp
View File

@@ -198,24 +198,31 @@ NS_IMETHODIMP
nsSAXXMLReader::HandleStartNamespaceDecl(const PRUnichar *aPrefix,
const PRUnichar *aUri)
{
if (mContentHandler) {
const nsString &prefix = aPrefix ? nsDependentString(aPrefix) :
EmptyString();
return mContentHandler->StartPrefixMapping(prefix,
nsDependentString(aUri));
if (!mContentHandler) {
return NS_OK;
}
return NS_OK;
const nsDependentString& uri = nsDependentString(aURI);
if (aPrefix) {
return mContentHandler->StartPrefixMapping(nsDependentString(aPrefix),
uri);
}
return mContentHandler->StartPrefixMapping(EmptyString(), uri);
}
NS_IMETHODIMP
nsSAXXMLReader::HandleEndNamespaceDecl(const PRUnichar *aPrefix)
{
if (mContentHandler) {
const nsString &prefix = aPrefix ? nsDependentString(aPrefix) :
EmptyString();
return mContentHandler->EndPrefixMapping(prefix);
if (!mContentHandler) {
return NS_OK;
}
return NS_OK;
if (!aPrefix) {
return mContentHandler->EndPrefixMapping(nsDependentString(aPrefix));
}
return mContentHandler->EndPrefixMapping(EmptyString());
}
NS_IMETHODIMP
@@ -235,12 +242,17 @@ nsSAXXMLReader::HandleNotationDecl(const PRUnichar *aNotationName,
const PRUnichar *aPublicId)
{
if (mDTDHandler) {
const nsString &pubId = aPublicId ? nsDependentString(aPublicId) :
EmptyString();
const nsString &sysId = aSystemId ? nsDependentString(aSystemId) :
EmptyString();
const nsString& empty = EmptyString();
if (!aSystemId) {
aSystemId = empty.get();
}
if (!aPublicId) {
aPublicId = empty.get();
}
return mDTDHandler->NotationDecl(nsDependentString(aNotationName),
sysId, pubId);
nsDependentString(aSystemId),
nsDependentString(aPublicId);
}
return NS_OK;
}
@@ -252,13 +264,17 @@ nsSAXXMLReader::HandleUnparsedEntityDecl(const PRUnichar *aEntityName,
const PRUnichar *aNotationName)
{
if (mDTDHandler) {
const nsString &pubId = aPublicId ? nsDependentString(aPublicId) :
EmptyString();
const nsString &sysId = aSystemId ? nsDependentString(aSystemId) :
EmptyString();
const nsString& empty = EmptyString();
if (!aSystemId) {
aSystemId = empty.get();
}
if (!aPublicId) {
aPublicId = empty.get();
}
return mDTDHandler->UnparsedEntityDecl(nsDependentString(aEntityName),
sysId,
pubId,
nsDependentString(aSystemId),
nsDependentString(aPublicId),
nsDependentString(aNotationName));
}
return NS_OK;