Whitespace: {curl_,scp_,}uploader.{cc,h}

1 files changed, 33 insertions, 33 deletions

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 6c63a6c3e..78ab1e7a4 100644
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -39,110 +39,110 @@ using std::shared_ptr;
 using std::string;
 
 
-SCPUploader::SCPUploader (function<void (string)> set_status, function<void (float)> set_progress)
-	: Uploader (set_status, set_progress)
+SCPUploader::SCPUploader(function<void (string)> set_status, function<void (float)> set_progress)
+	: Uploader(set_status, set_progress)
 {
-	_session = ssh_new ();
+	_session = ssh_new();
 	if (!_session) {
-		throw NetworkError (String::compose(_("SSH error [%1]"), "ssh_new"));
+		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);
+	ssh_options_set(_session, SSH_OPTIONS_PORT, &port);
 
-	int r = ssh_connect (_session);
+	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)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
-	r = ssh_is_server_known (_session);
+	r = ssh_is_server_known(_session);
 	if (r == SSH_SERVER_ERROR) {
-		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_is_server_known", ssh_get_error(_session)));
+		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_is_server_known", ssh_get_error(_session)));
 	}
 LIBDCP_ENABLE_WARNINGS
 
-	r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ());
+	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)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
-	_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());
 LIBDCP_ENABLE_WARNINGS
 	if (!_scp) {
-		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_new", ssh_get_error(_session)));
+		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_scp_new", ssh_get_error(_session)));
 	}
 
 LIBDCP_DISABLE_WARNINGS
-	r = ssh_scp_init (_scp);
+	r = ssh_scp_init(_scp);
 LIBDCP_ENABLE_WARNINGS
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_init", ssh_get_error(_session)));
+		throw NetworkError(String::compose(_("SSH error [%1] (%2)"), "ssh_scp_init", ssh_get_error(_session)));
 	}
 }
 
 
-SCPUploader::~SCPUploader ()
+SCPUploader::~SCPUploader()
 {
 LIBDCP_DISABLE_WARNINGS
-	ssh_scp_free (_scp);
+	ssh_scp_free(_scp);
 LIBDCP_ENABLE_WARNINGS
-	ssh_disconnect (_session);
-	ssh_free (_session);
+	ssh_disconnect(_session);
+	ssh_free(_session);
 }
 
 
 void
-SCPUploader::create_directory (boost::filesystem::path directory)
+SCPUploader::create_directory(boost::filesystem::path directory)
 {
 	/* Use generic_string so that we get forward-slashes in the path, even on Windows */
 LIBDCP_DISABLE_WARNINGS
-	int const r = ssh_scp_push_directory (_scp, directory.generic_string().c_str(), S_IRWXU);
+	int const r = ssh_scp_push_directory(_scp, directory.generic_string().c_str(), S_IRWXU);
 LIBDCP_ENABLE_WARNINGS
 	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)
+SCPUploader::upload_file(boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
 {
 	auto to_do = dcp::filesystem::file_size(from);
 	/* Use generic_string so that we get forward-slashes in the path, even on Windows */
 LIBDCP_DISABLE_WARNINGS
-	ssh_scp_push_file (_scp, to.generic_string().c_str(), to_do, S_IRUSR | S_IWUSR);
+	ssh_scp_push_file(_scp, to.generic_string().c_str(), to_do, S_IRUSR | S_IWUSR);
 LIBDCP_ENABLE_WARNINGS
 
 	dcp::File f(from, "rb");
 	if (!f) {
-		throw NetworkError (String::compose(_("Could not open %1 to send"), from));
+		throw NetworkError(String::compose(_("Could not open %1 to send"), from));
 	}
 
 	boost::uintmax_t buffer_size = 64 * 1024;
 	char buffer[buffer_size];
 
 	while (to_do > 0) {
-		int const t = min (to_do, buffer_size);
+		int const t = min(to_do, buffer_size);
 		size_t const read = f.read(buffer, 1, t);
-		if (read != size_t (t)) {
-			throw ReadFileError (from);
+		if (read != size_t(t)) {
+			throw ReadFileError(from);
 		}
 
 LIBDCP_DISABLE_WARNINGS
-		int const r = ssh_scp_write (_scp, buffer, t);
+		int const r = ssh_scp_write(_scp, buffer, t);
 LIBDCP_ENABLE_WARNINGS
 		if (r != SSH_OK) {
-			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;
 
 		if (total_size > 0) {
-			_set_progress ((double) transferred / total_size);
+			_set_progress((double) transferred / total_size);
 		}
 	}
 }