github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Use fmt instead of using snprintf directly

pull/4/head
Tatsuhiro Tsujikawa 2011-11-12 19:33:38 +09:00
parent 0da2468d6b
commit 5347efb967
18 changed files with 68 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BtHandshakeMessage.cc
View File

@ -103,13 +103,10 @@ size_t BtHandshakeMessage::getMessageLength() {
}
std::string BtHandshakeMessage::toString() const {
char buf[256];
snprintf(buf, sizeof(buf),
"%s peerId=%s, reserved=%s",
NAME.c_str(),
util::percentEncode(peerId_, PEER_ID_LENGTH).c_str(),
util::toHex(reserved_, RESERVED_LENGTH).c_str());
return buf;
return fmt("%s peerId=%s, reserved=%s",
NAME.c_str(),
util::percentEncode(peerId_, PEER_ID_LENGTH).c_str(),
util::toHex(reserved_, RESERVED_LENGTH).c_str());
}
bool BtHandshakeMessage::isFastExtensionSupported() const {

12
src/BtPieceMessage.cc
View File

@ -213,13 +213,11 @@ void BtPieceMessage::pushPieceData(off_t offset, size_t length) const
std::string BtPieceMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "%s index=%lu, begin=%u, length=%lu",
NAME.c_str(),
static_cast<unsigned long>(index_),
begin_,
static_cast<unsigned long>(blockLength_));
return buf;
return fmt("%s index=%lu, begin=%u, length=%lu",
NAME.c_str(),
static_cast<unsigned long>(index_),
begin_,
static_cast<unsigned long>(blockLength_));
}
bool BtPieceMessage::checkPieceHash(const SharedHandle<Piece>& piece)

4
src/BtPortMessage.cc
View File

@ -118,9 +118,7 @@ size_t BtPortMessage::getMessageLength() {
}
std::string BtPortMessage::toString() const {
char buf[256];
snprintf(buf, sizeof(buf), "%s port=%u", NAME.c_str(), port_);
return buf;
return fmt("%s port=%u", NAME.c_str(), port_);
}
void BtPortMessage::setLocalNode(DHTNode* localNode)

11
src/DHTAnnouncePeerMessage.cc
View File

@ -129,13 +129,10 @@ void DHTAnnouncePeerMessage::setTokenTracker(DHTTokenTracker* tokenTracker)
std::string DHTAnnouncePeerMessage::toStringOptional() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"token=%s, info_hash=%s, tcpPort=%u",
util::toHex(token_).c_str(),
util::toHex(infoHash_, INFO_HASH_LENGTH).c_str(),
tcpPort_);
return buf;
return fmt("token=%s, info_hash=%s, tcpPort=%u",
util::toHex(token_).c_str(),
util::toHex(infoHash_, INFO_HASH_LENGTH).c_str(),
tcpPort_);
}
} // namespace aria2

11
src/DHTGetPeersReplyMessage.cc
View File

@ -158,13 +158,10 @@ void DHTGetPeersReplyMessage::accept(DHTMessageCallback* callback)
std::string DHTGetPeersReplyMessage::toStringOptional() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"token=%s, values=%lu, nodes=%lu",
util::toHex(token_).c_str(),
static_cast<unsigned long>(values_.size()),
static_cast<unsigned long>(closestKNodes_.size()));
return buf;
return fmt("token=%s, values=%lu, nodes=%lu",
util::toHex(token_).c_str(),
static_cast<unsigned long>(values_.size()),
static_cast<unsigned long>(closestKNodes_.size()));
}
} // namespace aria2

15
src/DHTNode.cc
View File

@ -117,15 +117,12 @@ void DHTNode::timeout()
std::string DHTNode::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"DHTNode ID=%s, Host=%s(%u), Condition=%u, RTT=%u",
util::toHex(id_, DHT_ID_LENGTH).c_str(),
ipaddr_.c_str(),
port_,
condition_,
rtt_);
return buf;
return fmt("DHTNode ID=%s, Host=%s(%u), Condition=%u, RTT=%u",
util::toHex(id_, DHT_ID_LENGTH).c_str(),
ipaddr_.c_str(),
port_,
condition_,
rtt_);
}
void DHTNode::setID(const unsigned char* id)

19
src/DHTQueryMessage.cc
View File

@ -68,17 +68,14 @@ bool DHTQueryMessage::isReply() const
std::string DHTQueryMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"dht query %s TransactionID=%s Remote:%s(%u), id=%s, v=%s, %s",
getMessageType().c_str(),
util::toHex(getTransactionID()).c_str(),
getRemoteNode()->getIPAddress().c_str(),
getRemoteNode()->getPort(),
util::toHex(getRemoteNode()->getID(), DHT_ID_LENGTH).c_str(),
util::torrentPercentEncode(getVersion()).c_str(),
toStringOptional().c_str());
return buf;
return fmt("dht query %s TransactionID=%s Remote:%s(%u), id=%s, v=%s, %s",
getMessageType().c_str(),
util::toHex(getTransactionID()).c_str(),
getRemoteNode()->getIPAddress().c_str(),
getRemoteNode()->getPort(),
util::toHex(getRemoteNode()->getID(), DHT_ID_LENGTH).c_str(),
util::torrentPercentEncode(getVersion()).c_str(),
toStringOptional().c_str());
}
} // namespace aria2

19
src/DHTResponseMessage.cc
View File

@ -65,17 +65,14 @@ bool DHTResponseMessage::isReply() const
std::string DHTResponseMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"dht response %s TransactionID=%s Remote:%s(%u), id=%s, v=%s, %s",
getMessageType().c_str(),
util::toHex(getTransactionID()).c_str(),
getRemoteNode()->getIPAddress().c_str(),
getRemoteNode()->getPort(),
util::toHex(getRemoteNode()->getID(), DHT_ID_LENGTH).c_str(),
util::torrentPercentEncode(getVersion()).c_str(),
toStringOptional().c_str());
return buf;
return fmt("dht response %s TransactionID=%s Remote:%s(%u), id=%s, v=%s, %s",
getMessageType().c_str(),
util::toHex(getTransactionID()).c_str(),
getRemoteNode()->getIPAddress().c_str(),
getRemoteNode()->getPort(),
util::toHex(getRemoteNode()->getID(), DHT_ID_LENGTH).c_str(),
util::torrentPercentEncode(getVersion()).c_str(),
toStringOptional().c_str());
}
} // namespace aria2

12
src/DHTUnknownMessage.cc
View File

@ -88,14 +88,10 @@ std::string DHTUnknownMessage::toString() const
if(length_ < sampleLength) {
sampleLength = length_;
}
std::string sample(&data_[0], &data_[sampleLength]);
char buf[256];
snprintf(buf, sizeof(buf),
"dht unknown Remote:%s(%u) length=%lu, first 8 bytes(hex)=%s",
ipaddr_.c_str(), port_,
static_cast<unsigned long>(length_),
util::toHex(data_, sampleLength).c_str());
return buf;
return fmt("dht unknown Remote:%s(%u) length=%lu, first 8 bytes(hex)=%s",
ipaddr_.c_str(), port_,
static_cast<unsigned long>(length_),
util::toHex(data_, sampleLength).c_str());
}
} // namespace aria2

6
src/FtpNegotiationCommand.cc
View File

@ -724,10 +724,8 @@ bool FtpNegotiationCommand::sendTunnelRequest()
SharedHandle<Request> req(new Request());
// Construct fake URI in order to use HttpRequest
// TODO Handle IPv6 address; it must be enclosed with [].
char fakeUriBuf[1024];
snprintf(fakeUriBuf, sizeof(fakeUriBuf), "ftp://%s:%u",
dataConnAddr_.first.c_str(), dataConnAddr_.second);
req->setUri(fakeUriBuf);
req->setUri(fmt("ftp://%s:%u",
dataConnAddr_.first.c_str(), dataConnAddr_.second));
httpRequest->setRequest(req);
httpRequest->setProxyRequest(createProxyRequest());
http_->sendProxyRequest(httpRequest);

8
src/IndexBtMessage.cc
View File

@ -60,11 +60,9 @@ size_t IndexBtMessage::getMessageLength()
std::string IndexBtMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "%s index=%lu",
getName().c_str(),
static_cast<unsigned long>(index_));
return buf;
return fmt("%s index=%lu",
getName().c_str(),
static_cast<unsigned long>(index_));
}
} // namespace aria2

8
src/OptionHandlerImpl.cc
View File

@ -262,17 +262,13 @@ std::string FloatNumberOptionHandler::createPossibleValuesString() const
if(min_ < 0) {
valuesString += "*";
} else {
char buf[11];
snprintf(buf, sizeof(buf), "%.1f", min_);
valuesString += buf;
valuesString += fmt("%.1f", min_);
}
valuesString += "-";
if(max_ < 0) {
valuesString += "*";
} else {
char buf[11];
snprintf(buf, sizeof(buf), "%.1f", max_);
valuesString += buf;
valuesString += fmt("%.1f", max_);
}
return valuesString;
}

8
src/Piece.cc
View File

@ -167,11 +167,9 @@ bool Piece::getAllMissingBlockIndexes
}
std::string Piece::toString() const {
char buf[256];
snprintf(buf, sizeof(buf), "piece: index=%lu, length=%lu",
static_cast<unsigned long>(index_),
static_cast<unsigned long>(length_));
return buf;
return fmt("piece: index=%lu, length=%lu",
static_cast<unsigned long>(index_),
static_cast<unsigned long>(length_));
}
void Piece::reconfigure(size_t length)

13
src/RangeBtMessage.cc
View File

@ -72,14 +72,11 @@ size_t RangeBtMessage::getMessageLength()
std::string RangeBtMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf),
"%s index=%lu, begin=%u, length=%lu",
getName().c_str(),
static_cast<unsigned long>(index_),
begin_,
static_cast<unsigned long>(length_));
return buf;
return fmt("%s index=%lu, begin=%u, length=%lu",
getName().c_str(),
static_cast<unsigned long>(index_),
begin_,
static_cast<unsigned long>(length_));
}
} // namespace aria2

6
src/UTMetadataDataExtensionMessage.cc
View File

@ -71,10 +71,8 @@ std::string UTMetadataDataExtensionMessage::getPayload()
std::string UTMetadataDataExtensionMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "ut_metadata data piece=%lu",
static_cast<unsigned long>(getIndex()));
return buf;
return fmt("ut_metadata data piece=%lu",
static_cast<unsigned long>(getIndex()));
}
void UTMetadataDataExtensionMessage::doReceivedAction()

6
src/UTMetadataRejectExtensionMessage.cc
View File

@ -54,10 +54,8 @@ std::string UTMetadataRejectExtensionMessage::getPayload()
std::string UTMetadataRejectExtensionMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "ut_metadata reject piece=%lu",
static_cast<unsigned long>(getIndex()));
return buf;
return fmt("ut_metadata reject piece=%lu",
static_cast<unsigned long>(getIndex()));
}
void UTMetadataRejectExtensionMessage::doReceivedAction()

6
src/UTMetadataRequestExtensionMessage.cc
View File

@ -69,10 +69,8 @@ std::string UTMetadataRequestExtensionMessage::getPayload()
std::string UTMetadataRequestExtensionMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "ut_metadata request piece=%lu",
static_cast<unsigned long>(getIndex()));
return buf;
return fmt("ut_metadata request piece=%lu",
static_cast<unsigned long>(getIndex()));
}
void UTMetadataRequestExtensionMessage::doReceivedAction()

8
src/UTPexExtensionMessage.cc
View File

@ -121,11 +121,9 @@ UTPexExtensionMessage::createCompactPeerListAndFlag
std::string UTPexExtensionMessage::toString() const
{
char buf[256];
snprintf(buf, sizeof(buf), "ut_pex added=%lu, dropped=%lu",
static_cast<unsigned long>(freshPeers_.size()),
static_cast<unsigned long>(droppedPeers_.size()));
return buf;
return fmt("ut_pex added=%lu, dropped=%lu",
static_cast<unsigned long>(freshPeers_.size()),
static_cast<unsigned long>(droppedPeers_.size()));
}
void UTPexExtensionMessage::doReceivedAction()