premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixes tp typos in alert_types.hpp and windows fixes

This commit is contained in:
Arvid Norberg 2009-05-29 01:27:08 +00:00
parent 48e0e020a9
commit 9d76d0481e
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client_test.cpp
View File

@ -217,7 +217,7 @@ std::string& to_string(float v, int width, int precision = 3)
++round_robin; ++round_robin;
if (round_robin >= num_strings) round_robin = 0; if (round_robin >= num_strings) round_robin = 0;
ret.resize(20); 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)); ret.resize((std::min)(size, width));
return ret; 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::finished) chr = '#';
else if (i->blocks[j].state == block_info::writing) chr = '+'; else if (i->blocks[j].state == block_info::writing) chr = '+';
else if (i->blocks[j].state == block_info::requested) chr = '-'; else if (i->blocks[j].state == block_info::requested) chr = '-';
else chr = ' ' else chr = ' ';
#endif #endif
snprintf(str, sizeof(str), "%s%c", color, chr); snprintf(str, sizeof(str), "%s%c", color, chr);
out += str; out += str;

32
include/libtorrent/alert_types.hpp
View File

@ -275,7 +275,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[400]; 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); , torrent_alert::message().c_str(), status_code, msg.c_str(), times_in_row);
return ret; return ret;
} }
@ -327,7 +327,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[400]; 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); , torrent_alert::message().c_str(), incomplete, complete);
return ret; return ret;
} }
@ -372,7 +372,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[400]; 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); , torrent_alert::message().c_str(), num_peers);
return ret; return ret;
} }
@ -394,7 +394,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[400]; 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); , torrent_alert::message().c_str(), num_peers);
return ret; return ret;
} }
@ -437,7 +437,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[400]; 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); , torrent_alert::message().c_str(), piece_index);
return ret; return ret;
} }
@ -569,7 +569,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), request.piece, request.start, request.length);
return ret; return ret;
} }
@ -614,7 +614,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index);
return ret; return ret;
} }
@ -641,7 +641,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index, block_index);
return ret; return ret;
} }
@ -668,7 +668,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index, block_index);
return ret; return ret;
} }
@ -694,7 +694,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index, block_index);
return ret; return ret;
} }
@ -722,7 +722,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index, block_index, peer_speedmsg);
return ret; return ret;
} }
@ -746,7 +746,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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); , torrent_alert::message().c_str(), piece_index, block_index);
return ret; return ret;
} }
@ -1081,7 +1081,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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()); , print_endpoint(endpoint).c_str(), error.message().c_str());
return ret; return ret;
} }
@ -1103,7 +1103,7 @@ namespace libtorrent
virtual std::string message() const virtual std::string message() const
{ {
char ret[200]; 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; return ret;
} }
}; };
@ -1151,7 +1151,7 @@ namespace libtorrent
{ {
static char const* type_str[] = {"NAT-PMP", "UPnP"}; static char const* type_str[] = {"NAT-PMP", "UPnP"};
char ret[200]; 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); , type_str[type], external_port);
return ret; return ret;
} }
@ -1175,7 +1175,7 @@ namespace libtorrent
{ {
static char const* type_str[] = {"NAT-PMP", "UPnP"}; static char const* type_str[] = {"NAT-PMP", "UPnP"};
char ret[200]; 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; return ret;
} }
}; };

8
include/libtorrent/config.hpp
View File

@ -115,10 +115,16 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
#include <stdarg.h>
// this is the maximum number of characters in a // this is the maximum number of characters in a
// path element / filename on windows // path element / filename on windows
#define NAME_MAX 255 #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 #define strtoll _strtoi64
#endif #endif