From 714206e4cefc927268255ef5301643d1da6ddd9a Mon Sep 17 00:00:00 2001 From: shinyquagsire23 Date: Wed, 25 Oct 2017 17:55:11 -0600 Subject: [PATCH] Service/FS: Mark FileBackend's Write as non-const --- src/core/file_sys/archive_extsavedata.cpp | 3 +-- src/core/file_sys/archive_ncch.cpp | 2 +- src/core/file_sys/archive_ncch.h | 2 +- src/core/file_sys/archive_selfncch.cpp | 3 +-- src/core/file_sys/disk_archive.cpp | 2 +- src/core/file_sys/disk_archive.h | 2 +- src/core/file_sys/file_backend.h | 3 +-- src/core/file_sys/ivfc_archive.cpp | 2 +- src/core/file_sys/ivfc_archive.h | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 4867c9d17..e401be507 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -35,8 +35,7 @@ public: return false; } - ResultVal Write(u64 offset, size_t length, bool flush, - const u8* buffer) const override { + ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) override { if (offset > size) { return ERR_WRITE_BEYOND_END; } else if (offset == size) { diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index 45d81e0f5..07d7967d9 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -206,7 +206,7 @@ ResultVal NCCHFile::Read(const u64 offset, const size_t length, u8* buff } ResultVal NCCHFile::Write(const u64 offset, const size_t length, const bool flush, - const u8* buffer) const { + const u8* buffer) { LOG_ERROR(Service_FS, "Attempted to write to NCCH file"); // TODO(shinyquagsire23): Find error code return MakeResult(0); diff --git a/src/core/file_sys/archive_ncch.h b/src/core/file_sys/archive_ncch.h index 2b4bb022c..0dfbd4241 100644 --- a/src/core/file_sys/archive_ncch.h +++ b/src/core/file_sys/archive_ncch.h @@ -54,7 +54,7 @@ public: NCCHFile(std::vector buffer) : file_buffer(buffer) {} ResultVal Read(u64 offset, size_t length, u8* buffer) const override; - ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; + ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) override; u64 GetSize() const override; bool SetSize(u64 size) const override; bool Close() const override { diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp index a16941c70..0e6a6d61b 100644 --- a/src/core/file_sys/archive_selfncch.cpp +++ b/src/core/file_sys/archive_selfncch.cpp @@ -51,8 +51,7 @@ public: return MakeResult(data->size()); } - ResultVal Write(u64 offset, size_t length, bool flush, - const u8* buffer) const override { + ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) override { LOG_ERROR(Service_FS, "The file is read-only!"); return ERROR_UNSUPPORTED_OPEN_FLAGS; } diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp index 98d80aabc..677f92467 100644 --- a/src/core/file_sys/disk_archive.cpp +++ b/src/core/file_sys/disk_archive.cpp @@ -25,7 +25,7 @@ ResultVal DiskFile::Read(const u64 offset, const size_t length, u8* buff } ResultVal DiskFile::Write(const u64 offset, const size_t length, const bool flush, - const u8* buffer) const { + const u8* buffer) { if (!mode.write_flag) return ERROR_INVALID_OPEN_FLAGS; diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h index eb9166df6..912d264e8 100644 --- a/src/core/file_sys/disk_archive.h +++ b/src/core/file_sys/disk_archive.h @@ -28,7 +28,7 @@ public: } ResultVal Read(u64 offset, size_t length, u8* buffer) const override; - ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; + ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) override; u64 GetSize() const override; bool SetSize(u64 size) const override; bool Close() const override; diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h index 5e7c2bab4..009ee139a 100644 --- a/src/core/file_sys/file_backend.h +++ b/src/core/file_sys/file_backend.h @@ -35,8 +35,7 @@ public: * @param buffer Buffer to read data from * @return Number of bytes written, or error code */ - virtual ResultVal Write(u64 offset, size_t length, bool flush, - const u8* buffer) const = 0; + virtual ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) = 0; /** * Get the size of the file in bytes diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp index 2735d2e3c..07dcf010d 100644 --- a/src/core/file_sys/ivfc_archive.cpp +++ b/src/core/file_sys/ivfc_archive.cpp @@ -94,7 +94,7 @@ ResultVal IVFCFile::Read(const u64 offset, const size_t length, u8* buff } ResultVal IVFCFile::Write(const u64 offset, const size_t length, const bool flush, - const u8* buffer) const { + const u8* buffer) { LOG_ERROR(Service_FS, "Attempted to write to IVFC file"); // TODO(Subv): Find error code return MakeResult(0); diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h index e6fbdfb1f..53a2637a6 100644 --- a/src/core/file_sys/ivfc_archive.h +++ b/src/core/file_sys/ivfc_archive.h @@ -56,7 +56,7 @@ public: : romfs_file(file), data_offset(offset), data_size(size) {} ResultVal Read(u64 offset, size_t length, u8* buffer) const override; - ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; + ResultVal Write(u64 offset, size_t length, bool flush, const u8* buffer) override; u64 GetSize() const override; bool SetSize(u64 size) const override; bool Close() const override {