diff --git a/src/readdir.cpp b/src/readdir.cpp index 8319d779..96c8b06d 100644 --- a/src/readdir.cpp +++ b/src/readdir.cpp @@ -43,7 +43,6 @@ using std::string; using std::vector; using std::set; using std::pair; -using mergerfs::readdir::FileData; #define NO_OFFSET 0 @@ -86,35 +85,10 @@ _readdir(const vector &srcmounts, return 0; } -static -int -stat_vector_filler(void *buf, - const char *name, - const struct stat *stbuf, - off_t off) -{ - vector *stats = (vector*)buf; - - stats->push_back(FileData(name,*stbuf)); - - return 0; -} - namespace mergerfs { namespace readdir { - int - readdir(const vector &srcmounts, - const string &dirname, - vector &stats) - { - return _readdir(srcmounts, - dirname, - &stats, - stat_vector_filler); - } - int readdir(const char *fusepath, void *buf, diff --git a/src/readdir.hpp b/src/readdir.hpp index cf93969f..94994fd8 100644 --- a/src/readdir.hpp +++ b/src/readdir.hpp @@ -38,29 +38,12 @@ namespace mergerfs { namespace readdir { - struct FileData - { - FileData(const std::string &filename_, - const struct stat &stats_) - : filename(filename_), - stats(stats_) - {} - - std::string filename; - struct stat stats; - }; - int readdir(const char *fusepath, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi); - - int - readdir(const std::vector &srcmounts, - const std::string &dirname, - std::vector &stats); } }