From 42b67a7b616b352d7743a1bbfdf1bac13ee3924c Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 27 Jul 2024 09:00:11 -0500 Subject: [PATCH] refactor --- .../src/drives/fuse/remotefuse/remote_server.cpp | 11 +++++------ .../src/drives/winfsp/remotewinfsp/remote_server.cpp | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp index 441ec3dc..ccccffc8 100644 --- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp +++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp @@ -620,8 +620,8 @@ auto remote_server::fuse_opendir(const char *path, remote::file_handle &handle) errno = ENOENT; if (utils::file::is_directory(file_path)) { - auto list = drive_.get_directory_items(utils::path::create_api_path(path)); - auto iter = std::make_shared(std::move(list)); + auto iter = std::make_shared( + drive_.get_directory_items(utils::path::create_api_path(path))); handle = get_next_handle(); directory_cache_.set_directory(path, handle, iter); @@ -1355,8 +1355,7 @@ auto remote_server::winfsp_read_directory(PVOID file_desc, PWSTR /*pattern*/, if (ret == STATUS_SUCCESS) { const auto api_path = construct_api_path( get_open_file_path(static_cast(handle))); - auto list = drive_.get_directory_items(api_path); - directory_iterator iterator(std::move(list)); + directory_iterator iterator(drive_.get_directory_items(api_path)); auto offset = marker == nullptr ? 0 : iterator.get_next_directory_offset( @@ -1567,8 +1566,8 @@ auto remote_server::json_create_directory_snapshot( errno = ENOENT; if (utils::file::is_directory(file_path)) { - auto list = drive_.get_directory_items(api_path); - auto iter = std::make_shared(std::move(list)); + auto iter = std::make_shared( + drive_.get_directory_items(api_path)); auto handle = get_next_handle(); directory_cache_.set_directory(api_path, handle, iter); diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp index 2f0537e6..2ede7fab 100644 --- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp +++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp @@ -338,8 +338,8 @@ auto remote_server::fuse_opendir(const char *path, remote::file_handle &handle) errno = ENOENT; if (::PathIsDirectoryW(unicode_file_path.c_str()) != 0) { - auto list = drive_.get_directory_items(utils::path::create_api_path(path)); - auto iter = std::make_shared(std::move(list)); + auto iter = std::make_shared( + drive_.get_directory_items(utils::path::create_api_path(path))); handle = get_next_handle(); directory_cache_.set_directory(path, handle, iter); @@ -827,8 +827,8 @@ auto remote_server::json_create_directory_snapshot( errno = ENOENT; if (utils::file::is_directory(file_path)) { - auto list = drive_.get_directory_items(utils::path::create_api_path(path)); - auto iter = std::make_shared(std::move(list)); + auto iter = std::make_shared( + drive_.get_directory_items(utils::path::create_api_path(path))); auto handle = get_next_handle(); directory_cache_.set_directory(path, handle, iter); @@ -1213,8 +1213,7 @@ auto remote_server::winfsp_read_directory(PVOID file_desc, PWSTR /*pattern*/, if (get_open_info(file_desc, ofi)) { const auto api_path = utils::path::create_api_path(ofi.path.substr(mount_location_.size())); - auto items = drive_.get_directory_items(api_path); - directory_iterator iter(std::move(items)); + directory_iterator iter(drive_.get_directory_items(api_path)); auto offset = marker == nullptr ? 0 : iter.get_next_directory_offset(