1 files changed, 11 insertions, 14 deletions
diff --git a/src/DHTQueryMessage.cc b/src/DHTQueryMessage.cc
index 61e3fba6..3f03fa97 100644
--- a/src/DHTQueryMessage.cc
+++ b/src/DHTQueryMessage.cc
@@ -68,20 +68,17 @@ bool DHTQueryMessage::isReply() const
 
 std::string DHTQueryMessage::toString() const
 {
-  std::string s = strconcat
-    ("dht query ", getMessageType(),
-     " TransactionID=", util::toHex(getTransactionID()),
-     " Remote:", getRemoteNode()->getIPAddress(),
-     ":", util::uitos(getRemoteNode()->getPort()),
-     ", id=", util::toHex(getRemoteNode()->getID(), DHT_ID_LENGTH),
-     ", ");
-  if(!getVersion().empty()) {
-    s += "v=";
-    s += util::torrentPercentEncode(getVersion());
-    s += ", ";
-  }
-  s += toStringOptional();
-  return s;
+  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;
 }
 
 } // namespace aria2