Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1316432 - Fix nsCOMPtr constructions&assignments from 0 - r=froydnj

Browse Source 
Giving '0' (literal zero) to nsCOMPtr is now ambiguous, as both
nsCOMPtr(decltype(nullptr)) and nsCOMPtr(T*) could be used.
In any case, our coding standards mandate the use of 'nullptr' for pointers.
So I'm changing all zeroes into nullptr's where necessary.

MozReview-Commit-ID: LXiZTu87Ck6

--HG--
extra : rebase_source : f9dcc6b06e9ebf9c30a576f9319f76a51b6dc26f
This commit is contained in:
Gerald Squelart 2016-11-10 14:11:27 +11:00
parent 10f1b864f2
commit 0affeb4ab0
41 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsContentSink.cpp
View File

@ -1506,7 +1506,7 @@ nsContentSink::DidBuildModelImpl(bool aTerminated)
("nsContentSink::DidBuildModel: canceling notification "
"timeout"));
mNotificationTimer->Cancel();
mNotificationTimer = 0;
mNotificationTimer = nullptr;
}
}

6
dom/plugins/base/nsPluginStreamListenerPeer.cpp
View File

@ -72,8 +72,8 @@ nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReferenc
nsPluginByteRangeStreamListener::~nsPluginByteRangeStreamListener()
{
mStreamConverter = 0;
mWeakPtrPluginStreamListenerPeer = 0;
mStreamConverter = nullptr;
mWeakPtrPluginStreamListenerPeer = nullptr;
}
/**
@ -123,7 +123,7 @@ nsPluginByteRangeStreamListener::OnStartRequest(nsIRequest *request, nsISupports
return rv;
}
}
mStreamConverter = 0;
mStreamConverter = nullptr;
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(request));
if (!httpChannel) {

2
dom/xslt/xpath/txNameTest.cpp
View File

@ -15,7 +15,7 @@ txNameTest::txNameTest(nsIAtom* aPrefix, nsIAtom* aLocalName, int32_t aNSID,
mNodeType(aNodeType)
{
if (aPrefix == nsGkAtoms::_empty)
mPrefix = 0;
mPrefix = nullptr;
NS_ASSERTION(aLocalName, "txNameTest without a local name?");
NS_ASSERTION(aNodeType == txXPathNodeType::DOCUMENT_NODE ||
aNodeType == txXPathNodeType::ELEMENT_NODE ||

2
dom/xslt/xpath/txVariableRefExpr.cpp
View File

@ -22,7 +22,7 @@ VariableRefExpr::VariableRefExpr(nsIAtom* aPrefix, nsIAtom* aLocalName,
{
NS_ASSERTION(mLocalName, "VariableRefExpr without local name?");
if (mPrefix == nsGkAtoms::_empty)
mPrefix = 0;
mPrefix = nullptr;
}
/**

4
dom/xul/templates/nsRDFPropertyTestNode.cpp
View File

@ -54,7 +54,7 @@ nsRDFPropertyTestNode::nsRDFPropertyTestNode(TestNode* aParent,
nsIAtom* aTargetVariable)
: nsRDFTestNode(aParent),
mProcessor(aProcessor),
mSourceVariable(0),
mSourceVariable(nullptr),
mSource(aSource),
mProperty(aProperty),
mTargetVariable(aTargetVariable),
@ -90,7 +90,7 @@ nsRDFPropertyTestNode::nsRDFPropertyTestNode(TestNode* aParent,
mSourceVariable(aSourceVariable),
mSource(nullptr),
mProperty(aProperty),
mTargetVariable(0),
mTargetVariable(nullptr),
mTarget(aTarget)
{
if (MOZ_LOG_TEST(gXULTemplateLog, LogLevel::Debug)) {

2
editor/composer/nsEditorSpellCheck.cpp
View File

@ -642,7 +642,7 @@ nsEditorSpellCheck::UninitSpellChecker()
DeleteSuggestedWordList();
mDictionaryList.Clear();
mDictionaryIndex = 0;
mSpellChecker = 0;
mSpellChecker = nullptr;
return NS_OK;
}

8
editor/libeditor/HTMLEditRules.cpp
View File

@ -500,7 +500,7 @@ HTMLEditRules::AfterEditInner(EditAction action,
// if we created a new block, make sure selection lands in it
if (mNewBlock) {
rv = PinSelectionToNewBlock(selection);
mNewBlock = 0;
mNewBlock = nullptr;
}
// adjust selection for insert text, html paste, and delete actions
@ -3079,7 +3079,7 @@ HTMLEditRules::WillMakeList(Selection* aSelection,
NS_ENSURE_STATE(mHTMLEditor);
rv = mHTMLEditor->DeleteNode(curNode);
NS_ENSURE_SUCCESS(rv, rv);
prevListItem = 0;
prevListItem = nullptr;
continue;
} else if (IsEmptyInline(curNode)) {
// if curNode is an empty inline container, delete it
@ -3112,7 +3112,7 @@ HTMLEditRules::WillMakeList(Selection* aSelection,
NS_ENSURE_SUCCESS(rv, rv);
curList = newBlock;
}
prevListItem = 0;
prevListItem = nullptr;
continue;
}
@ -3206,7 +3206,7 @@ HTMLEditRules::WillMakeList(Selection* aSelection,
// remember our new block for postprocessing
mNewBlock = curList;
// curList is now the correct thing to put curNode in
prevListItem = 0;
prevListItem = nullptr;
}
// if curNode isn't a list item, we must wrap it in one

2
editor/libeditor/HTMLURIRefObject.cpp
View File

@ -243,7 +243,7 @@ HTMLURIRefObject::SetNode(nsIDOMNode* aNode)
// If there weren't any URIs in the attributes,
// then don't accept this node.
mNode = 0;
mNode = nullptr;
return NS_ERROR_INVALID_ARG;
}

2
embedding/browser/nsEmbedStream.cpp
View File

@ -95,7 +95,7 @@ nsEmbedStream::CloseStream(void)
// satisfied; this is exactly what we want to return.
NS_ENSURE_STATE(mOutputStream);
mOutputStream->Close();
mOutputStream = 0;
mOutputStream = nullptr;
return rv;
}

2
embedding/components/find/nsFind.cpp
View File

@ -1044,7 +1044,7 @@ nsFind::Find(const char16_t* aPatText, nsIDOMRange* aSearchRange,
tc = do_QueryInterface(mIterNode);
if (!tc || !(frag = tc->GetText())) { // Out of nodes
mIterator = nullptr;
mLastBlockParent = 0;
mLastBlockParent = nullptr;
ResetAll();
return NS_OK;
}

4
embedding/components/windowwatcher/nsWindowWatcher.cpp
View File

@ -100,7 +100,7 @@ struct nsWatcherWindowEntry
supportsweak->GetWeakReference(getter_AddRefs(mChromeWeak));
} else {
mChrome = aChrome;
mChromeWeak = 0;
mChromeWeak = nullptr;
}
ReferenceSelf();
}
@ -1491,7 +1491,7 @@ nsWindowWatcher::AddWindow(mozIDOMWindowProxy* aWindow, nsIWebBrowserChrome* aCh
supportsweak->GetWeakReference(getter_AddRefs(info->mChromeWeak));
} else {
info->mChrome = aChrome;
info->mChromeWeak = 0;
info->mChromeWeak = nullptr;
}
return NS_OK;
}

2
layout/generic/nsSelection.cpp
View File

@ -280,7 +280,7 @@ public:
if (mTimer)
{
mTimer->Cancel();
mTimer = 0;
mTimer = nullptr;
}
mContent = nullptr;

10
modules/libjar/nsJARChannel.cpp
View File

@ -1017,19 +1017,19 @@ nsJARChannel::OnStopRequest(nsIRequest *req, nsISupports *ctx, nsresult status)
if (mListener) {
mListener->OnStopRequest(this, mListenerContext, status);
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
}
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, status);
mPump = 0;
mPump = nullptr;
mIsPending = false;
// Drop notification callbacks to prevent cycles.
mCallbacks = 0;
mProgressSink = 0;
mCallbacks = nullptr;
mProgressSink = nullptr;
#if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA)
#else

8
netwerk/base/nsIncrementalStreamLoader.cpp
View File

@ -104,9 +104,9 @@ nsIncrementalStreamLoader::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
}
// done.. cleanup
ReleaseData();
mRequest = 0;
mObserver = 0;
mContext = 0;
mRequest = nullptr;
mObserver = nullptr;
mContext = nullptr;
}
return NS_OK;
}
@ -197,7 +197,7 @@ nsIncrementalStreamLoader::OnDataAvailable(nsIRequest* request, nsISupports *ctx
}
uint32_t countRead;
nsresult rv = inStr->ReadSegments(WriteSegmentFun, this, count, &countRead);
mRequest = 0;
mRequest = nullptr;
return rv;
}

10
netwerk/base/nsInputStreamPump.cpp
View File

@ -361,7 +361,7 @@ nsInputStreamPump::AsyncRead(nsIStreamListener *listener, nsISupports *ctxt)
// release our reference to the original stream. from this point forward,
// we only reference the "stream" via mAsyncStream.
mStream = 0;
mStream = nullptr;
// mStreamOffset now holds the number of bytes currently read. we use this
// to enforce the mStreamLength restriction.
@ -703,8 +703,8 @@ nsInputStreamPump::OnStateStop()
else if (mCloseWhenDone)
mAsyncStream->Close();
mAsyncStream = 0;
mTargetThread = 0;
mAsyncStream = nullptr;
mTargetThread = nullptr;
mIsPending = false;
{
// Note: Must exit monitor for call to OnStartRequest to avoid
@ -714,8 +714,8 @@ nsInputStreamPump::OnStateStop()
mListener->OnStopRequest(this, mListenerContext, mStatus);
mMonitor.Enter();
}
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, mStatus);

2
netwerk/base/nsLoadGroup.cpp
View File

@ -123,7 +123,7 @@ nsLoadGroup::~nsLoadGroup()
DebugOnly<nsresult> rv = Cancel(NS_BINDING_ABORTED);
NS_ASSERTION(NS_SUCCEEDED(rv), "Cancel failed");
mDefaultLoadRequest = 0;
mDefaultLoadRequest = nullptr;
if (mRequestContext) {
nsID rcid;

4
netwerk/base/nsSocketTransport2.cpp
View File

@ -1874,7 +1874,7 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa
SendStatus(NS_NET_STATUS_RESOLVED_HOST);
SOCKET_LOG((" MSG_DNS_LOOKUP_COMPLETE\n"));
mDNSRequest = 0;
mDNSRequest = nullptr;
if (param) {
mDNSRecord = static_cast<nsIDNSRecord *>(param);
mDNSRecord->GetNextAddr(SocketPort(), &mNetAddr);
@ -2092,7 +2092,7 @@ nsSocketTransport::OnSocketDetached(PRFileDesc *fd)
// make sure there isn't any pending DNS request
if (mDNSRequest) {
mDNSRequest->Cancel(NS_ERROR_ABORT);
mDNSRequest = 0;
mDNSRequest = nullptr;
}
//

4
netwerk/base/nsStandardURL.cpp
View File

@ -393,7 +393,7 @@ void
nsStandardURL::InvalidateCache(bool invalidateCachedFile)
{
if (invalidateCachedFile)
mFile = 0;
mFile = nullptr;
if (mHostA) {
free(mHostA);
mHostA = nullptr;
@ -3107,7 +3107,7 @@ nsStandardURL::SetFile(nsIFile *file)
if (NS_FAILED(file->Clone(getter_AddRefs(mFile)))) {
NS_WARNING("nsIFile::Clone failed");
// failure to clone is not fatal (GetFile will generate mFile)
mFile = 0;
mFile = nullptr;
}
}
return rv;

6
netwerk/base/nsStreamListenerTee.cpp
View File

@ -37,7 +37,7 @@ nsStreamListenerTee::OnStopRequest(nsIRequest *request,
// it is critical that we close out the input stream tee
if (mInputTee) {
mInputTee->SetSink(nullptr);
mInputTee = 0;
mInputTee = nullptr;
}
// release sink on the same thread where the data was written (bug 716293)
@ -45,13 +45,13 @@ nsStreamListenerTee::OnStopRequest(nsIRequest *request,
NS_ProxyRelease(mEventTarget, mSink.forget());
}
else {
mSink = 0;
mSink = nullptr;
}
nsresult rv = mListener->OnStopRequest(request, context, status);
if (mObserver)
mObserver->OnStopRequest(request, context, status);
mObserver = 0;
mObserver = nullptr;
return rv;
}

6
netwerk/base/nsStreamLoader.cpp
View File

@ -111,9 +111,9 @@ nsStreamLoader::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
}
// done.. cleanup
ReleaseData();
mRequest = 0;
mObserver = 0;
mContext = 0;
mRequest = nullptr;
mObserver = nullptr;
mContext = nullptr;
}
if (mRequestObserver) {

2
netwerk/protocol/about/nsAboutCacheEntry.cpp
View File

@ -386,7 +386,7 @@ nsAboutCacheEntry::Channel::WriteCacheEntryDescription(nsICacheEntry *entry)
buffer.AppendLiteral("\">");
buffer.Append(escapedStr);
buffer.AppendLiteral("</a>");
uri = 0;
uri = nullptr;
} else {
buffer.Append(escapedStr);
}

2
netwerk/protocol/ftp/nsFtpControlConnection.cpp
View File

@ -161,7 +161,7 @@ nsFtpControlConnection::Disconnect(nsresult status)
if (NS_FAILED(status)) {
// break cyclic reference!
mSocket->Close(status);
mSocket = 0;
mSocket = nullptr;
mSocketInput->AsyncWait(nullptr, 0, 0, nullptr); // clear any observer
mSocketInput = nullptr;
mSocketOutput = nullptr;

4
netwerk/protocol/http/HttpChannelChild.cpp
View File

@ -977,8 +977,8 @@ HttpChannelChild::DoOnStopRequest(nsIRequest* aRequest, nsresult aChannelStatus,
}
mOnStopRequestCalled = true;
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
mCacheEntryAvailable = false;
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, mStatus);

2
netwerk/protocol/http/HttpChannelParent.cpp
View File

@ -788,7 +788,7 @@ HttpChannelParent::RecvDocumentChannelCleanup()
{
// From now on only using mAssociatedContentSecurity. Free everything else.
mChannel = nullptr; // Reclaim some memory sooner.
mCacheEntry = 0; // Else we'll block other channels reading same URI
mCacheEntry = nullptr; // Else we'll block other channels reading same URI
return true;
}

2
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -178,7 +178,7 @@ nsHttpConnectionMgr::Shutdown()
// from being posted. this is how we indicate that we are
// shutting down.
mIsShuttingDown = true;
mSocketThreadTarget = 0;
mSocketThreadTarget = nullptr;
if (NS_FAILED(rv)) {
NS_WARNING("unable to post SHUTDOWN message");

2
netwerk/protocol/http/nsHttpTransaction.cpp
View File

@ -1298,7 +1298,7 @@ nsHttpTransaction::Restart()
seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
// clear old connection state...
mSecurityInfo = 0;
mSecurityInfo = nullptr;
if (mConnection) {
if (!mReuseOnRestart) {
mConnection->DontReuse();

8
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
View File

@ -291,14 +291,14 @@ WyciwygChannelChild::OnStopRequest(const nsresult& statusCode)
mListener->OnStopRequest(this, mListenerContext, statusCode);
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, mStatus);
mCallbacks = 0;
mProgressSink = 0;
mCallbacks = nullptr;
mProgressSink = nullptr;
}
if (mIPCOpen)

20
netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
View File

@ -572,13 +572,13 @@ nsWyciwygChannel::CloseCacheEntryInternal(nsresult reason)
if (mCacheEntry) {
LOG(("nsWyciwygChannel::CloseCacheEntryInternal [this=%p ]", this));
mCacheOutputStream = 0;
mCacheInputStream = 0;
mCacheOutputStream = nullptr;
mCacheInputStream = nullptr;
if (NS_FAILED(reason))
mCacheEntry->AsyncDoom(nullptr); // here we were calling Doom() ...
mCacheEntry = 0;
mCacheEntry = nullptr;
}
return NS_OK;
}
@ -756,19 +756,19 @@ nsWyciwygChannel::OnStopRequest(nsIRequest *request, nsISupports *ctx, nsresult
mStatus = status;
mListener->OnStopRequest(this, mListenerContext, mStatus);
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
if (mLoadGroup)
mLoadGroup->RemoveRequest(this, nullptr, mStatus);
CloseCacheEntry(mStatus);
mPump = 0;
mPump = nullptr;
mIsPending = false;
// Drop notification callbacks to prevent cycles.
mCallbacks = 0;
mProgressSink = 0;
mCallbacks = nullptr;
mProgressSink = nullptr;
return NS_OK;
}
@ -854,8 +854,8 @@ nsWyciwygChannel::NotifyListener()
if (mListener) {
mListener->OnStartRequest(this, mListenerContext);
mListener->OnStopRequest(this, mListenerContext, mStatus);
mListener = 0;
mListenerContext = 0;
mListener = nullptr;
mListenerContext = nullptr;
}
mIsPending = false;

2
netwerk/streamconv/converters/nsBinHexDecoder.cpp
View File

@ -274,7 +274,7 @@ nsresult nsBinHexDecoder::ProcessNextState(nsIRequest * aRequest, nsISupports *
{
// when we reach the finished state...fire an on stop request on the event listener...
mNextListener->OnStopRequest(aRequest, aContext, NS_OK);
mNextListener = 0;
mNextListener = nullptr;
/* now We are done with everything. */
++mState;

2
netwerk/streamconv/converters/nsIndexedToHTML.cpp
View File

@ -665,7 +665,7 @@ nsIndexedToHTML::OnStopRequest(nsIRequest* request, nsISupports *aContext,
}
mParser->OnStopRequest(request, aContext, aStatus);
mParser = 0;
mParser = nullptr;
return mListener->OnStopRequest(request, aContext, aStatus);
}

2
netwerk/streamconv/converters/nsUnknownDecoder.cpp
View File

@ -299,7 +299,7 @@ nsUnknownDecoder::OnStopRequest(nsIRequest* request, nsISupports *aCtxt,
}
rv = mNextListener->OnStopRequest(request, aCtxt, aStatus);
mNextListener = 0;
mNextListener = nullptr;
return rv;
}

2
parser/htmlparser/nsParser.cpp
View File

@ -910,7 +910,7 @@ nsParser::DidBuildModel(nsresult anErrorCode)
}
//Ref. to bug 61462.
mParserContext->mRequest = 0;
mParserContext->mRequest = nullptr;
}
}

4
parser/htmlparser/nsScanner.cpp
View File

@ -67,7 +67,7 @@ nsScanner::nsScanner(const nsAString& anHTMLString)
}
mMarkPosition = mCurrentPosition;
mIncremental = false;
mUnicodeDecoder = 0;
mUnicodeDecoder = nullptr;
mCharsetSource = kCharsetUninitialized;
mHasInvalidCharacter = false;
mReplacementCharacter = char16_t(0x0);
@ -99,7 +99,7 @@ nsScanner::nsScanner(nsString& aFilename, bool aCreateStream)
mFirstNonWhitespacePosition = -1;
mCountRemaining = 0;
mUnicodeDecoder = 0;
mUnicodeDecoder = nullptr;
mCharsetSource = kCharsetUninitialized;
mHasInvalidCharacter = false;
mReplacementCharacter = char16_t(0x0);

2
security/manager/ssl/nsNSSCertHelper.cpp
View File

@ -1884,7 +1884,7 @@ nsNSSCertificate::CreateTBSCertificateASN1Struct(nsIASN1Sequence **retSequence,
validityData->GetNotBefore(&notBefore);
validityData->GetNotAfter(&notAfter);
validityData = 0;
validityData = nullptr;
rv = ProcessTime(notBefore, text.get(), validitySequence);
if (NS_FAILED(rv))
return rv;

4
security/manager/ssl/nsPKCS12Blob.cpp
View File

@ -42,7 +42,7 @@ extern LazyLogModule gPIPNSSLog;
#define PIP_PKCS12_NSS_ERROR 7
// constructor
nsPKCS12Blob::nsPKCS12Blob():mCertArray(0),
nsPKCS12Blob::nsPKCS12Blob():mCertArray(nullptr),
mTmpFile(nullptr),
mTokenSet(false)
{
@ -77,7 +77,7 @@ nsPKCS12Blob::SetToken(nsIPK11Token *token)
PK11SlotInfo *slot;
rv = GetSlotWithMechanism(CKM_RSA_PKCS, mUIContext, &slot, locker);
if (NS_FAILED(rv)) {
mToken = 0;
mToken = nullptr;
} else {
mToken = new nsPK11Token(slot);
PK11_FreeSlot(slot);

2
toolkit/components/places/nsNavHistory.cpp
View File

@ -677,7 +677,7 @@ void nsNavHistory::expireNowTimerCallback(nsITimer* aTimer, void* aClosure)
nsNavHistory *history = static_cast<nsNavHistory *>(aClosure);
if (history) {
history->mCachedNow = 0;
history->mExpireNowTimer = 0;
history->mExpireNowTimer = nullptr;
}
}

4
uriloader/base/nsDocLoader.cpp
View File

@ -356,7 +356,7 @@ nsDocLoader::Destroy()
mListenerInfoList.Clear();
mListenerInfoList.Compact();
mDocumentRequest = 0;
mDocumentRequest = nullptr;
if (mLoadGroup)
mLoadGroup->SetGroupObserver(nullptr);
@ -699,7 +699,7 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout)
nsCOMPtr<nsIRequest> docRequest = mDocumentRequest;
mDocumentRequest = 0;
mDocumentRequest = nullptr;
mIsLoadingDocument = false;
// Update the progress status state - the document is done

2
uriloader/base/nsURILoader.cpp
View File

@ -333,7 +333,7 @@ NS_IMETHODIMP nsDocumentOpenInfo::OnStopRequest(nsIRequest *request, nsISupports
// If this is a multipart stream, we could get another
// OnStartRequest after this... reset state.
m_targetStreamListener = 0;
m_targetStreamListener = nullptr;
mContentType.Truncate();
listener->OnStopRequest(request, aCtxt, aStatus);
}

2
uriloader/exthandler/nsExternalProtocolHandler.cpp
View File

@ -183,7 +183,7 @@ nsresult nsExtProtocolChannel::OpenURL()
}
finish:
mCallbacks = 0;
mCallbacks = nullptr;
return rv;
}

6
xpcom/io/nsInputStreamTee.cpp
View File

@ -179,7 +179,7 @@ nsInputStreamTee::TeeSegment(const char* aBuf, uint32_t aCount)
NS_WARNING("Write failed (non-fatal)");
// catch possible misuse of the input stream tee
NS_ASSERTION(rv != NS_BASE_STREAM_WOULD_BLOCK, "sink must be a blocking stream");
mSink = 0;
mSink = nullptr;
break;
}
totalBytesWritten += bytesWritten;
@ -217,8 +217,8 @@ nsInputStreamTee::Close()
return NS_ERROR_NOT_INITIALIZED;
}
nsresult rv = mSource->Close();
mSource = 0;
mSink = 0;
mSource = nullptr;
mSink = nullptr;
return rv;
}

12
xpcom/io/nsPipe3.cpp
View File

@ -1200,7 +1200,7 @@ nsPipeInputStream::OnInputReadable(uint32_t aBytesWritten,
if (mCallback && !(mCallbackFlags & WAIT_CLOSURE_ONLY)) {
aEvents.NotifyInputReady(this, mCallback);
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
} else if (mBlocked) {
result = NotifyMonitor;
@ -1229,7 +1229,7 @@ nsPipeInputStream::OnInputException(nsresult aReason, nsPipeEvents& aEvents,
if (mCallback) {
aEvents.NotifyInputReady(this, mCallback);
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
} else if (mBlocked) {
result = NotifyMonitor;
@ -1370,7 +1370,7 @@ nsPipeInputStream::AsyncWait(nsIInputStreamCallback* aCallback,
ReentrantMonitorAutoEnter mon(mPipe->mReentrantMonitor);
// replace a pending callback
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
if (!aCallback) {
@ -1594,7 +1594,7 @@ nsPipeOutputStream::OnOutputWritable(nsPipeEvents& aEvents)
if (mCallback && !(mCallbackFlags & WAIT_CLOSURE_ONLY)) {
aEvents.NotifyOutputReady(this, mCallback);
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
} else if (mBlocked) {
result = NotifyMonitor;
@ -1616,7 +1616,7 @@ nsPipeOutputStream::OnOutputException(nsresult aReason, nsPipeEvents& aEvents)
if (mCallback) {
aEvents.NotifyOutputReady(this, mCallback);
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
} else if (mBlocked) {
result = NotifyMonitor;
@ -1802,7 +1802,7 @@ nsPipeOutputStream::AsyncWait(nsIOutputStreamCallback* aCallback,
ReentrantMonitorAutoEnter mon(mPipe->mReentrantMonitor);
// replace a pending callback
mCallback = 0;
mCallback = nullptr;
mCallbackFlags = 0;
if (!aCallback) {