Bug 1315470: booleans never turn negative. r=jesup
MozReview-Commit-ID: 8YkI17SMGYE
--- a/dom/base/nsDOMDataChannel.cpp
+++ b/dom/base/nsDOMDataChannel.cpp
@@ -352,27 +352,27 @@ nsDOMDataChannel::Send(nsIInputStream* a
if (state == mozilla::DataChannel::CLOSING ||
state == mozilla::DataChannel::CLOSED) {
return;
}
MOZ_ASSERT(state == mozilla::DataChannel::OPEN,
"Unknown state in nsDOMDataChannel::Send");
- int32_t sent;
+ bool sent;
if (aMsgStream) {
sent = mDataChannel->SendBinaryStream(aMsgStream, aMsgLength);
} else {
if (aIsBinary) {
sent = mDataChannel->SendBinaryMsg(aMsgString);
} else {
sent = mDataChannel->SendMsg(aMsgString);
}
}
- if (sent < 0) {
+ if (!sent) {
aRv.Throw(NS_ERROR_FAILURE);
}
}
nsresult
nsDOMDataChannel::DoOnMessageAvailable(const nsACString& aData,
bool aBinary)
{
--- a/netwerk/sctp/datachannel/DataChannel.h
+++ b/netwerk/sctp/datachannel/DataChannel.h
@@ -371,17 +371,17 @@ public:
}
// Send a binary blob
bool SendBinaryStream(nsIInputStream *aBlob, uint32_t msgLen)
{
ENSURE_DATACONNECTION_RET(false);
if (mStream != INVALID_STREAM)
- return (mConnection->SendBlob(mStream, aBlob) > 0);
+ return (mConnection->SendBlob(mStream, aBlob) == 0);
else
return false;
}
uint16_t GetType() { return mPrPolicy; }
bool GetOrdered() { return !(mFlags & DATA_CHANNEL_FLAGS_OUT_OF_ORDER_ALLOWED); }