jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more warninigs

Browse Source
This commit is contained in:
Arvid Norberg
2015-05-06 02:13:03 +00:00
parent 4b585dcc0e
commit 5dc00969f8
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/network_thread_pool.hpp
View File

@@ -45,7 +45,7 @@ namespace libtorrent
struct socket_job struct socket_job
{ {
socket_job() : vec(NULL), recv_buf(NULL), buf_size(0), type(none) {} socket_job() : type(none), vec(NULL), recv_buf(NULL), buf_size(0) {}
enum job_type_t enum job_type_t
{ {

4
test/setup_transfer.cpp
View File

@@ -89,7 +89,7 @@ address rand_v4()
address rand_v6() address rand_v6()
{ {
address_v6::bytes_type bytes; address_v6::bytes_type bytes;
for (int i = 0; i < bytes.size(); ++i) bytes[i] = rand(); for (int i = 0; i < int(bytes.size()); ++i) bytes[i] = rand();
return address_v6(bytes); return address_v6(bytes);
} }
#endif #endif
@@ -138,7 +138,7 @@ std::map<std::string, boost::uint64_t> get_counters(libtorrent::session& s)
if (!sa) return ret; if (!sa) return ret;
static std::vector<stats_metric> metrics = session_stats_metrics(); static std::vector<stats_metric> metrics = session_stats_metrics();
for (int i = 0; i < metrics.size(); ++i) for (int i = 0; i < int(metrics.size()); ++i)
ret[metrics[i].name] = sa->values[metrics[i].value_index]; ret[metrics[i].name] = sa->values[metrics[i].value_index];
return ret; return ret;
} }

2
test/test_gzip.cpp
View File

@@ -55,7 +55,7 @@ int test_main()
} }
TEST_CHECK(!ec); TEST_CHECK(!ec);
TEST_CHECK(inflated.size() > 0); TEST_CHECK(inflated.size() > 0);
for (int i = 0; i < inflated.size(); ++i) for (int i = 0; i < int(inflated.size()); ++i)
TEST_EQUAL(inflated[i], 0); TEST_EQUAL(inflated[i], 0);
return 0; return 0;

1
test/test_peer_list.cpp
View File

@@ -905,6 +905,7 @@ int test_main()
TEST_CHECK(peer5); TEST_CHECK(peer5);
TEST_EQUAL(p.num_peers(), 5); TEST_EQUAL(p.num_peers(), 5);
torrent_peer* peer6 = p.add_peer(ep("10.0.0.6", 8080), 0, 0, &st); torrent_peer* peer6 = p.add_peer(ep("10.0.0.6", 8080), 0, 0, &st);
TEST_CHECK(peer6 == NULL);
TEST_EQUAL(p.num_peers(), 5); TEST_EQUAL(p.num_peers(), 5);
// one of the connection should have been removed // one of the connection should have been removed

14
test/test_piece_picker.cpp
View File

@@ -1810,7 +1810,7 @@ int test_main()
picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer
, piece_picker::rarest_first | piece_picker::time_critical_mode, empty_vector); , piece_picker::rarest_first | piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// reverse rarest-first // reverse rarest-first
@@ -1818,14 +1818,14 @@ int test_main()
, piece_picker::reverse | piece_picker::rarest_first , piece_picker::reverse | piece_picker::rarest_first
| piece_picker::time_critical_mode, empty_vector); | piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// sequential // sequential
picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer
, piece_picker::sequential | piece_picker::time_critical_mode, empty_vector); , piece_picker::sequential | piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// reverse sequential // reverse sequential
@@ -1833,21 +1833,21 @@ int test_main()
, piece_picker::reverse | piece_picker::sequential , piece_picker::reverse | piece_picker::sequential
| piece_picker::time_critical_mode, empty_vector); | piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// just critical // just critical
picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer
, piece_picker::time_critical_mode, empty_vector); , piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// prioritize_partials // prioritize_partials
picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer picked = pick_pieces(p, "*******", 7 * blocks_per_piece, 0, tmp_peer
, piece_picker::prioritize_partials | piece_picker::time_critical_mode, empty_vector); , piece_picker::prioritize_partials | piece_picker::time_critical_mode, empty_vector);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
// even when a non-critical piece is suggested should we ignore it // even when a non-critical piece is suggested should we ignore it
@@ -1855,7 +1855,7 @@ int test_main()
, piece_picker::rarest_first | piece_picker::time_critical_mode , piece_picker::rarest_first | piece_picker::time_critical_mode
, suggested_pieces); , suggested_pieces);
TEST_EQUAL(picked.size(), blocks_per_piece); TEST_EQUAL(picked.size(), blocks_per_piece);
for (int i = 0; i < picked.size(); ++i) for (int i = 0; i < int(picked.size()); ++i)
TEST_EQUAL(picked[0].piece_index, 4); TEST_EQUAL(picked[0].piece_index, 4);
return 0; return 0;

2
test/test_sliding_average.cpp
View File

@@ -86,7 +86,7 @@ int test_main()
// test with a more realistic input // test with a more realistic input
{ {
sliding_average<10> avg; sliding_average<10> avg;
for (int i = 0; i < sizeof(samples)/sizeof(samples[0]); ++i) for (int i = 0; i < int(sizeof(samples)/sizeof(samples[0])); ++i)
avg.add_sample(samples[i]); avg.add_sample(samples[i]);
TEST_CHECK(abs(avg.mean() - 60) <= 3); TEST_CHECK(abs(avg.mean() - 60) <= 3);
} }

10
test/test_storage.cpp
View File

@@ -811,7 +811,7 @@ void fill_pattern(file::iovec_t* iov, int num_bufs)
for (int i = 0; i < num_bufs; ++i) for (int i = 0; i < num_bufs; ++i)
{ {
unsigned char* buf = (unsigned char*)iov[i].iov_base; unsigned char* buf = (unsigned char*)iov[i].iov_base;
for (int k = 0; k < iov[i].iov_len; ++k) for (int k = 0; k < int(iov[i].iov_len); ++k)
{ {
buf[k] = counter & 0xff; buf[k] = counter & 0xff;
++counter; ++counter;
@@ -824,7 +824,7 @@ void fill_pattern2(file::iovec_t* iov, int num_bufs)
for (int i = 0; i < num_bufs; ++i) for (int i = 0; i < num_bufs; ++i)
{ {
unsigned char* buf = (unsigned char*)iov[i].iov_base; unsigned char* buf = (unsigned char*)iov[i].iov_base;
memset(buf, 0xfe, iov[i].iov_len); memset(buf, 0xfe, int(iov[i].iov_len));
} }
} }
@@ -858,7 +858,7 @@ void test_iovec_copy_bufs()
for (int i = 0; i < num_bufs; ++i) for (int i = 0; i < num_bufs; ++i)
{ {
unsigned char* buf = (unsigned char*)iov2[i].iov_base; unsigned char* buf = (unsigned char*)iov2[i].iov_base;
for (int k = 0; k < iov2[i].iov_len; ++k) for (int k = 0; k < int(iov2[i].iov_len); ++k)
{ {
TEST_EQUAL(int(buf[k]), (counter & 0xff)); TEST_EQUAL(int(buf[k]), (counter & 0xff));
++counter; ++counter;
@@ -879,7 +879,7 @@ void test_iovec_clear_bufs()
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
unsigned char* buf = (unsigned char*)iov[i].iov_base; unsigned char* buf = (unsigned char*)iov[i].iov_base;
for (int k = 0; k < iov[i].iov_len; ++k) for (int k = 0; k < int(iov[i].iov_len); ++k)
{ {
TEST_EQUAL(int(buf[k]), 0); TEST_EQUAL(int(buf[k]), 0);
} }
@@ -924,7 +924,7 @@ void test_iovec_advance_bufs()
for (int i = 0; i < end - iov; ++i) for (int i = 0; i < end - iov; ++i)
{ {
unsigned char* buf = (unsigned char*)iov[i].iov_base; unsigned char* buf = (unsigned char*)iov[i].iov_base;
for (int k = 0; k < iov[i].iov_len; ++k) for (int k = 0; k < int(iov[i].iov_len); ++k)
{ {
TEST_EQUAL(int(buf[k]), (counter & 0xff)); TEST_EQUAL(int(buf[k]), (counter & 0xff));
++counter; ++counter;

4
test/test_torrent_info.cpp
View File

@@ -352,7 +352,7 @@ int test_torrent_parse()
TEST_CHECK(test == "filename____"); TEST_CHECK(test == "filename____");
std::string root_dir = parent_path(current_working_directory()); std::string root_dir = parent_path(current_working_directory());
for (int i = 0; i < sizeof(test_torrents)/sizeof(test_torrents[0]); ++i) for (int i = 0; i < int(sizeof(test_torrents)/sizeof(test_torrents[0])); ++i)
{ {
fprintf(stderr, "loading %s\n", test_torrents[i].file); fprintf(stderr, "loading %s\n", test_torrents[i].file);
std::string filename = combine_path(combine_path(root_dir, "test_torrents") std::string filename = combine_path(combine_path(root_dir, "test_torrents")
@@ -495,7 +495,7 @@ int test_torrent_parse()
} }
for (int i = 0; i < sizeof(test_error_torrents)/sizeof(test_error_torrents[0]); ++i) for (int i = 0; i < int(sizeof(test_error_torrents)/sizeof(test_error_torrents[0])); ++i)
{ {
error_code ec; error_code ec;
fprintf(stderr, "loading %s\n", test_error_torrents[i].file); fprintf(stderr, "loading %s\n", test_error_torrents[i].file);