Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
This commit is contained in:
@@ -290,7 +290,7 @@ public:
|
||||
delete mData[i];
|
||||
}
|
||||
|
||||
PRBool ConditionallyConnect(nsCString &aStr, WebSocketChannel *ws)
|
||||
bool ConditionallyConnect(nsCString &aStr, WebSocketChannel *ws)
|
||||
{
|
||||
NS_ABORT_IF_FALSE(NS_IsMainThread(), "not main thread");
|
||||
|
||||
@@ -302,7 +302,7 @@ public:
|
||||
// we could hash this, but the dataset is expected to be
|
||||
// small
|
||||
|
||||
PRBool found = (IndexOf(aStr) >= 0);
|
||||
bool found = (IndexOf(aStr) >= 0);
|
||||
nsOpenConn *newdata = new nsOpenConn(aStr, ws);
|
||||
mData.AppendElement(newdata);
|
||||
|
||||
@@ -319,7 +319,7 @@ public:
|
||||
return !found;
|
||||
}
|
||||
|
||||
PRBool Complete(WebSocketChannel *aChannel)
|
||||
bool Complete(WebSocketChannel *aChannel)
|
||||
{
|
||||
NS_ABORT_IF_FALSE(NS_IsMainThread(), "not main thread");
|
||||
NS_ABORT_IF_FALSE(!aChannel->mOpenBlocked,
|
||||
@@ -341,7 +341,7 @@ public:
|
||||
return ConnectNext(aChannel->mAddress);
|
||||
}
|
||||
|
||||
PRBool Cancel(WebSocketChannel *aChannel)
|
||||
bool Cancel(WebSocketChannel *aChannel)
|
||||
{
|
||||
NS_ABORT_IF_FALSE(NS_IsMainThread(), "not main thread");
|
||||
PRInt32 index = IndexOf(aChannel);
|
||||
@@ -363,7 +363,7 @@ public:
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
PRBool ConnectNext(nsCString &hostName)
|
||||
bool ConnectNext(nsCString &hostName)
|
||||
{
|
||||
PRInt32 index = IndexOf(hostName);
|
||||
if (index >= 0) {
|
||||
@@ -464,7 +464,7 @@ public:
|
||||
deflateEnd(&mZlib);
|
||||
}
|
||||
|
||||
PRBool Active()
|
||||
bool Active()
|
||||
{
|
||||
return mActive;
|
||||
}
|
||||
@@ -533,7 +533,7 @@ private:
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool mActive;
|
||||
bool mActive;
|
||||
z_stream mZlib;
|
||||
nsCOMPtr<nsIStringInputStream> mStream;
|
||||
|
||||
@@ -691,7 +691,7 @@ WebSocketChannel::BeginOpen()
|
||||
return rv;
|
||||
}
|
||||
|
||||
PRBool
|
||||
bool
|
||||
WebSocketChannel::IsPersistentFramePtr()
|
||||
{
|
||||
return (mFramePtr >= mBuffer && mFramePtr < mBuffer + mBufferSize);
|
||||
@@ -1169,8 +1169,8 @@ WebSocketChannel::PrimeNewOutgoingMessage()
|
||||
NS_ABORT_IF_FALSE(PR_GetCurrentThread() == gSocketThread, "not socket thread");
|
||||
NS_ABORT_IF_FALSE(!mCurrentOut, "Current message in progress");
|
||||
|
||||
PRBool isPong = PR_FALSE;
|
||||
PRBool isPing = PR_FALSE;
|
||||
bool isPong = false;
|
||||
bool isPing = false;
|
||||
|
||||
mCurrentOut = (OutboundMessage *)mOutgoingPongMessages.PopFront();
|
||||
if (mCurrentOut) {
|
||||
@@ -1810,7 +1810,7 @@ WebSocketChannel::AsyncOnChannelRedirect(
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool isHttps = PR_FALSE;
|
||||
bool isHttps = false;
|
||||
rv = newuri->SchemeIs("https", &isHttps);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
@@ -1987,7 +1987,7 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
|
||||
|
||||
if (prefService) {
|
||||
PRInt32 intpref;
|
||||
PRBool boolpref;
|
||||
bool boolpref;
|
||||
rv = prefService->GetIntPref("network.websocket.max-message-size",
|
||||
&intpref);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
|
||||
Reference in New Issue
Block a user