diff --git a/fs_interface/OpenFile.h b/fs_interface/OpenFile.h index 290faedb..4f1b464c 100644 --- a/fs_interface/OpenFile.h +++ b/fs_interface/OpenFile.h @@ -14,7 +14,7 @@ public: virtual void stat(struct ::stat *result) const = 0; virtual void truncate(off_t size) const = 0; - virtual ssize_t read(void *buf, size_t count, off_t offset) const = 0; + virtual size_t read(void *buf, size_t count, off_t offset) const = 0; virtual void write(const void *buf, size_t count, off_t offset) = 0; virtual void flush() = 0; virtual void fsync() = 0; diff --git a/fuse/Filesystem.h b/fuse/Filesystem.h index f406de3f..c47dbccb 100644 --- a/fuse/Filesystem.h +++ b/fuse/Filesystem.h @@ -27,7 +27,7 @@ public: virtual void chown(const boost::filesystem::path &path, uid_t uid, gid_t gid) = 0; virtual void truncate(const boost::filesystem::path &path, off_t size) = 0; virtual void ftruncate(int descriptor, off_t size) = 0; - virtual int read(int descriptor, void *buf, size_t count, off_t offset) = 0; + virtual size_t read(int descriptor, void *buf, size_t count, off_t offset) = 0; virtual void write(int descriptor, const void *buf, size_t count, off_t offset) = 0; virtual void fsync(int descriptor) = 0; virtual void fdatasync(int descriptor) = 0; diff --git a/impl/FilesystemImpl.cpp b/impl/FilesystemImpl.cpp index 5e8cdff7..6cd876b9 100644 --- a/impl/FilesystemImpl.cpp +++ b/impl/FilesystemImpl.cpp @@ -195,7 +195,7 @@ void FilesystemImpl::ftruncate(int descriptor, off_t size) { _open_files.get(descriptor)->truncate(size); } -int FilesystemImpl::read(int descriptor, void *buf, size_t count, off_t offset) { +size_t FilesystemImpl::read(int descriptor, void *buf, size_t count, off_t offset) { PROFILE(_readNanosec); return _open_files.get(descriptor)->read(buf, count, offset); } diff --git a/impl/FilesystemImpl.h b/impl/FilesystemImpl.h index 6f97b514..f29e4913 100644 --- a/impl/FilesystemImpl.h +++ b/impl/FilesystemImpl.h @@ -31,7 +31,7 @@ public: void chown(const boost::filesystem::path &path, uid_t uid, gid_t gid) override; void truncate(const boost::filesystem::path &path, off_t size) override; void ftruncate(int descriptor, off_t size) override; - int read(int descriptor, void *buf, size_t count, off_t offset) override; + size_t read(int descriptor, void *buf, size_t count, off_t offset) override; void write(int descriptor, const void *buf, size_t count, off_t offset) override; void fsync(int descriptor) override; void fdatasync(int descriptor) override;