From eac7536f6a3523f606add3331a87576dc60fee08 Mon Sep 17 00:00:00 2001 From: nullren Date: Sat, 23 Jun 2012 20:21:47 -0700 Subject: [PATCH 1/2] restored create_link took away empty-body warnings from clang by restoring error messages using push_log_std. --- src/command_download.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/command_download.cc b/src/command_download.cc index 18db22c5..92ed582c 100644 --- a/src/command_download.cc +++ b/src/command_download.cc @@ -138,9 +138,10 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type& switch (changeType) { case 0: - // if (symlink(target.c_str(), link.c_str()) == -1) - // control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str())); - // control->core()->push_log("create_link failed: " + std::string(rak::error_number::current().c_str()) + " to " + target); + if (symlink(target.c_str(), link.c_str()) == -1){ + control->core()->push_log_std("create_link failed: " + + std::string(rak::error_number::current().c_str())); + } break; case 1: @@ -149,8 +150,9 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type& rak::error_number::clear_global(); if (!fileStat.update_link(link) || !fileStat.is_link() || - unlink(link.c_str()) == -1) { - // control->core()->push_log("delete_link failed: " + std::string(rak::error_number::current().c_str())); + unlink(link.c_str()) == -1){ + control->core()->push_log_std("delete_link failed: " + + std::string(rak::error_number::current().c_str())); } break; } From 13f672ab4d47206460d2e5abcd91d3a8a9afc38b Mon Sep 17 00:00:00 2001 From: nullren Date: Wed, 27 Jun 2012 00:19:09 -0700 Subject: [PATCH 2/2] using lt_log_print replaced push_log_std with lt_log_print using LOG_TORRENT_WARN. --- src/command_download.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/command_download.cc b/src/command_download.cc index 92ed582c..1e2cd4e2 100644 --- a/src/command_download.cc +++ b/src/command_download.cc @@ -139,8 +139,8 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type& switch (changeType) { case 0: if (symlink(target.c_str(), link.c_str()) == -1){ - control->core()->push_log_std("create_link failed: " - + std::string(rak::error_number::current().c_str())); + lt_log_print(torrent::LOG_TORRENT_WARN, "create_link failed: %s", + rak::error_number::current().c_str()); } break; @@ -151,8 +151,8 @@ apply_d_change_link(core::Download* download, const torrent::Object::list_type& if (!fileStat.update_link(link) || !fileStat.is_link() || unlink(link.c_str()) == -1){ - control->core()->push_log_std("delete_link failed: " - + std::string(rak::error_number::current().c_str())); + lt_log_print(torrent::LOG_TORRENT_WARN, "delete_link failed: %s", + rak::error_number::current().c_str()); } break; }