From 9d76d0481ed9c53da7049cd2fc128aa78e08ef95 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Fri, 29 May 2009 01:27:08 +0000 Subject: [PATCH] fixes tp typos in alert_types.hpp and windows fixes --- examples/client_test.cpp | 4 ++-- include/libtorrent/alert_types.hpp | 32 +++++++++++++++--------------- include/libtorrent/config.hpp | 8 +++++++- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/examples/client_test.cpp b/examples/client_test.cpp index ce56ab582..40a024067 100644 --- a/examples/client_test.cpp +++ b/examples/client_test.cpp @@ -217,7 +217,7 @@ std::string& to_string(float v, int width, int precision = 3) ++round_robin; if (round_robin >= num_strings) round_robin = 0; ret.resize(20); - int size = std::snprintf(&ret[0], 20, "%*.*f", width, precision, v); + int size = snprintf(&ret[0], 20, "%*.*f", width, precision, v); ret.resize((std::min)(size, width)); return ret; } @@ -1459,7 +1459,7 @@ int main(int argc, char* argv[]) else if (i->blocks[j].state == block_info::finished) chr = '#'; else if (i->blocks[j].state == block_info::writing) chr = '+'; else if (i->blocks[j].state == block_info::requested) chr = '-'; - else chr = ' ' + else chr = ' '; #endif snprintf(str, sizeof(str), "%s%c", color, chr); out += str; diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp index f44d5dde0..a8406b977 100644 --- a/include/libtorrent/alert_types.hpp +++ b/include/libtorrent/alert_types.hpp @@ -275,7 +275,7 @@ namespace libtorrent virtual std::string message() const { char ret[400]; - snprintf(ret, sizeof(msg), "%s (%d) %s (%d)" + snprintf(ret, sizeof(ret), "%s (%d) %s (%d)" , torrent_alert::message().c_str(), status_code, msg.c_str(), times_in_row); return ret; } @@ -327,7 +327,7 @@ namespace libtorrent virtual std::string message() const { char ret[400]; - snprintf(ret, sizeof(msg), "%s scrape reply: %u %u" + snprintf(ret, sizeof(ret), "%s scrape reply: %u %u" , torrent_alert::message().c_str(), incomplete, complete); return ret; } @@ -372,7 +372,7 @@ namespace libtorrent virtual std::string message() const { char ret[400]; - snprintf(ret, sizeof(msg), "%s received peers: %u" + snprintf(ret, sizeof(ret), "%s received peers: %u" , torrent_alert::message().c_str(), num_peers); return ret; } @@ -394,7 +394,7 @@ namespace libtorrent virtual std::string message() const { char ret[400]; - snprintf(ret, sizeof(msg), "%s received DHT peers: %u" + snprintf(ret, sizeof(ret), "%s received DHT peers: %u" , torrent_alert::message().c_str(), num_peers); return ret; } @@ -437,7 +437,7 @@ namespace libtorrent virtual std::string message() const { char ret[400]; - snprintf(ret, sizeof(msg), "%s hash for piece %u failed" + snprintf(ret, sizeof(ret), "%s hash for piece %u failed" , torrent_alert::message().c_str(), piece_index); return ret; } @@ -569,7 +569,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s peer sent an invalid piece request (piece: %u start: %u len: %u)" + snprintf(ret, sizeof(ret), "%s peer sent an invalid piece request (piece: %u start: %u len: %u)" , torrent_alert::message().c_str(), request.piece, request.start, request.length); return ret; } @@ -614,7 +614,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s piece: %u finished downloading" + snprintf(ret, sizeof(ret), "%s piece: %u finished downloading" , torrent_alert::message().c_str(), piece_index); return ret; } @@ -641,7 +641,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s peer dropped block ( piece: %u block: %u)" + snprintf(ret, sizeof(ret), "%s peer dropped block ( piece: %u block: %u)" , torrent_alert::message().c_str(), piece_index, block_index); return ret; } @@ -668,7 +668,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s peer timed out request ( piece: %u block: %u)" + snprintf(ret, sizeof(ret), "%s peer timed out request ( piece: %u block: %u)" , torrent_alert::message().c_str(), piece_index, block_index); return ret; } @@ -694,7 +694,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s block finished downloading (piece: %u block: %u)" + snprintf(ret, sizeof(ret), "%s block finished downloading (piece: %u block: %u)" , torrent_alert::message().c_str(), piece_index, block_index); return ret; } @@ -722,7 +722,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s requested block (piece: %u block: %u) %s" + snprintf(ret, sizeof(ret), "%s requested block (piece: %u block: %u) %s" , torrent_alert::message().c_str(), piece_index, block_index, peer_speedmsg); return ret; } @@ -746,7 +746,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "%s received block not in download queue (piece: %u block: %u)" + snprintf(ret, sizeof(ret), "%s received block not in download queue (piece: %u block: %u)" , torrent_alert::message().c_str(), piece_index, block_index); return ret; } @@ -1081,7 +1081,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "listening on %s failed: %s" + snprintf(ret, sizeof(ret), "listening on %s failed: %s" , print_endpoint(endpoint).c_str(), error.message().c_str()); return ret; } @@ -1103,7 +1103,7 @@ namespace libtorrent virtual std::string message() const { char ret[200]; - snprintf(ret, sizeof(msg), "successfully listening on %s", print_endpoint(endpoint).c_str()); + snprintf(ret, sizeof(ret), "successfully listening on %s", print_endpoint(endpoint).c_str()); return ret; } }; @@ -1151,7 +1151,7 @@ namespace libtorrent { static char const* type_str[] = {"NAT-PMP", "UPnP"}; char ret[200]; - snprintf(ret, sizeof(msg), "successfully mapped port using %s. external port: %u" + snprintf(ret, sizeof(ret), "successfully mapped port using %s. external port: %u" , type_str[type], external_port); return ret; } @@ -1175,7 +1175,7 @@ namespace libtorrent { static char const* type_str[] = {"NAT-PMP", "UPnP"}; char ret[200]; - snprintf(ret, sizeof(msg), "%s: %s", type_str[type], msg.c_str()); + snprintf(ret, sizeof(ret), "%s: %s", type_str[type], msg.c_str()); return ret; } }; diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp index bf62798dd..26a905cf0 100644 --- a/include/libtorrent/config.hpp +++ b/include/libtorrent/config.hpp @@ -115,10 +115,16 @@ POSSIBILITY OF SUCH DAMAGE. #endif #ifdef TORRENT_WINDOWS +#include // this is the maximum number of characters in a // path element / filename on windows #define NAME_MAX 255 -#define snprintf sprintf_s +inline int snprintf(char* buf, int len, char const* fmt, ...) +{ + va_list lp; + va_start(lp, fmt); + return vsnprintf_s(buf, len, _TRUNCATE, fmt, lp); +} #define strtoll _strtoi64 #endif