C++11 tidying.

1 files changed, 24 insertions, 18 deletions

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 0926ffa9f..9c349f233 100644
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "scp_uploader.h"
 #include "exceptions.h"
 #include "job.h"
@@ -29,52 +30,55 @@
 
 #include "i18n.h"
 
-using std::string;
+
+using std::function;
 using std::min;
 using std::shared_ptr;
-using boost::function;
+using std::string;
+
 
 SCPUploader::SCPUploader (function<void (string)> set_status, function<void (float)> set_progress)
 	: Uploader (set_status, set_progress)
 {
 	_session = ssh_new ();
 	if (!_session) {
-		throw NetworkError (_("could not start SSH session"));
+		throw NetworkError (String::compose(_("SSH error [%1]"), "ssh_new"));
 	}
 
-	ssh_options_set (_session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
-	ssh_options_set (_session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
+	ssh_options_set (_session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str());
+	ssh_options_set (_session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str());
 	int const port = 22;
 	ssh_options_set (_session, SSH_OPTIONS_PORT, &port);
 
 	int r = ssh_connect (_session);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error(_session)));
 	}
 
 DCPOMATIC_DISABLE_WARNINGS
 	r = ssh_is_server_known (_session);
 	if (r == SSH_SERVER_ERROR) {
-		throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_is_server_known", ssh_get_error(_session)));
 	}
 DCPOMATIC_ENABLE_WARNINGS
 
 	r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ());
 	if (r != SSH_AUTH_SUCCESS) {
-		throw NetworkError (String::compose (_("Failed to authenticate with server (%1)"), ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("Failed to authenticate with server (%1)"), ssh_get_error(_session)));
 	}
 
-	_scp = ssh_scp_new (_session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
+	_scp = ssh_scp_new (_session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str());
 	if (!_scp) {
-		throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_new", ssh_get_error(_session)));
 	}
 
 	r = ssh_scp_init (_scp);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose (_("Could not start SCP session (%1)"), ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_init", ssh_get_error(_session)));
 	}
 }
 
+
 SCPUploader::~SCPUploader ()
 {
 	ssh_scp_free (_scp);
@@ -82,26 +86,28 @@ SCPUploader::~SCPUploader ()
 	ssh_free (_session);
 }
 
+
 void
 SCPUploader::create_directory (boost::filesystem::path directory)
 {
 	/* Use generic_string so that we get forward-slashes in the path, even on Windows */
 	int const r = ssh_scp_push_directory (_scp, directory.generic_string().c_str(), S_IRWXU);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), directory, ssh_get_error (_session)));
+		throw NetworkError (String::compose(_("Could not create remote directory %1 (%2)"), directory, ssh_get_error(_session)));
 	}
 }
 
+
 void
 SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
 {
-	boost::uintmax_t to_do = boost::filesystem::file_size (from);
+	auto to_do = boost::filesystem::file_size (from);
 	/* Use generic_string so that we get forward-slashes in the path, even on Windows */
 	ssh_scp_push_file (_scp, to.generic_string().c_str(), to_do, S_IRUSR | S_IWUSR);
 
-	FILE* f = fopen_boost (from, "rb");
-	if (f == 0) {
-		throw NetworkError (String::compose (_("Could not open %1 to send"), from));
+	auto f = fopen_boost (from, "rb");
+	if (f == nullptr) {
+		throw NetworkError (String::compose(_("Could not open %1 to send"), from));
 	}
 
 	boost::uintmax_t buffer_size = 64 * 1024;
@@ -118,7 +124,7 @@ SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
 		int const r = ssh_scp_write (_scp, buffer, t);
 		if (r != SSH_OK) {
 			fclose (f);
-			throw NetworkError (String::compose (_("Could not write to remote file (%1)"), ssh_get_error (_session)));
+			throw NetworkError (String::compose(_("Could not write to remote file (%1)"), ssh_get_error(_session)));
 		}
 		to_do -= t;
 		transferred += t;