wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

minor code cleanup in torrent.cpp

This commit is contained in:
Alden Torres 2018-05-14 09:03:43 -04:00 committed by Arvid Norberg
parent a7b2026ef8
commit a14d595eac
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/torrent.cpp
View File

@ -2759,16 +2759,14 @@ bool is_downloading_state(int const st)
// amount to exceed the total size of the torrent which upsets some trackers // amount to exceed the total size of the torrent which upsets some trackers
if (is_seed()) if (is_seed())
{ {
for (peer_iterator i = m_connections.begin(); for (auto c : m_connections)
i != m_connections.end(); ++i)
{ {
TORRENT_INCREMENT(m_iterating_connections); TORRENT_INCREMENT(m_iterating_connections);
peer_connection* p = *i; auto const pbp = c->downloading_piece_progress();
boost::optional<piece_block_progress> pbp = p->downloading_piece_progress(); if (pbp.bytes_downloaded > 0)
if (pbp && pbp->bytes_downloaded > 0)
{ {
req.downloaded -= pbp->bytes_downloaded; req.downloaded -= pbp.bytes_downloaded;
req.redundant += pbp->bytes_downloaded; req.redundant += pbp.bytes_downloaded;
} }
} }
} }
@ -5519,7 +5517,7 @@ bool is_downloading_state(int const st)
else else
{ {
auto const& pieces = p->get_bitfield(); auto const& pieces = p->get_bitfield();
TORRENT_ASSERT(pieces.count() <= int(pieces.size())); TORRENT_ASSERT(pieces.count() <= pieces.size());
m_picker->dec_refcount(pieces, pp); m_picker->dec_refcount(pieces, pp);
} }
} }