Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-03-05 15:26:30 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-03-05 15:26:30 (GMT) |
| commit | e1602cbe8c5fb1525bc66ecf5d7a939816f259c5 (patch) | |
| tree | 342b54f4037063a51a0ff933dc3d52afec23bb2e /Swiften/Network/BOSHConnectionPool.cpp | |
| parent | fe24fd560ec2302306857a52a07155c93f5dde69 (diff) | |
| download | swift-contrib-e1602cbe8c5fb1525bc66ecf5d7a939816f259c5.zip swift-contrib-e1602cbe8c5fb1525bc66ecf5d7a939816f259c5.tar.bz2 | |
Fix segfaults and deadcode
Diffstat (limited to 'Swiften/Network/BOSHConnectionPool.cpp')
| -rw-r--r-- | Swiften/Network/BOSHConnectionPool.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Swiften/Network/BOSHConnectionPool.cpp b/Swiften/Network/BOSHConnectionPool.cpp index 7d43f42..bb24aa5 100644 --- a/Swiften/Network/BOSHConnectionPool.cpp +++ b/Swiften/Network/BOSHConnectionPool.cpp @@ -137,37 +137,34 @@ BOSHConnection::ref BOSHConnectionPool::getSuitableConnection() { } void BOSHConnectionPool::tryToSendQueuedData() { if (sid.empty()) { /* If we've not got as far as stream start yet, pend */ return; } BOSHConnection::ref suitableConnection = getSuitableConnection(); - bool sent = false; bool toSend = !dataQueue.empty(); if (suitableConnection) { if (toSend) { rid++; suitableConnection->setRID(rid); SafeByteArray data; foreach (const SafeByteArray& datum, dataQueue) { data.insert(data.end(), datum.begin(), datum.end()); } suitableConnection->write(data); - sent = true; dataQueue.clear(); } else if (pendingTerminate) { rid++; suitableConnection->setRID(rid); suitableConnection->terminateStream(); - sent = true; onSessionTerminated(boost::shared_ptr<BOSHError>()); } } if (!pendingTerminate) { /* Ensure there's always a session waiting to read data for us */ bool pending = false; foreach (BOSHConnection::ref connection, connections) { if (connection && !connection->isReadyToSend()) { pending = true; |