From e01bf1b81219e8cec126269ab554f00e59d32d10 Mon Sep 17 00:00:00 2001 From: drmpf Date: Wed, 10 Jul 2024 16:58:45 +1000 Subject: [PATCH 1/2] position_fix Fix for error return from position() Issue #9992 --- libraries/FS/src/FS.cpp | 2 +- libraries/FS/src/FS.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/FS/src/FS.cpp b/libraries/FS/src/FS.cpp index 8470ce1fe55..252fc3e3944 100644 --- a/libraries/FS/src/FS.cpp +++ b/libraries/FS/src/FS.cpp @@ -105,7 +105,7 @@ bool File::seek(uint32_t pos, SeekMode mode) { size_t File::position() const { if (!*this) { - return 0; + return (size_t)-1; } return _p->position(); diff --git a/libraries/FS/src/FS.h b/libraries/FS/src/FS.h index 5f2a91761d2..2dda8fd5b0b 100644 --- a/libraries/FS/src/FS.h +++ b/libraries/FS/src/FS.h @@ -64,7 +64,7 @@ class File : public Stream { bool seek(uint32_t pos) { return seek(pos, SeekSet); } - size_t position() const; + size_t position() const; // returns (size_t)-1 on error size_t size() const; bool setBufferSize(size_t size); void close(); From 5f586c496e56a94801a1ebe4ee824641b7734223 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:02:28 +0000 Subject: [PATCH 2/2] ci(pre-commit): Apply automatic fixes --- libraries/FS/src/FS.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/FS/src/FS.h b/libraries/FS/src/FS.h index 2dda8fd5b0b..6572ad987b3 100644 --- a/libraries/FS/src/FS.h +++ b/libraries/FS/src/FS.h @@ -64,7 +64,7 @@ class File : public Stream { bool seek(uint32_t pos) { return seek(pos, SeekSet); } - size_t position() const; // returns (size_t)-1 on error + size_t position() const; // returns (size_t)-1 on error size_t size() const; bool setBufferSize(size_t size); void close();