Skip to content

Commit 533910c

Browse files
kjbraceyHasnain Virk
authored andcommitted
Correct return type of FileHandle::size()
File size should be off_t, not size_t.
1 parent 88c398b commit 533910c

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

features/filesystem/File.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void File::rewind()
104104
return _fs->file_rewind(_file);
105105
}
106106

107-
size_t File::size()
107+
off_t File::size()
108108
{
109109
MBED_ASSERT(_fs);
110110
return _fs->file_size(_file);

features/filesystem/File.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class File : public FileHandle {
124124
*
125125
* @return Size of the file in bytes
126126
*/
127-
virtual size_t size();
127+
virtual off_t size();
128128

129129
private:
130130
FileSystem *_fs;

features/filesystem/FileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ void FileSystem::file_rewind(fs_file_t file)
4545
file_seek(file, 0, SEEK_SET);
4646
}
4747

48-
size_t FileSystem::file_size(fs_file_t file)
48+
off_t FileSystem::file_size(fs_file_t file)
4949
{
5050
off_t off = file_tell(file);
51-
size_t size = file_seek(file, 0, SEEK_END);
51+
off_t size = file_seek(file, 0, SEEK_END);
5252
file_seek(file, off, SEEK_SET);
5353
return size;
5454
}

features/filesystem/FileSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class FileSystem : public FileBase {
175175
* @param file File handle
176176
* @return Size of the file in bytes
177177
*/
178-
virtual size_t file_size(fs_file_t file);
178+
virtual off_t file_size(fs_file_t file);
179179

180180
/** Open a directory on the filesystem
181181
*

features/filesystem/fat/FATFileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,11 @@ off_t FATFileSystem::file_tell(fs_file_t file) {
508508
return res;
509509
}
510510

511-
size_t FATFileSystem::file_size(fs_file_t file) {
511+
off_t FATFileSystem::file_size(fs_file_t file) {
512512
FIL *fh = static_cast<FIL*>(file);
513513

514514
lock();
515-
size_t res = fh->fsize;
515+
off_t res = fh->fsize;
516516
unlock();
517517

518518
return res;

features/filesystem/fat/FATFileSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class FATFileSystem : public FileSystem {
179179
* @param file File handle
180180
* @return Size of the file in bytes
181181
*/
182-
virtual size_t file_size(fs_file_t file);
182+
virtual off_t file_size(fs_file_t file);
183183

184184
/** Open a directory on the filesystem
185185
*

platform/FileHandle.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ class FileHandle {
114114
*
115115
* @return Size of the file in bytes
116116
*/
117-
virtual size_t size()
117+
virtual off_t size()
118118
{
119119
off_t off = tell();
120-
size_t size = seek(0, SEEK_END);
120+
off_t size = seek(0, SEEK_END);
121121
seek(off, SEEK_SET);
122122
return size;
123123
}

platform/LocalFileSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int LocalFileHandle::sync() {
164164
return ret;
165165
}
166166

167-
size_t LocalFileHandle::size() {
167+
off_t LocalFileHandle::size() {
168168
lock();
169169
off_t off = semihost_flen(_fh);
170170
unlock();

platform/LocalFileSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class LocalFileHandle : public FileHandle {
5151

5252
virtual int sync();
5353

54-
virtual size_t size();
54+
virtual off_t size();
5555

5656
protected:
5757
virtual void lock();

platform/Stream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int Stream::sync() {
119119
return 0;
120120
}
121121

122-
size_t Stream::size() {
122+
off_t Stream::size() {
123123
return 0;
124124
}
125125

platform/Stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Stream : public FileLike {
6161
virtual void rewind();
6262
virtual int isatty();
6363
virtual int sync();
64-
virtual size_t size();
64+
virtual off_t size();
6565

6666
virtual int _putc(int c) = 0;
6767
virtual int _getc() = 0;

0 commit comments

Comments
 (0)