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

more use of emplace_back in write_resume_data (#2221)

This commit is contained in:
Alden Torres 2017-08-08 18:19:11 -04:00 committed by Arvid Norberg
parent 819a9b0943
commit 721c4d016a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libtorrent/write_resume_data.hpp
View File

@ -49,4 +49,3 @@ namespace libtorrent {
} }
#endif #endif

14
src/write_resume_data.cpp
View File

@ -88,7 +88,7 @@ namespace libtorrent {
if (atp.ti) if (atp.ti)
{ {
boost::shared_array<char> const info = atp.ti->metadata(); auto const info = atp.ti->metadata();
int const size = atp.ti->metadata_size(); int const size = atp.ti->metadata_size();
ret["info"].preformatted().assign(&info[0], &info[0] + size); ret["info"].preformatted().assign(&info[0], &info[0] + size);
} }
@ -106,6 +106,7 @@ namespace libtorrent {
if (!atp.unfinished_pieces.empty()) if (!atp.unfinished_pieces.empty())
{ {
entry::list_type& up = ret["unfinished"].list(); entry::list_type& up = ret["unfinished"].list();
up.reserve(atp.unfinished_pieces.size());
// info for each unfinished piece // info for each unfinished piece
for (auto const& p : atp.unfinished_pieces) for (auto const& p : atp.unfinished_pieces)
@ -115,7 +116,7 @@ namespace libtorrent {
// the unfinished piece's index // the unfinished piece's index
piece_struct["piece"] = static_cast<int>(p.first); piece_struct["piece"] = static_cast<int>(p.first);
std::string& bitmask = piece_struct["bitmask"].string(); std::string& bitmask = piece_struct["bitmask"].string();
for (auto bit : p.second) for (auto const bit : p.second)
bitmask.push_back(bit ? '1' : '0'); bitmask.push_back(bit ? '1' : '0');
// push the struct onto the unfinished-piece list // push the struct onto the unfinished-piece list
up.push_back(std::move(piece_struct)); up.push_back(std::move(piece_struct));
@ -126,7 +127,7 @@ namespace libtorrent {
if (!atp.trackers.empty()) if (!atp.trackers.empty())
{ {
entry::list_type& tr_list = ret["trackers"].list(); entry::list_type& tr_list = ret["trackers"].list();
tr_list.push_back(entry::list_type()); tr_list.emplace_back(entry::list_type());
std::size_t tier = 0; std::size_t tier = 0;
auto tier_it = atp.tracker_tiers.begin(); auto tier_it = atp.tracker_tiers.begin();
for (std::string const& tr : atp.trackers) for (std::string const& tr : atp.trackers)
@ -137,7 +138,7 @@ namespace libtorrent {
if (tr_list.size() <= tier) if (tr_list.size() <= tier)
tr_list.resize(tier + 1); tr_list.resize(tier + 1);
tr_list[tier].list().push_back(tr); tr_list[tier].list().emplace_back(tr);
} }
} }
@ -231,14 +232,16 @@ namespace libtorrent {
{ {
// write file priorities // write file priorities
entry::list_type& prio = ret["file_priority"].list(); entry::list_type& prio = ret["file_priority"].list();
prio.reserve(atp.file_priorities.size());
for (auto const p : atp.file_priorities) for (auto const p : atp.file_priorities)
prio.push_back(p); prio.emplace_back(p);
} }
if (!atp.piece_priorities.empty()) if (!atp.piece_priorities.empty())
{ {
// write piece priorities // write piece priorities
entry::string_type& prio = ret["piece_priority"].string(); entry::string_type& prio = ret["piece_priority"].string();
prio.reserve(atp.piece_priorities.size());
for (auto const p : atp.piece_priorities) for (auto const p : atp.piece_priorities)
prio.push_back(static_cast<char>(p)); prio.push_back(static_cast<char>(p));
} }
@ -254,4 +257,3 @@ namespace libtorrent {
return ret; return ret;
} }
} }