diff --git a/src/provider_main.cpp b/src/provider_main.cpp index 139a82e..d3b779f 100644 --- a/src/provider_main.cpp +++ b/src/provider_main.cpp @@ -135,7 +135,7 @@ public: return -ENOENT; } - int readdir(std::string const & path, std::vector & entries, uint64_t handle) override + int readdir(std::string const & path, std::vector & entries) override { auto const full_path = get_full_path(path); std::cout << "readdir: " << full_path << std::endl; diff --git a/src/webfuse/filesystem.cpp b/src/webfuse/filesystem.cpp index feadeb7..517b73f 100644 --- a/src/webfuse/filesystem.cpp +++ b/src/webfuse/filesystem.cpp @@ -364,7 +364,7 @@ int filesystem::mkdir(std::string const & path, mode_t mode) } } -int filesystem::readdir(std::string const & path, std::vector & entries, uint64_t handle) +int filesystem::readdir(std::string const & path, std::vector & entries) { try { @@ -380,7 +380,7 @@ int filesystem::readdir(std::string const & path, std::vector & ent } catch(...) { - return fallback.readdir(path, entries, handle); + return fallback.readdir(path, entries); } } diff --git a/src/webfuse/filesystem.hpp b/src/webfuse/filesystem.hpp index ca1e29e..b20aca8 100644 --- a/src/webfuse/filesystem.hpp +++ b/src/webfuse/filesystem.hpp @@ -42,7 +42,7 @@ public: int write(std::string const & path, char const * buffer, size_t buffer_size, uint64_t offset, uint64_t handle) override; int mkdir(std::string const & path, mode_t mode) override; - int readdir(std::string const & path, std::vector & entries, uint64_t handle) override; + int readdir(std::string const & path, std::vector & entries) override; int rmdir(std::string const & path) override; int statfs(std::string const & path, struct statvfs * statistics) override; diff --git a/src/webfuse/filesystem/empty_filesystem.cpp b/src/webfuse/filesystem/empty_filesystem.cpp index b0d33b3..71b4fb3 100644 --- a/src/webfuse/filesystem/empty_filesystem.cpp +++ b/src/webfuse/filesystem/empty_filesystem.cpp @@ -115,7 +115,7 @@ int empty_filesystem::mkdir(std::string const & path, mode_t mode) return -EPERM; } -int empty_filesystem::readdir(std::string const & path, std::vector & entries, uint64_t handle) +int empty_filesystem::readdir(std::string const & path, std::vector & entries) { if (path == "/") { diff --git a/src/webfuse/filesystem/empty_filesystem.hpp b/src/webfuse/filesystem/empty_filesystem.hpp index c271063..97ff3ef 100644 --- a/src/webfuse/filesystem/empty_filesystem.hpp +++ b/src/webfuse/filesystem/empty_filesystem.hpp @@ -35,7 +35,7 @@ public: int write(std::string const & path, char const * buffer, size_t buffer_size, uint64_t offset, uint64_t handle) override; int mkdir(std::string const & path, mode_t mode) override; - int readdir(std::string const & path, std::vector & entries, uint64_t handle) override; + int readdir(std::string const & path, std::vector & entries) override; int rmdir(std::string const & path) override; int statfs(std::string const & path, struct statvfs * statistivs) override; diff --git a/src/webfuse/filesystem/filesystem_i.hpp b/src/webfuse/filesystem/filesystem_i.hpp index 2d42e52..2e3f3c7 100644 --- a/src/webfuse/filesystem/filesystem_i.hpp +++ b/src/webfuse/filesystem/filesystem_i.hpp @@ -42,7 +42,7 @@ public: virtual int write(std::string const & path, char const * buffer, size_t buffer_size, uint64_t offset, uint64_t handle) = 0; virtual int mkdir(std::string const & path, mode_t mode) = 0; - virtual int readdir(std::string const & path, std::vector & entries, uint64_t handle) = 0; + virtual int readdir(std::string const & path, std::vector & entries) = 0; virtual int rmdir(std::string const & path) = 0; virtual int statfs(std::string const & path, struct statvfs * statistics) = 0; diff --git a/src/webfuse/fuse.cpp b/src/webfuse/fuse.cpp index a1e101e..6d856a0 100644 --- a/src/webfuse/fuse.cpp +++ b/src/webfuse/fuse.cpp @@ -184,7 +184,7 @@ static int fs_readdir(char const * path, void * buffer, auto * const fs = fs_get_filesystem(); auto handle = fs_get_handle(info); std::vector names; - auto const result = fs->readdir(path, names, handle); + auto const result = fs->readdir(path, names); if (0 == result) { filler(buffer, ".", nullptr, 0, static_cast(0)); diff --git a/src/webfuse/provider.cpp b/src/webfuse/provider.cpp index 1b1b53c..b457f25 100644 --- a/src/webfuse/provider.cpp +++ b/src/webfuse/provider.cpp @@ -139,7 +139,7 @@ private: auto const path = reader.read_str(); std::vector entries; - auto const result = fs_.readdir(path, entries, static_cast(-1)); + auto const result = fs_.readdir(path, entries); writer.write_i32(result); if (0 == result) { diff --git a/test-src/integration/test_readdir.cpp b/test-src/integration/test_readdir.cpp index 638192d..7ea787f 100644 --- a/test-src/integration/test_readdir.cpp +++ b/test-src/integration/test_readdir.cpp @@ -33,7 +33,7 @@ TEST(readdir, existing_dir) return -ENOENT; } })); - EXPECT_CALL(fs, readdir("/some_dir",_,_)).WillOnce(Invoke([](auto const & path, auto & entries, auto handle) { + EXPECT_CALL(fs, readdir("/some_dir",_)).WillOnce(Invoke([](auto const & path, auto & entries) { entries.push_back("foo"); return 0; })); @@ -85,7 +85,7 @@ TEST(readdir, non_existing_dir) return -ENOENT; } })); - EXPECT_CALL(fs, readdir("/some_dir",_,_)).Times(0); + EXPECT_CALL(fs, readdir("/some_dir",_)).Times(0); webfuse::fixture fixture(fs); auto const path = fixture.get_path() + "/some_dir"; diff --git a/test-src/integration/webfuse/test/filesystem_mock.hpp b/test-src/integration/webfuse/test/filesystem_mock.hpp index c7d807c..56a6f55 100644 --- a/test-src/integration/webfuse/test/filesystem_mock.hpp +++ b/test-src/integration/webfuse/test/filesystem_mock.hpp @@ -36,7 +36,7 @@ public: MOCK_METHOD(int, write, (std::string const & path, char const * buffer, size_t buffer_size, uint64_t offset, uint64_t handle)); MOCK_METHOD(int, mkdir, (std::string const & path, mode_t mode)); - MOCK_METHOD(int, readdir, (std::string const & path, std::vector & entries, uint64_t handle)); + MOCK_METHOD(int, readdir, (std::string const & path, std::vector & entries)); MOCK_METHOD(int, rmdir, (std::string const & path)); MOCK_METHOD(int, statfs, (std::string const & path, struct statvfs * statistics));