mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 879054: fix printf of status in HttpChannelParent. r=mcmanus

This commit is contained in:
Jason Duell 2013-06-04 16:32:31 -07:00
Родитель c36b0246a8
Коммит c07b3b58e2
21 изменённых файлов: 118 добавлений и 118 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
netwerk/base/src/nsAsyncStreamCopier.cpp
Просмотреть файл

@ -53,7 +53,7 @@ nsAsyncStreamCopier::IsComplete(nsresult *status)
void
nsAsyncStreamCopier::Complete(nsresult status)
{
LOG(("nsAsyncStreamCopier::Complete [this=%x status=%x]\n", this, status));
LOG(("nsAsyncStreamCopier::Complete [this=%p status=%x]\n", this, status));
nsCOMPtr<nsIRequestObserver> observer;
nsCOMPtr<nsISupports> ctx;
@ -217,7 +217,7 @@ nsAsyncStreamCopier::Init(nsIInputStream *source,
NS_IMETHODIMP
nsAsyncStreamCopier::AsyncCopy(nsIRequestObserver *observer, nsISupports *ctx)
{
LOG(("nsAsyncStreamCopier::AsyncCopy [this=%x observer=%x]\n", this, observer));
LOG(("nsAsyncStreamCopier::AsyncCopy [this=%p observer=%x]\n", this, observer));
NS_ASSERTION(mSource && mSink, "not initialized");
nsresult rv;

14
netwerk/base/src/nsInputStreamPump.cpp
Просмотреть файл

@ -172,7 +172,7 @@ nsInputStreamPump::GetStatus(nsresult *status)
NS_IMETHODIMP
nsInputStreamPump::Cancel(nsresult status)
{
LOG(("nsInputStreamPump::Cancel [this=%x status=%x]\n",
LOG(("nsInputStreamPump::Cancel [this=%p status=%x]\n",
this, status));
if (NS_FAILED(mStatus)) {
@ -199,7 +199,7 @@ nsInputStreamPump::Cancel(nsresult status)
NS_IMETHODIMP
nsInputStreamPump::Suspend()
{
LOG(("nsInputStreamPump::Suspend [this=%x]\n", this));
LOG(("nsInputStreamPump::Suspend [this=%p]\n", this));
NS_ENSURE_TRUE(mState != STATE_IDLE, NS_ERROR_UNEXPECTED);
++mSuspendCount;
return NS_OK;
@ -208,7 +208,7 @@ nsInputStreamPump::Suspend()
NS_IMETHODIMP
nsInputStreamPump::Resume()
{
LOG(("nsInputStreamPump::Resume [this=%x]\n", this));
LOG(("nsInputStreamPump::Resume [this=%p]\n", this));
NS_ENSURE_TRUE(mSuspendCount > 0, NS_ERROR_UNEXPECTED);
NS_ENSURE_TRUE(mState != STATE_IDLE, NS_ERROR_UNEXPECTED);
@ -351,7 +351,7 @@ nsInputStreamPump::AsyncRead(nsIStreamListener *listener, nsISupports *ctxt)
NS_IMETHODIMP
nsInputStreamPump::OnInputStreamReady(nsIAsyncInputStream *stream)
{
LOG(("nsInputStreamPump::OnInputStreamReady [this=%x]\n", this));
LOG(("nsInputStreamPump::OnInputStreamReady [this=%p]\n", this));
PROFILER_LABEL("Input", "nsInputStreamPump::OnInputStreamReady");
// this function has been called from a PLEvent, so we can safely call
@ -401,7 +401,7 @@ uint32_t
nsInputStreamPump::OnStateStart()
{
PROFILER_LABEL("nsInputStreamPump", "OnStateStart");
LOG((" OnStateStart [this=%x]\n", this));
LOG((" OnStateStart [this=%p]\n", this));
nsresult rv;
@ -429,7 +429,7 @@ uint32_t
nsInputStreamPump::OnStateTransfer()
{
PROFILER_LABEL("Input", "nsInputStreamPump::OnStateTransfer");
LOG((" OnStateTransfer [this=%x]\n", this));
LOG((" OnStateTransfer [this=%p]\n", this));
// if canceled, go directly to STATE_STOP...
if (NS_FAILED(mStatus))
@ -537,7 +537,7 @@ uint32_t
nsInputStreamPump::OnStateStop()
{
PROFILER_LABEL("Input", "nsInputStreamPump::OnStateTransfer");
LOG((" OnStateStop [this=%x status=%x]\n", this, mStatus));
LOG((" OnStateStop [this=%p status=%x]\n", this, mStatus));
// if an error occurred, we must be sure to pass the error onto the async
// stream. in some cases, this is redundant, but since close is idempotent,

4
netwerk/base/src/nsRequestObserverProxy.cpp
Просмотреть файл

@ -128,7 +128,7 @@ nsRequestObserverProxy::OnStartRequest(nsIRequest *request,
nsISupports *context)
{
MOZ_ASSERT(!context || context == mContext);
LOG(("nsRequestObserverProxy::OnStartRequest [this=%x req=%x]\n", this, request));
LOG(("nsRequestObserverProxy::OnStartRequest [this=%p req=%x]\n", this, request));
nsOnStartRequestEvent *ev =
new nsOnStartRequestEvent(this, request);
@ -148,7 +148,7 @@ nsRequestObserverProxy::OnStopRequest(nsIRequest *request,
nsresult status)
{
MOZ_ASSERT(!context || context == mContext);
LOG(("nsRequestObserverProxy: OnStopRequest [this=%x req=%x status=%x]\n",
LOG(("nsRequestObserverProxy: OnStopRequest [this=%p req=%x status=%x]\n",
this, request, status));
// The status argument is ignored because, by the time the OnStopRequestEvent

48
netwerk/base/src/nsSocketTransport2.cpp
Просмотреть файл

@ -201,7 +201,7 @@ nsSocketInputStream::~nsSocketInputStream()
void
nsSocketInputStream::OnSocketReady(nsresult condition)
{
SOCKET_LOG(("nsSocketInputStream::OnSocketReady [this=%x cond=%x]\n",
SOCKET_LOG(("nsSocketInputStream::OnSocketReady [this=%p cond=%x]\n",
this, condition));
NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@ -255,7 +255,7 @@ nsSocketInputStream::Close()
NS_IMETHODIMP
nsSocketInputStream::Available(uint64_t *avail)
{
SOCKET_LOG(("nsSocketInputStream::Available [this=%x]\n", this));
SOCKET_LOG(("nsSocketInputStream::Available [this=%p]\n", this));
*avail = 0;
@ -282,7 +282,7 @@ nsSocketInputStream::Available(uint64_t *avail)
char c;
n = PR_Recv(fd, &c, 1, PR_MSG_PEEK, 0);
SOCKET_LOG(("nsSocketInputStream::Available [this=%x] "
SOCKET_LOG(("nsSocketInputStream::Available [this=%p] "
"using PEEK backup n=%d]\n", this, n));
}
@ -310,7 +310,7 @@ nsSocketInputStream::Available(uint64_t *avail)
NS_IMETHODIMP
nsSocketInputStream::Read(char *buf, uint32_t count, uint32_t *countRead)
{
SOCKET_LOG(("nsSocketInputStream::Read [this=%x count=%u]\n", this, count));
SOCKET_LOG(("nsSocketInputStream::Read [this=%p count=%u]\n", this, count));
*countRead = 0;
@ -384,7 +384,7 @@ nsSocketInputStream::IsNonBlocking(bool *nonblocking)
NS_IMETHODIMP
nsSocketInputStream::CloseWithStatus(nsresult reason)
{
SOCKET_LOG(("nsSocketInputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
SOCKET_LOG(("nsSocketInputStream::CloseWithStatus [this=%p reason=%x]\n", this, reason));
// may be called from any thread
@ -408,7 +408,7 @@ nsSocketInputStream::AsyncWait(nsIInputStreamCallback *callback,
uint32_t amount,
nsIEventTarget *target)
{
SOCKET_LOG(("nsSocketInputStream::AsyncWait [this=%x]\n", this));
SOCKET_LOG(("nsSocketInputStream::AsyncWait [this=%p]\n", this));
// This variable will be non-null when we want to call the callback
// directly from this function, but outside the lock.
@ -463,7 +463,7 @@ nsSocketOutputStream::~nsSocketOutputStream()
void
nsSocketOutputStream::OnSocketReady(nsresult condition)
{
SOCKET_LOG(("nsSocketOutputStream::OnSocketReady [this=%x cond=%x]\n",
SOCKET_LOG(("nsSocketOutputStream::OnSocketReady [this=%p cond=%x]\n",
this, condition));
NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@ -523,7 +523,7 @@ nsSocketOutputStream::Flush()
NS_IMETHODIMP
nsSocketOutputStream::Write(const char *buf, uint32_t count, uint32_t *countWritten)
{
SOCKET_LOG(("nsSocketOutputStream::Write [this=%x count=%u]\n", this, count));
SOCKET_LOG(("nsSocketOutputStream::Write [this=%p count=%u]\n", this, count));
*countWritten = 0;
@ -618,7 +618,7 @@ nsSocketOutputStream::IsNonBlocking(bool *nonblocking)
NS_IMETHODIMP
nsSocketOutputStream::CloseWithStatus(nsresult reason)
{
SOCKET_LOG(("nsSocketOutputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
SOCKET_LOG(("nsSocketOutputStream::CloseWithStatus [this=%p reason=%x]\n", this, reason));
// may be called from any thread
@ -642,7 +642,7 @@ nsSocketOutputStream::AsyncWait(nsIOutputStreamCallback *callback,
uint32_t amount,
nsIEventTarget *target)
{
SOCKET_LOG(("nsSocketOutputStream::AsyncWait [this=%x]\n", this));
SOCKET_LOG(("nsSocketOutputStream::AsyncWait [this=%p]\n", this));
{
MutexAutoLock lock(mTransport->mLock);
@ -742,7 +742,7 @@ nsSocketTransport::Init(const char **types, uint32_t typeCount,
proxyType = nullptr;
}
SOCKET_LOG(("nsSocketTransport::Init [this=%x host=%s:%hu proxy=%s:%hu]\n",
SOCKET_LOG(("nsSocketTransport::Init [this=%p host=%s:%hu proxy=%s:%hu]\n",
this, mHost.get(), mPort, mProxyHost.get(), mProxyPort));
// include proxy type as a socket type if proxy type is not "http"
@ -853,7 +853,7 @@ nsSocketTransport::PostEvent(uint32_t type, nsresult status, nsISupports *param)
void
nsSocketTransport::SendStatus(nsresult status)
{
SOCKET_LOG(("nsSocketTransport::SendStatus [this=%x status=%x]\n", this, status));
SOCKET_LOG(("nsSocketTransport::SendStatus [this=%p status=%x]\n", this, status));
nsCOMPtr<nsITransportEventSink> sink;
uint64_t progress;
@ -879,7 +879,7 @@ nsSocketTransport::SendStatus(nsresult status)
nsresult
nsSocketTransport::ResolveHost()
{
SOCKET_LOG(("nsSocketTransport::ResolveHost [this=%x]\n", this));
SOCKET_LOG(("nsSocketTransport::ResolveHost [this=%p]\n", this));
nsresult rv;
@ -936,7 +936,7 @@ nsSocketTransport::ResolveHost()
nsresult
nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &usingSSL)
{
SOCKET_LOG(("nsSocketTransport::BuildSocket [this=%x]\n", this));
SOCKET_LOG(("nsSocketTransport::BuildSocket [this=%p]\n", this));
nsresult rv;
@ -1047,7 +1047,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us
nsresult
nsSocketTransport::InitiateSocket()
{
SOCKET_LOG(("nsSocketTransport::InitiateSocket [this=%x]\n", this));
SOCKET_LOG(("nsSocketTransport::InitiateSocket [this=%p]\n", this));
nsresult rv;
@ -1243,7 +1243,7 @@ nsSocketTransport::RecoverFromError()
{
NS_ASSERTION(NS_FAILED(mCondition), "there should be something wrong");
SOCKET_LOG(("nsSocketTransport::RecoverFromError [this=%x state=%x cond=%x]\n",
SOCKET_LOG(("nsSocketTransport::RecoverFromError [this=%p state=%x cond=%x]\n",
this, mState, mCondition));
// can only recover from errors in these states
@ -1334,7 +1334,7 @@ nsSocketTransport::RecoverFromError()
void
nsSocketTransport::OnMsgInputClosed(nsresult reason)
{
SOCKET_LOG(("nsSocketTransport::OnMsgInputClosed [this=%x reason=%x]\n",
SOCKET_LOG(("nsSocketTransport::OnMsgInputClosed [this=%p reason=%x]\n",
this, reason));
NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@ -1356,7 +1356,7 @@ nsSocketTransport::OnMsgInputClosed(nsresult reason)
void
nsSocketTransport::OnMsgOutputClosed(nsresult reason)
{
SOCKET_LOG(("nsSocketTransport::OnMsgOutputClosed [this=%x reason=%x]\n",
SOCKET_LOG(("nsSocketTransport::OnMsgOutputClosed [this=%p reason=%x]\n",
this, reason));
NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@ -1449,7 +1449,7 @@ nsSocketTransport::ReleaseFD_Locked(PRFileDesc *fd)
if (--mFDref == 0) {
if (PR_GetCurrentThread() == gSocketThread) {
SOCKET_LOG(("nsSocketTransport: calling PR_Close [this=%x]\n", this));
SOCKET_LOG(("nsSocketTransport: calling PR_Close [this=%p]\n", this));
PR_Close(mFD);
} else {
// Can't PR_Close() a socket off STS thread. Thunk it to STS to die
@ -1552,7 +1552,7 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa
}
if (NS_FAILED(mCondition)) {
SOCKET_LOG((" after event [this=%x cond=%x]\n", this, mCondition));
SOCKET_LOG((" after event [this=%p cond=%x]\n", this, mCondition));
if (!mAttached) // need to process this error ourselves...
OnSocketDetached(nullptr);
}
@ -1566,7 +1566,7 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa
void
nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
{
SOCKET_LOG(("nsSocketTransport::OnSocketReady [this=%x outFlags=%hd]\n",
SOCKET_LOG(("nsSocketTransport::OnSocketReady [this=%p outFlags=%hd]\n",
this, outFlags));
if (outFlags == -1) {
@ -1648,7 +1648,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
void
nsSocketTransport::OnSocketDetached(PRFileDesc *fd)
{
SOCKET_LOG(("nsSocketTransport::OnSocketDetached [this=%x cond=%x]\n",
SOCKET_LOG(("nsSocketTransport::OnSocketDetached [this=%p cond=%x]\n",
this, mCondition));
NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@ -1742,7 +1742,7 @@ nsSocketTransport::OpenInputStream(uint32_t flags,
uint32_t segcount,
nsIInputStream **result)
{
SOCKET_LOG(("nsSocketTransport::OpenInputStream [this=%x flags=%x]\n",
SOCKET_LOG(("nsSocketTransport::OpenInputStream [this=%p flags=%x]\n",
this, flags));
NS_ENSURE_TRUE(!mInput.IsReferenced(), NS_ERROR_UNEXPECTED);
@ -1789,7 +1789,7 @@ nsSocketTransport::OpenOutputStream(uint32_t flags,
uint32_t segcount,
nsIOutputStream **result)
{
SOCKET_LOG(("nsSocketTransport::OpenOutputStream [this=%x flags=%x]\n",
SOCKET_LOG(("nsSocketTransport::OpenOutputStream [this=%p flags=%x]\n",
this, flags));
NS_ENSURE_TRUE(!mOutput.IsReferenced(), NS_ERROR_UNEXPECTED);

10
netwerk/protocol/ftp/FTPChannelChild.cpp
Просмотреть файл

@ -140,7 +140,7 @@ FTPChannelChild::GetUploadStream(nsIInputStream** stream)
NS_IMETHODIMP
FTPChannelChild::AsyncOpen(::nsIStreamListener* listener, nsISupports* aContext)
{
LOG(("FTPChannelChild::AsyncOpen [this=%x]\n", this));
LOG(("FTPChannelChild::AsyncOpen [this=%p]\n", this));
NS_ENSURE_TRUE((gNeckoChild), NS_ERROR_FAILURE);
NS_ENSURE_ARG_POINTER(listener);
@ -259,7 +259,7 @@ FTPChannelChild::DoOnStartRequest(const int64_t& aContentLength,
const nsCString& aEntityID,
const URIParams& aURI)
{
LOG(("FTPChannelChild::RecvOnStartRequest [this=%x]\n", this));
LOG(("FTPChannelChild::RecvOnStartRequest [this=%p]\n", this));
mContentLength = aContentLength;
SetContentType(aContentType);
@ -309,7 +309,7 @@ FTPChannelChild::DoOnDataAvailable(const nsCString& data,
const uint64_t& offset,
const uint32_t& count)
{
LOG(("FTPChannelChild::RecvOnDataAvailable [this=%x]\n", this));
LOG(("FTPChannelChild::RecvOnDataAvailable [this=%p]\n", this));
if (mCanceled)
return;
@ -362,7 +362,7 @@ FTPChannelChild::RecvOnStopRequest(const nsresult& statusCode)
void
FTPChannelChild::DoOnStopRequest(const nsresult& statusCode)
{
LOG(("FTPChannelChild::RecvOnStopRequest [this=%x status=%u]\n",
LOG(("FTPChannelChild::RecvOnStopRequest [this=%p status=%u]\n",
this, statusCode));
if (!mCanceled)
@ -531,7 +531,7 @@ NS_IMETHODIMP
FTPChannelChild::CompleteRedirectSetup(nsIStreamListener *listener,
nsISupports *aContext)
{
LOG(("FTPChannelChild::CompleteRedirectSetup [this=%x]\n", this));
LOG(("FTPChannelChild::CompleteRedirectSetup [this=%p]\n", this));
NS_ENSURE_TRUE(!mIsPending, NS_ERROR_IN_PROGRESS);
NS_ENSURE_TRUE(!mWasOpened, NS_ERROR_ALREADY_OPENED);

8
netwerk/protocol/ftp/FTPChannelParent.cpp
Просмотреть файл

@ -73,7 +73,7 @@ FTPChannelParent::RecvAsyncOpen(const URIParams& aURI,
#ifdef DEBUG
nsCString uriSpec;
uri->GetSpec(uriSpec);
LOG(("FTPChannelParent RecvAsyncOpen [this=%x uri=%s]\n",
LOG(("FTPChannelParent RecvAsyncOpen [this=%p uri=%s]\n",
this, uriSpec.get()));
#endif
@ -164,7 +164,7 @@ FTPChannelParent::RecvResume()
NS_IMETHODIMP
FTPChannelParent::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
{
LOG(("FTPChannelParent::OnStartRequest [this=%x]\n", this));
LOG(("FTPChannelParent::OnStartRequest [this=%p]\n", this));
nsFtpChannel* chan = static_cast<nsFtpChannel*>(aRequest);
int64_t contentLength;
@ -192,7 +192,7 @@ FTPChannelParent::OnStopRequest(nsIRequest* aRequest,
nsISupports* aContext,
nsresult aStatusCode)
{
LOG(("FTPChannelParent::OnStopRequest: [this=%x status=%ul]\n",
LOG(("FTPChannelParent::OnStopRequest: [this=%p status=%ul]\n",
this, aStatusCode));
if (mIPCClosed || !SendOnStopRequest(aStatusCode)) {
@ -213,7 +213,7 @@ FTPChannelParent::OnDataAvailable(nsIRequest* aRequest,
uint64_t aOffset,
uint32_t aCount)
{
LOG(("FTPChannelParent::OnDataAvailable [this=%x]\n", this));
LOG(("FTPChannelParent::OnDataAvailable [this=%p]\n", this));
nsCString data;
nsresult rv = NS_ReadInputStreamToString(aInputStream, data, aCount);

10
netwerk/protocol/http/HttpChannelChild.cpp
Просмотреть файл

@ -250,7 +250,7 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
const NetAddr& selfAddr,
const NetAddr& peerAddr)
{
LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this));
LOG(("HttpChannelChild::RecvOnStartRequest [this=%p]\n", this));
if (useResponseHead && !mCanceled)
mResponseHead = new nsHttpResponseHead(responseHead);
@ -350,7 +350,7 @@ HttpChannelChild::OnTransportAndData(const nsresult& status,
const uint64_t& offset,
const uint32_t& count)
{
LOG(("HttpChannelChild::OnTransportAndData [this=%x]\n", this));
LOG(("HttpChannelChild::OnTransportAndData [this=%p]\n", this));
if (mCanceled)
return;
@ -439,7 +439,7 @@ HttpChannelChild::RecvOnStopRequest(const nsresult& statusCode)
void
HttpChannelChild::OnStopRequest(const nsresult& statusCode)
{
LOG(("HttpChannelChild::OnStopRequest [this=%x status=%u]\n",
LOG(("HttpChannelChild::OnStopRequest [this=%p status=%x]\n",
this, statusCode));
mIsPending = false;
@ -829,7 +829,7 @@ NS_IMETHODIMP
HttpChannelChild::CompleteRedirectSetup(nsIStreamListener *listener,
nsISupports *aContext)
{
LOG(("HttpChannelChild::FinishRedirectSetup [this=%x]\n", this));
LOG(("HttpChannelChild::FinishRedirectSetup [this=%p]\n", this));
NS_ENSURE_TRUE(!mIsPending, NS_ERROR_IN_PROGRESS);
NS_ENSURE_TRUE(!mWasOpened, NS_ERROR_ALREADY_OPENED);
@ -973,7 +973,7 @@ HttpChannelChild::GetSecurityInfo(nsISupports **aSecurityInfo)
NS_IMETHODIMP
HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext)
{
LOG(("HttpChannelChild::AsyncOpen [this=%x uri=%s]\n", this, mSpec.get()));
LOG(("HttpChannelChild::AsyncOpen [this=%p uri=%s]\n", this, mSpec.get()));
if (mCanceled)
return mStatus;

8
netwerk/protocol/http/HttpChannelParent.cpp
Просмотреть файл

@ -142,7 +142,7 @@ HttpChannelParent::RecvAsyncOpen(const URIParams& aURI,
nsCString uriSpec;
uri->GetSpec(uriSpec);
LOG(("HttpChannelParent RecvAsyncOpen [this=%x uri=%s]\n",
LOG(("HttpChannelParent RecvAsyncOpen [this=%p uri=%s]\n",
this, uriSpec.get()));
nsresult rv;
@ -398,7 +398,7 @@ HttpChannelParent::RecvMarkOfflineCacheEntryAsForeign()
NS_IMETHODIMP
HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
{
LOG(("HttpChannelParent::OnStartRequest [this=%x]\n", this));
LOG(("HttpChannelParent::OnStartRequest [this=%p]\n", this));
nsHttpChannel *chan = static_cast<nsHttpChannel *>(aRequest);
nsHttpResponseHead *responseHead = chan->GetResponseHead();
@ -465,7 +465,7 @@ HttpChannelParent::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode)
{
LOG(("HttpChannelParent::OnStopRequest: [this=%x status=%ul]\n",
LOG(("HttpChannelParent::OnStopRequest: [this=%p status=%x]\n",
this, aStatusCode));
if (mIPCClosed || !SendOnStopRequest(aStatusCode))
@ -484,7 +484,7 @@ HttpChannelParent::OnDataAvailable(nsIRequest *aRequest,
uint64_t aOffset,
uint32_t aCount)
{
LOG(("HttpChannelParent::OnDataAvailable [this=%x]\n", this));
LOG(("HttpChannelParent::OnDataAvailable [this=%p]\n", this));
nsCString data;
nsresult rv = NS_ReadInputStreamToString(aInputStream, data, aCount);

6
netwerk/protocol/http/HttpChannelParentListener.cpp
Просмотреть файл

@ -59,7 +59,7 @@ HttpChannelParentListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aCo
if (!mActiveChannel)
return NS_ERROR_UNEXPECTED;
LOG(("HttpChannelParentListener::OnStartRequest [this=%x]\n", this));
LOG(("HttpChannelParentListener::OnStartRequest [this=%p]\n", this));
return mActiveChannel->OnStartRequest(aRequest, aContext);
}
@ -71,7 +71,7 @@ HttpChannelParentListener::OnStopRequest(nsIRequest *aRequest,
if (!mActiveChannel)
return NS_ERROR_UNEXPECTED;
LOG(("HttpChannelParentListener::OnStopRequest: [this=%x status=%ul]\n",
LOG(("HttpChannelParentListener::OnStopRequest: [this=%p status=%ul]\n",
this, aStatusCode));
nsresult rv = mActiveChannel->OnStopRequest(aRequest, aContext, aStatusCode);
@ -93,7 +93,7 @@ HttpChannelParentListener::OnDataAvailable(nsIRequest *aRequest,
if (!mActiveChannel)
return NS_ERROR_UNEXPECTED;
LOG(("HttpChannelParentListener::OnDataAvailable [this=%x]\n", this));
LOG(("HttpChannelParentListener::OnDataAvailable [this=%p]\n", this));
return mActiveChannel->OnDataAvailable(aRequest, aContext, aInputStream, aOffset, aCount);
}

10
netwerk/protocol/http/nsHttpChannel.cpp
Просмотреть файл

@ -3699,7 +3699,7 @@ nsHttpChannel::AddCacheEntryHeaders(nsICacheEntryDescriptor *entry)
{
nsresult rv;
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%x] begin", this));
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%p] begin", this));
// Store secure data in memory only
if (mSecurityInfo)
entry->SetSecurityInfo(mSecurityInfo);
@ -3734,7 +3734,7 @@ nsHttpChannel::AddCacheEntryHeaders(nsICacheEntryDescriptor *entry)
char *val = buf.BeginWriting(); // going to munge buf
char *token = nsCRT::strtok(val, NS_HTTP_HEADER_SEPS, &val);
while (token) {
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%x] " \
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%p] " \
"processing %s", this, token));
if (*token != '*') {
nsHttpAtom atom = nsHttp::ResolveAtom(token);
@ -3743,7 +3743,7 @@ nsHttpChannel::AddCacheEntryHeaders(nsICacheEntryDescriptor *entry)
if (val) {
// If cookie-header, store a hash of the value
if (atom == nsHttp::Cookie) {
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%x] " \
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%p] " \
"cookie-value %s", this, val));
rv = Hash(val, hash);
// If hash failed, store a string not very likely
@ -3760,7 +3760,7 @@ nsHttpChannel::AddCacheEntryHeaders(nsICacheEntryDescriptor *entry)
metaKey = prefix + nsDependentCString(token);
entry->SetMetaDataElement(metaKey.get(), val);
} else {
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%x] " \
LOG(("nsHttpChannel::AddCacheEntryHeaders [this=%p] " \
"clearing metadata for %s", this, token));
metaKey = prefix + nsDependentCString(token);
entry->SetMetaDataElement(metaKey.get(), nullptr);
@ -4553,7 +4553,7 @@ nsHttpChannel::SetupFallbackChannel(const char *aFallbackKey)
{
ENSURE_CALLED_BEFORE_CONNECT();
LOG(("nsHttpChannel::SetupFallbackChannel [this=%x, key=%s]",
LOG(("nsHttpChannel::SetupFallbackChannel [this=%p, key=%s]",
this, aFallbackKey));
mFallbackChannel = true;
mFallbackKey = aFallbackKey;

12
netwerk/protocol/http/nsHttpConnection.cpp
Просмотреть файл

@ -302,7 +302,7 @@ nsHttpConnection::Activate(nsAHttpTransaction *trans, uint32_t caps, int32_t pri
nsresult rv;
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
LOG(("nsHttpConnection::Activate [this=%x trans=%x caps=%x]\n",
LOG(("nsHttpConnection::Activate [this=%p trans=%x caps=%x]\n",
this, trans, caps));
mPriority = pri;
@ -465,7 +465,7 @@ nsHttpConnection::AddTransaction(nsAHttpTransaction *httpTransaction,
void
nsHttpConnection::Close(nsresult reason)
{
LOG(("nsHttpConnection::Close [this=%x reason=%x]\n", this, reason));
LOG(("nsHttpConnection::Close [this=%p reason=%x]\n", this, reason));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -507,7 +507,7 @@ nsHttpConnection::Close(nsresult reason)
nsresult
nsHttpConnection::ProxyStartSSL()
{
LOG(("nsHttpConnection::ProxyStartSSL [this=%x]\n", this));
LOG(("nsHttpConnection::ProxyStartSSL [this=%p]\n", this));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
nsCOMPtr<nsISupports> securityInfo;
@ -1161,7 +1161,7 @@ nsHttpConnection::EndIdleMonitoring()
void
nsHttpConnection::CloseTransaction(nsAHttpTransaction *trans, nsresult reason)
{
LOG(("nsHttpConnection::CloseTransaction[this=%x trans=%x reason=%x]\n",
LOG(("nsHttpConnection::CloseTransaction[this=%p trans=%x reason=%x]\n",
this, trans, reason));
MOZ_ASSERT(trans == mTransaction, "wrong transaction");
@ -1365,7 +1365,7 @@ nsHttpConnection::OnWriteSegment(char *buf,
nsresult
nsHttpConnection::OnSocketReadable()
{
LOG(("nsHttpConnection::OnSocketReadable [this=%x]\n", this));
LOG(("nsHttpConnection::OnSocketReadable [this=%p]\n", this));
PRIntervalTime now = PR_IntervalNow();
PRIntervalTime delta = now - mLastReadTime;
@ -1473,7 +1473,7 @@ nsHttpConnection::SetupProxyConnect()
{
const char *val;
LOG(("nsHttpConnection::SetupProxyConnect [this=%x]\n", this));
LOG(("nsHttpConnection::SetupProxyConnect [this=%p]\n", this));
NS_ENSURE_TRUE(!mProxyConnectStream, NS_ERROR_ALREADY_INITIALIZED);
MOZ_ASSERT(!mUsingSpdyVersion,

4
netwerk/protocol/http/nsHttpHandler.cpp
Просмотреть файл

@ -202,7 +202,7 @@ nsHttpHandler::nsHttpHandler()
gHttpLog = PR_NewLogModule("nsHttp");
#endif
LOG(("Creating nsHttpHandler [this=%x].\n", this));
LOG(("Creating nsHttpHandler [this=%p].\n", this));
MOZ_ASSERT(!gHttpHandler, "HTTP handler already created!");
gHttpHandler = this;
@ -210,7 +210,7 @@ nsHttpHandler::nsHttpHandler()
nsHttpHandler::~nsHttpHandler()
{
LOG(("Deleting nsHttpHandler [this=%x]\n", this));
LOG(("Deleting nsHttpHandler [this=%p]\n", this));
// make sure the connection manager is shutdown
if (mConnMgr) {

20
netwerk/protocol/http/nsHttpPipeline.cpp
Просмотреть файл

@ -91,7 +91,7 @@ nsHttpPipeline::~nsHttpPipeline()
nsresult
nsHttpPipeline::AddTransaction(nsAHttpTransaction *trans)
{
LOG(("nsHttpPipeline::AddTransaction [this=%x trans=%x]\n", this, trans));
LOG(("nsHttpPipeline::AddTransaction [this=%p trans=%x]\n", this, trans));
if (mRequestQ.Length() || mResponseQ.Length())
mUtilizedPipeline = true;
@ -178,7 +178,7 @@ nsHttpPipeline::OnHeadersAvailable(nsAHttpTransaction *trans,
nsHttpResponseHead *responseHead,
bool *reset)
{
LOG(("nsHttpPipeline::OnHeadersAvailable [this=%x]\n", this));
LOG(("nsHttpPipeline::OnHeadersAvailable [this=%p]\n", this));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
MOZ_ASSERT(mConnection, "no connection");
@ -206,7 +206,7 @@ nsHttpPipeline::OnHeadersAvailable(nsAHttpTransaction *trans,
void
nsHttpPipeline::CloseTransaction(nsAHttpTransaction *trans, nsresult reason)
{
LOG(("nsHttpPipeline::CloseTransaction [this=%x trans=%x reason=%x]\n",
LOG(("nsHttpPipeline::CloseTransaction [this=%p trans=%x reason=%x]\n",
this, trans, reason));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -287,7 +287,7 @@ nsHttpPipeline::DontReuse()
nsresult
nsHttpPipeline::PushBack(const char *data, uint32_t length)
{
LOG(("nsHttpPipeline::PushBack [this=%x len=%u]\n", this, length));
LOG(("nsHttpPipeline::PushBack [this=%p len=%u]\n", this, length));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
MOZ_ASSERT(mPushBackLen == 0, "push back buffer already has data!");
@ -404,7 +404,7 @@ nsHttpPipeline::TakeSubTransactions(
void
nsHttpPipeline::SetConnection(nsAHttpConnection *conn)
{
LOG(("nsHttpPipeline::SetConnection [this=%x conn=%x]\n", this, conn));
LOG(("nsHttpPipeline::SetConnection [this=%p conn=%x]\n", this, conn));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
MOZ_ASSERT(!mConnection, "already have a connection");
@ -415,7 +415,7 @@ nsHttpPipeline::SetConnection(nsAHttpConnection *conn)
nsAHttpConnection *
nsHttpPipeline::Connection()
{
LOG(("nsHttpPipeline::Connection [this=%x conn=%x]\n", this, mConnection));
LOG(("nsHttpPipeline::Connection [this=%p conn=%x]\n", this, mConnection));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
return mConnection;
@ -444,7 +444,7 @@ void
nsHttpPipeline::OnTransportStatus(nsITransport* transport,
nsresult status, uint64_t progress)
{
LOG(("nsHttpPipeline::OnStatus [this=%x status=%x progress=%llu]\n",
LOG(("nsHttpPipeline::OnStatus [this=%p status=%x progress=%llu]\n",
this, status, progress));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -588,7 +588,7 @@ nsHttpPipeline::ReadSegments(nsAHttpSegmentReader *reader,
uint32_t count,
uint32_t *countRead)
{
LOG(("nsHttpPipeline::ReadSegments [this=%x count=%u]\n", this, count));
LOG(("nsHttpPipeline::ReadSegments [this=%p count=%u]\n", this, count));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -636,7 +636,7 @@ nsHttpPipeline::WriteSegments(nsAHttpSegmentWriter *writer,
uint32_t count,
uint32_t *countWritten)
{
LOG(("nsHttpPipeline::WriteSegments [this=%x count=%u]\n", this, count));
LOG(("nsHttpPipeline::WriteSegments [this=%p count=%u]\n", this, count));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -766,7 +766,7 @@ nsHttpPipeline::CancelPipeline(nsresult originalReason)
void
nsHttpPipeline::Close(nsresult reason)
{
LOG(("nsHttpPipeline::Close [this=%x reason=%x]\n", this, reason));
LOG(("nsHttpPipeline::Close [this=%p reason=%x]\n", this, reason));
if (mClosed) {
LOG((" already closed\n"));

6
netwerk/protocol/http/nsHttpResponseHead.cpp
Просмотреть файл

@ -98,7 +98,7 @@ nsresult
nsHttpResponseHead::Parse(char *block)
{
LOG(("nsHttpResponseHead::Parse [this=%x]\n", this));
LOG(("nsHttpResponseHead::Parse [this=%p]\n", this));
// this command works on a buffer as prepared by Flatten, as such it is
// not very forgiving ;-)
@ -223,7 +223,7 @@ nsHttpResponseHead::ComputeCurrentAge(uint32_t now,
*result = 0;
if (NS_FAILED(GetDateValue(&dateValue))) {
LOG(("nsHttpResponseHead::ComputeCurrentAge [this=%x] "
LOG(("nsHttpResponseHead::ComputeCurrentAge [this=%p] "
"Date response header not set!\n", this));
// Assume we have a fast connection and that our clock
// is in sync with the server.
@ -409,7 +409,7 @@ nsHttpResponseHead::ExpiresInPast() const
nsresult
nsHttpResponseHead::UpdateHeaders(const nsHttpHeaderArray &headers)
{
LOG(("nsHttpResponseHead::UpdateHeaders [this=%x]\n", this));
LOG(("nsHttpResponseHead::UpdateHeaders [this=%p]\n", this));
uint32_t i, count = headers.Count();
for (i=0; i<count; ++i) {

18
netwerk/protocol/http/nsHttpTransaction.cpp
Просмотреть файл

@ -197,7 +197,7 @@ nsHttpTransaction::Init(uint32_t caps,
"net::http::transaction");
nsresult rv;
LOG(("nsHttpTransaction::Init [this=%x caps=%x]\n", this, caps));
LOG(("nsHttpTransaction::Init [this=%p caps=%x]\n", this, caps));
MOZ_ASSERT(cinfo);
MOZ_ASSERT(requestHead);
@ -214,7 +214,7 @@ nsHttpTransaction::Init(uint32_t caps,
mChannel = do_QueryInterface(eventsink);
LOG(("nsHttpTransaction::Init() " \
"mActivityDistributor is active " \
"this=%x", this));
"this=%p", this));
} else {
// there is no observer, so don't use it
activityDistributorActive = false;
@ -440,7 +440,7 @@ void
nsHttpTransaction::OnTransportStatus(nsITransport* transport,
nsresult status, uint64_t progress)
{
LOG(("nsHttpTransaction::OnSocketStatus [this=%x status=%x progress=%llu]\n",
LOG(("nsHttpTransaction::OnSocketStatus [this=%p status=%x progress=%llu]\n",
this, status, progress));
if (TimingEnabled()) {
@ -687,7 +687,7 @@ nsHttpTransaction::WriteSegments(nsAHttpSegmentWriter *writer,
void
nsHttpTransaction::Close(nsresult reason)
{
LOG(("nsHttpTransaction::Close [this=%x reason=%x]\n", this, reason));
LOG(("nsHttpTransaction::Close [this=%p reason=%x]\n", this, reason));
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
@ -1239,7 +1239,7 @@ nsHttpTransaction::ParseHead(char *buf,
nsresult
nsHttpTransaction::HandleContentStart()
{
LOG(("nsHttpTransaction::HandleContentStart [this=%x]\n", this));
LOG(("nsHttpTransaction::HandleContentStart [this=%p]\n", this));
if (mResponseHead) {
#if defined(PR_LOGGING)
@ -1352,7 +1352,7 @@ nsHttpTransaction::HandleContent(char *buf,
{
nsresult rv;
LOG(("nsHttpTransaction::HandleContent [this=%x count=%u]\n", this, count));
LOG(("nsHttpTransaction::HandleContent [this=%p count=%u]\n", this, count));
*contentRead = 0;
*contentRemaining = 0;
@ -1424,7 +1424,7 @@ nsHttpTransaction::HandleContent(char *buf,
*/
}
LOG(("nsHttpTransaction::HandleContent [this=%x count=%u read=%u mContentRead=%lld mContentLength=%lld]\n",
LOG(("nsHttpTransaction::HandleContent [this=%p count=%u read=%u mContentRead=%lld mContentLength=%lld]\n",
this, count, *contentRead, mContentRead, mContentLength));
// Check the size of chunked responses. If we exceed the max pipeline size
@ -1466,7 +1466,7 @@ nsHttpTransaction::ProcessData(char *buf, uint32_t count, uint32_t *countRead)
{
nsresult rv;
LOG(("nsHttpTransaction::ProcessData [this=%x count=%u]\n", this, count));
LOG(("nsHttpTransaction::ProcessData [this=%p count=%u]\n", this, count));
*countRead = 0;
@ -1628,7 +1628,7 @@ private:
void
nsHttpTransaction::DeleteSelfOnConsumerThread()
{
LOG(("nsHttpTransaction::DeleteSelfOnConsumerThread [this=%x]\n", this));
LOG(("nsHttpTransaction::DeleteSelfOnConsumerThread [this=%p]\n", this));
bool val;
if (!mConsumerTarget ||

10
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
Просмотреть файл

@ -134,7 +134,7 @@ WyciwygChannelChild::OnStartRequest(const nsresult& statusCode,
const nsCString& charset,
const nsCString& securityInfo)
{
LOG(("WyciwygChannelChild::RecvOnStartRequest [this=%x]\n", this));
LOG(("WyciwygChannelChild::RecvOnStartRequest [this=%p]\n", this));
mState = WCC_ONSTART;
@ -184,7 +184,7 @@ void
WyciwygChannelChild::OnDataAvailable(const nsCString& data,
const uint64_t& offset)
{
LOG(("WyciwygChannelChild::RecvOnDataAvailable [this=%x]\n", this));
LOG(("WyciwygChannelChild::RecvOnDataAvailable [this=%p]\n", this));
if (mCanceled)
return;
@ -244,7 +244,7 @@ WyciwygChannelChild::RecvOnStopRequest(const nsresult& statusCode)
void
WyciwygChannelChild::OnStopRequest(const nsresult& statusCode)
{
LOG(("WyciwygChannelChild::RecvOnStopRequest [this=%x status=%u]\n",
LOG(("WyciwygChannelChild::RecvOnStopRequest [this=%p status=%u]\n",
this, statusCode));
{ // We need to ensure that all IPDL message dispatching occurs
@ -300,7 +300,7 @@ WyciwygChannelChild::RecvCancelEarly(const nsresult& statusCode)
void WyciwygChannelChild::CancelEarly(const nsresult& statusCode)
{
LOG(("WyciwygChannelChild::CancelEarly [this=%x]\n", this));
LOG(("WyciwygChannelChild::CancelEarly [this=%p]\n", this));
if (mCanceled)
return;
@ -583,7 +583,7 @@ GetTabChild(nsIChannel* aChannel)
NS_IMETHODIMP
WyciwygChannelChild::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext)
{
LOG(("WyciwygChannelChild::AsyncOpen [this=%x]\n", this));
LOG(("WyciwygChannelChild::AsyncOpen [this=%p]\n", this));
// The only places creating wyciwyg: channels should be
// HTMLDocument::OpenCommon and session history. Both should be setting an

12
netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
Просмотреть файл

@ -68,7 +68,7 @@ WyciwygChannelParent::RecvInit(const URIParams& aURI)
nsCString uriSpec;
uri->GetSpec(uriSpec);
LOG(("WyciwygChannelParent RecvInit [this=%x uri=%s]\n",
LOG(("WyciwygChannelParent RecvInit [this=%p uri=%s]\n",
this, uriSpec.get()));
nsCOMPtr<nsIIOService> ios(do_GetIOService(&rv));
@ -91,7 +91,7 @@ bool
WyciwygChannelParent::RecvAppData(const IPC::SerializedLoadContext& loadContext,
PBrowserParent* parent)
{
LOG(("WyciwygChannelParent RecvAppData [this=%x]\n", this));
LOG(("WyciwygChannelParent RecvAppData [this=%p]\n", this));
if (!SetupAppData(loadContext, parent))
return false;
@ -135,7 +135,7 @@ WyciwygChannelParent::RecvAsyncOpen(const URIParams& aOriginal,
if (!original)
return false;
LOG(("WyciwygChannelParent RecvAsyncOpen [this=%x]\n", this));
LOG(("WyciwygChannelParent RecvAsyncOpen [this=%p]\n", this));
if (!mChannel)
return true;
@ -226,7 +226,7 @@ WyciwygChannelParent::RecvCancel(const nsresult& aStatusCode)
NS_IMETHODIMP
WyciwygChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
{
LOG(("WyciwygChannelParent::OnStartRequest [this=%x]\n", this));
LOG(("WyciwygChannelParent::OnStartRequest [this=%p]\n", this));
nsresult rv;
@ -269,7 +269,7 @@ WyciwygChannelParent::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode)
{
LOG(("WyciwygChannelParent::OnStopRequest: [this=%x status=%ul]\n",
LOG(("WyciwygChannelParent::OnStopRequest: [this=%p status=%ul]\n",
this, aStatusCode));
if (mIPCClosed || !SendOnStopRequest(aStatusCode)) {
@ -290,7 +290,7 @@ WyciwygChannelParent::OnDataAvailable(nsIRequest *aRequest,
uint64_t aOffset,
uint32_t aCount)
{
LOG(("WyciwygChannelParent::OnDataAvailable [this=%x]\n", this));
LOG(("WyciwygChannelParent::OnDataAvailable [this=%p]\n", this));
nsCString data;
nsresult rv = NS_ReadInputStreamToString(aInputStream, data, aCount);

16
netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
Просмотреть файл

@ -378,7 +378,7 @@ nsWyciwygChannel::Open(nsIInputStream ** aReturn)
NS_IMETHODIMP
nsWyciwygChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx)
{
LOG(("nsWyciwygChannel::AsyncOpen [this=%x]\n", this));
LOG(("nsWyciwygChannel::AsyncOpen [this=%p]\n", this));
NS_ENSURE_TRUE(!mIsPending, NS_ERROR_IN_PROGRESS);
NS_ENSURE_ARG_POINTER(listener);
@ -484,7 +484,7 @@ nsWyciwygChannel::CloseCacheEntryInternal(nsresult reason)
NS_ASSERTION(IsOnCacheIOThread(), "wrong thread");
if (mCacheEntry) {
LOG(("nsWyciwygChannel::CloseCacheEntryInternal [this=%x ]", this));
LOG(("nsWyciwygChannel::CloseCacheEntryInternal [this=%p ]", this));
mCacheOutputStream = 0;
mCacheInputStream = 0;
@ -571,7 +571,7 @@ nsWyciwygChannel::GetCharsetAndSource(int32_t* aSource, nsACString& aCharset)
NS_IMETHODIMP
nsWyciwygChannel::OnCacheEntryAvailable(nsICacheEntryDescriptor * aCacheEntry, nsCacheAccessMode aMode, nsresult aStatus)
{
LOG(("nsWyciwygChannel::OnCacheEntryAvailable [this=%x entry=%x "
LOG(("nsWyciwygChannel::OnCacheEntryAvailable [this=%p entry=%x "
"access=%x status=%x]\n", this, aCacheEntry, aMode, aStatus));
// if the channel's already fired onStopRequest,
@ -587,7 +587,7 @@ nsWyciwygChannel::OnCacheEntryAvailable(nsICacheEntryDescriptor * aCacheEntry, n
nsresult rv;
if (NS_FAILED(mStatus)) {
LOG(("channel was canceled [this=%x status=%x]\n", this, mStatus));
LOG(("channel was canceled [this=%p status=%x]\n", this, mStatus));
rv = mStatus;
}
else { // advance to the next state...
@ -619,7 +619,7 @@ nsWyciwygChannel::OnDataAvailable(nsIRequest *request, nsISupports *ctx,
nsIInputStream *input,
uint64_t offset, uint32_t count)
{
LOG(("nsWyciwygChannel::OnDataAvailable [this=%x request=%x offset=%llu count=%u]\n",
LOG(("nsWyciwygChannel::OnDataAvailable [this=%p request=%x offset=%llu count=%u]\n",
this, request, offset, count));
nsresult rv;
@ -641,7 +641,7 @@ nsWyciwygChannel::OnDataAvailable(nsIRequest *request, nsISupports *ctx,
NS_IMETHODIMP
nsWyciwygChannel::OnStartRequest(nsIRequest *request, nsISupports *ctx)
{
LOG(("nsWyciwygChannel::OnStartRequest [this=%x request=%x\n",
LOG(("nsWyciwygChannel::OnStartRequest [this=%p request=%x\n",
this, request));
return mListener->OnStartRequest(this, mListenerContext);
@ -651,7 +651,7 @@ nsWyciwygChannel::OnStartRequest(nsIRequest *request, nsISupports *ctx)
NS_IMETHODIMP
nsWyciwygChannel::OnStopRequest(nsIRequest *request, nsISupports *ctx, nsresult status)
{
LOG(("nsWyciwygChannel::OnStopRequest [this=%x request=%x status=%d\n",
LOG(("nsWyciwygChannel::OnStopRequest [this=%p request=%x status=%d\n",
this, request, status));
if (NS_SUCCEEDED(mStatus))
@ -722,7 +722,7 @@ nsWyciwygChannel::OpenCacheEntry(const nsACString & aCacheKey,
nsresult
nsWyciwygChannel::ReadFromCache()
{
LOG(("nsWyciwygChannel::ReadFromCache [this=%x] ", this));
LOG(("nsWyciwygChannel::ReadFromCache [this=%p] ", this));
NS_ENSURE_TRUE(mCacheEntry, NS_ERROR_FAILURE);
nsresult rv;

4
netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
Просмотреть файл

@ -32,12 +32,12 @@ nsWyciwygProtocolHandler::nsWyciwygProtocolHandler()
gWyciwygLog = PR_NewLogModule("nsWyciwygChannel");
#endif
LOG(("Creating nsWyciwygProtocolHandler [this=%x].\n", this));
LOG(("Creating nsWyciwygProtocolHandler [this=%p].\n", this));
}
nsWyciwygProtocolHandler::~nsWyciwygProtocolHandler()
{
LOG(("Deleting nsWyciwygProtocolHandler [this=%x]\n", this));
LOG(("Deleting nsWyciwygProtocolHandler [this=%p]\n", this));
}
nsresult

6
netwerk/test/TestOverlappedIO.cpp
Просмотреть файл

@ -135,18 +135,18 @@ TestProvider::TestProvider(char *data)
mDataLen = strlen(data);
mOffset = 0;
mRequestCount = 0;
LOG(("Constructing TestProvider [this=%x]\n", this));
LOG(("Constructing TestProvider [this=%p]\n", this));
}
TestProvider::~TestProvider()
{
LOG(("Destroying TestProvider [this=%x]\n", this));
LOG(("Destroying TestProvider [this=%p]\n", this));
}
NS_IMETHODIMP
TestProvider::OnStartRequest(nsIRequest* request, nsISupports* context)
{
LOG(("TestProvider::OnStartRequest [this=%x]\n", this));
LOG(("TestProvider::OnStartRequest [this=%p]\n", this));
return NS_OK;
}

6
netwerk/test/TestSocketIO.cpp
Просмотреть файл

@ -127,18 +127,18 @@ NS_IMPL_ISUPPORTS2(TestProvider,
TestProvider::TestProvider(char *data)
{
NS_NewByteArrayInputStream(getter_AddRefs(mData), data, strlen(data));
LOG(("Constructing TestProvider [this=%x]\n", this));
LOG(("Constructing TestProvider [this=%p]\n", this));
}
TestProvider::~TestProvider()
{
LOG(("Destroying TestProvider [this=%x]\n", this));
LOG(("Destroying TestProvider [this=%p]\n", this));
}
NS_IMETHODIMP
TestProvider::OnStartRequest(nsIRequest* request, nsISupports* context)
{
LOG(("TestProvider::OnStartRequest [this=%x]\n", this));
LOG(("TestProvider::OnStartRequest [this=%p]\n", this));
return NS_OK;
}