diff --git a/support/src/utils/file_directory.cpp b/support/src/utils/file_directory.cpp index 28b5114b..c7cdeda9 100644 --- a/support/src/utils/file_directory.cpp +++ b/support/src/utils/file_directory.cpp @@ -112,9 +112,9 @@ auto directory::copy_to(std::string_view new_path, function_name, "failed to copy directory", "not implemented", - path_, - new_path, utils::string::from_bool(overwrite), + new_path, + path_, }); } catch (const std::exception &e) { utils::error::handle_exception(function_name, e); @@ -381,8 +381,8 @@ auto directory::move_to(std::string_view new_path) -> bool { function_name, "failed to move directory", "not implemented", - path_, new_path, + path_, }); } catch (const std::exception &e) { utils::error::handle_exception(function_name, e); diff --git a/support/src/utils/file_smb_directory.cpp b/support/src/utils/file_smb_directory.cpp index a532ddcf..0d110672 100644 --- a/support/src/utils/file_smb_directory.cpp +++ b/support/src/utils/file_smb_directory.cpp @@ -145,8 +145,8 @@ auto smb_directory::copy_to(std::string_view new_path, function_name, "failed to copy directory", "not implemented", - path_, new_path, + path_, }); } catch (const std::exception &e) { utils::error::handle_exception(function_name, e); @@ -342,6 +342,7 @@ auto smb_directory::get_directory(std::string_view path) const function_name, "failed to stat directory", rel_path, + path_, }); } @@ -351,6 +352,7 @@ auto smb_directory::get_directory(std::string_view path) const function_name, "path is not a directory", rel_path, + path_, }); } @@ -461,6 +463,7 @@ auto smb_directory::get_file(std::string_view path) const -> fs_file_t { function_name, "failed to stat file", rel_path, + path_, }); } @@ -470,6 +473,7 @@ auto smb_directory::get_file(std::string_view path) const -> fs_file_t { function_name, "path is not a file", rel_path, + path_, }); } @@ -664,8 +668,8 @@ auto smb_directory::move_to(std::string_view new_path) -> bool { function_name, "failed to move directory", "not implemented", - path_, new_path, + path_, }); } catch (const std::exception &e) { utils::error::handle_exception(function_name, e); diff --git a/support/src/utils/file_smb_file.cpp b/support/src/utils/file_smb_file.cpp index 76726157..df37cba7 100644 --- a/support/src/utils/file_smb_file.cpp +++ b/support/src/utils/file_smb_file.cpp @@ -55,8 +55,8 @@ auto smb_file::copy_to(std::string_view new_path, "failed to copy file", "not implemented", std::to_string(overwrite), - path_, new_path, + path_, }); } catch (const std::exception &e) { utils::error::handle_exception(function_name, e); @@ -139,6 +139,7 @@ auto smb_file::get_time(smb_session *session, smb_tid tid, std::string path, "failed to stat file", "not implemented", rel_path, + path, }); } @@ -194,8 +195,8 @@ auto smb_file::move_to(std::string_view new_path) -> bool { function_name, "failed to move file", "new path must be in same share", - path_, new_path, + path_, }); } @@ -216,9 +217,9 @@ auto smb_file::move_to(std::string_view new_path) -> bool { throw utils::error::create_exception({ function_name, "failed to connect to share", - path_, std::to_string(res), share_name_, + path_, }); } @@ -227,7 +228,6 @@ auto smb_file::move_to(std::string_view new_path) -> bool { throw utils::error::create_exception({ function_name, "failed to move file", - path_, std::to_string(res), from_path, to_path, @@ -268,9 +268,9 @@ auto smb_file::open(bool read_only) -> bool { throw utils::error::create_exception({ function_name, "failed to connect to share", - path_, std::to_string(res), share_name_, + path_, }); } @@ -281,11 +281,10 @@ auto smb_file::open(bool read_only) -> bool { throw utils::error::create_exception({ function_name, "failed to open file", - utils::string::from_bool(read_only), - path_, std::to_string(res), - path_, + utils::string::from_bool(read_only), rel_path, + path_, }); } @@ -385,9 +384,9 @@ auto smb_file::remove() -> bool { throw utils::error::create_exception({ function_name, "failed to connect to share", - path_, std::to_string(res), share_name_, + path_, }); } @@ -399,8 +398,8 @@ auto smb_file::remove() -> bool { "failed to remove file", std::to_string(res), std::to_string(smb_session_get_nt_status(session_.get())), - path_, rel_path, + path_, }); } @@ -444,6 +443,7 @@ auto smb_file::size() const -> std::optional { function_name, "failed to stat directory", rel_path, + path_, }); }