premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged fixes from RC_1_0

This commit is contained in:
Arvid Norberg 2015-04-29 05:48:09 +00:00
parent 0d72163a56
commit ab0c97755e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/client_test.cpp
View File

@ -400,7 +400,7 @@ std::string const& piece_bar(libtorrent::bitfield const& p, int width)
int end = (std::max)(int(piece + piece_per_char), int(piece) + 1);
for (int k = int(piece); k < end; ++k, ++num_pieces)
if (p[k]) ++num_have;
int color = int(std::ceil(num_have / float(num_pieces) * (table_size - 1)));
int color = int(std::ceil(num_have / float((std::max)(num_pieces, 1)) * (table_size - 1)));
char buf[10];
snprintf(buf, 10, "48;5;%d", 232 + color);
bar += esc(buf);

2
src/bt_peer_connection.cpp
View File

@ -1847,7 +1847,7 @@ namespace libtorrent
{
max_out_request_queue(reqq);
#ifdef TORRENT_VERBOSE_LOGGING
peer_log("*** MAX OUT REQUEST QUEUE [ %d ]", req);
peer_log("*** MAX OUT REQUEST QUEUE [ %d ]", reqq);
#endif
}

2
src/piece_picker.cpp
View File

@ -1099,7 +1099,7 @@ namespace libtorrent
std::cerr << "[" << this << "] " << "restore_piece(" << index << ")" << std::endl;
#endif
TORRENT_ASSERT(index >= 0);
TORRENT_ASSERT(index < (int)m_piece_map.size());
TORRENT_ASSERT(index < int(m_piece_map.size()));
int download_state = m_piece_map[index].download_queue();
TORRENT_ASSERT(download_state != piece_pos::piece_open);

2
src/session_impl.cpp
View File

@ -2390,7 +2390,7 @@ retry:
if (ec)
{
#ifndef TORRENT_DISABLE_LOGGING
session_log("%s <== INCOMING CONNECTION FAILED, could "
session_log(" <== INCOMING CONNECTION FAILED, could "
"not retrieve remote endpoint: %s"
, print_endpoint(endp).c_str(), ec.message().c_str());
#endif