diff --git a/src/command_object.cc b/src/command_object.cc index 06d8335e..d87c888c 100644 --- a/src/command_object.cc +++ b/src/command_object.cc @@ -43,6 +43,10 @@ #include "command_helpers.h" #include "rpc/command_variable.h" +// torrent::Object +// list_push_back(__UNUSED rpc::target_type target, const torrent::Object& rawArgs) { + + void initialize_command_object() { // CMD_N ("system.method.insert", rak::ptr_fn(&system_method_insert)); diff --git a/src/display/text_element_value.cc b/src/display/text_element_value.cc index 380022d7..403046c0 100644 --- a/src/display/text_element_value.cc +++ b/src/display/text_element_value.cc @@ -82,28 +82,28 @@ TextElementValueBase::print(char* first, char* last, Canvas::attributes_list* at } else if (m_flags & flag_kb) { // Just use a default width of 5 for now. - first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f", (double)val / (1 << 10)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f", (double)val / (1 << 10)), 0), last - first + 1); } else if (m_flags & flag_mb) { // Just use a default width of 8 for now. - first += std::min(std::max(snprintf(first, last - first + 1, "%8.1f", (double)val / (1 << 20)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%8.1f", (double)val / (1 << 20)), 0), last - first + 1); } else if (m_flags & flag_xb) { if (val < (int64_t(1000) << 10)) - first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f KB", (double)val / (int64_t(1) << 10)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f KB", (double)val / (int64_t(1) << 10)), 0), last - first + 1); else if (val < (int64_t(1000) << 20)) - first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f MB", (double)val / (int64_t(1) << 20)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f MB", (double)val / (int64_t(1) << 20)), 0), last - first + 1); else if (val < (int64_t(1000) << 30)) - first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f GB", (double)val / (int64_t(1) << 30)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f GB", (double)val / (int64_t(1) << 30)), 0), last - first + 1); else - first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f TB", (double)val / (int64_t(1) << 40)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%5.1f TB", (double)val / (int64_t(1) << 40)), 0), last - first + 1); } else if (m_flags & flag_timer) { if (val == 0) - first += std::min(std::max(snprintf(first, last - first + 1, "--:--:--"), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "--:--:--"), 0), last - first + 1); else - first += std::min(std::max(snprintf(first, last - first + 1, "%2d:%02d:%02d", (int)(val / 3600), (int)((val / 60) % 60), (int)(val % 60)), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%2d:%02d:%02d", (int)(val / 3600), (int)((val / 60) % 60), (int)(val % 60)), 0), last - first + 1); } else if (m_flags & flag_date) { time_t t = val; @@ -112,7 +112,7 @@ TextElementValueBase::print(char* first, char* last, Canvas::attributes_list* at if (u == NULL) return first; - first += std::min(std::max(snprintf(first, last - first + 1, "%02u/%02u/%04u", u->tm_mday, (u->tm_mon + 1), (1900 + u->tm_year)), 0), last - first + 1);; + first += std::min(std::max(snprintf(first, last - first + 1, "%02u/%02u/%04u", u->tm_mday, (u->tm_mon + 1), (1900 + u->tm_year)), 0), last - first + 1);; } else if (m_flags & flag_time) { time_t t = val; @@ -121,10 +121,10 @@ TextElementValueBase::print(char* first, char* last, Canvas::attributes_list* at if (u == NULL) return first; - first += std::min(std::max(snprintf(first, last - first + 1, "%2d:%02d:%02d", u->tm_hour, u->tm_min, u->tm_sec), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%2d:%02d:%02d", u->tm_hour, u->tm_min, u->tm_sec), 0), last - first + 1); } else { - first += std::min(std::max(snprintf(first, last - first + 1, "%lld", val), 0), last - first + 1); + first += std::min(std::max(snprintf(first, last - first + 1, "%lld", val), 0), last - first + 1); } push_attribute(attributes, Attributes(first, baseAttribute)); diff --git a/src/display/window_download_statusbar.cc b/src/display/window_download_statusbar.cc index cf5a4784..e44172e4 100644 --- a/src/display/window_download_statusbar.cc +++ b/src/display/window_download_statusbar.cc @@ -68,7 +68,7 @@ WindowDownloadStatusbar::redraw() { position = print_download_info(buffer, last, m_download); m_canvas->print(0, 0, "%s", buffer); - position = buffer + std::min(std::max(snprintf(buffer, last - buffer, "Peers: %i(%i) Min/Max: %i/%i Uploads: %i U/I/C/A: %i/%i/%i/%i Failed: %i", + position = buffer + std::min(std::max(snprintf(buffer, last - buffer, "Peers: %i(%i) Min/Max: %i/%i Uploads: %i U/I/C/A: %i/%i/%i/%i Failed: %i", (int)m_download->download()->connection_list()->size(), (int)m_download->download()->peer_list()->available_list_size(), (int)m_download->download()->connection_list()->min_size(),