mirror of https://github.com/ARMmbed/mbed-os.git
Correct return type of FileHandle::size()
File size should be off_t, not size_t.pull/4119/head
parent
88c398b52a
commit
533910cb87
|
@ -104,7 +104,7 @@ void File::rewind()
|
|||
return _fs->file_rewind(_file);
|
||||
}
|
||||
|
||||
size_t File::size()
|
||||
off_t File::size()
|
||||
{
|
||||
MBED_ASSERT(_fs);
|
||||
return _fs->file_size(_file);
|
||||
|
|
|
@ -124,7 +124,7 @@ public:
|
|||
*
|
||||
* @return Size of the file in bytes
|
||||
*/
|
||||
virtual size_t size();
|
||||
virtual off_t size();
|
||||
|
||||
private:
|
||||
FileSystem *_fs;
|
||||
|
|
|
@ -45,10 +45,10 @@ void FileSystem::file_rewind(fs_file_t file)
|
|||
file_seek(file, 0, SEEK_SET);
|
||||
}
|
||||
|
||||
size_t FileSystem::file_size(fs_file_t file)
|
||||
off_t FileSystem::file_size(fs_file_t file)
|
||||
{
|
||||
off_t off = file_tell(file);
|
||||
size_t size = file_seek(file, 0, SEEK_END);
|
||||
off_t size = file_seek(file, 0, SEEK_END);
|
||||
file_seek(file, off, SEEK_SET);
|
||||
return size;
|
||||
}
|
||||
|
|
|
@ -175,7 +175,7 @@ protected:
|
|||
* @param file File handle
|
||||
* @return Size of the file in bytes
|
||||
*/
|
||||
virtual size_t file_size(fs_file_t file);
|
||||
virtual off_t file_size(fs_file_t file);
|
||||
|
||||
/** Open a directory on the filesystem
|
||||
*
|
||||
|
|
|
@ -508,11 +508,11 @@ off_t FATFileSystem::file_tell(fs_file_t file) {
|
|||
return res;
|
||||
}
|
||||
|
||||
size_t FATFileSystem::file_size(fs_file_t file) {
|
||||
off_t FATFileSystem::file_size(fs_file_t file) {
|
||||
FIL *fh = static_cast<FIL*>(file);
|
||||
|
||||
lock();
|
||||
size_t res = fh->fsize;
|
||||
off_t res = fh->fsize;
|
||||
unlock();
|
||||
|
||||
return res;
|
||||
|
|
|
@ -179,7 +179,7 @@ protected:
|
|||
* @param file File handle
|
||||
* @return Size of the file in bytes
|
||||
*/
|
||||
virtual size_t file_size(fs_file_t file);
|
||||
virtual off_t file_size(fs_file_t file);
|
||||
|
||||
/** Open a directory on the filesystem
|
||||
*
|
||||
|
|
|
@ -114,10 +114,10 @@ public:
|
|||
*
|
||||
* @return Size of the file in bytes
|
||||
*/
|
||||
virtual size_t size()
|
||||
virtual off_t size()
|
||||
{
|
||||
off_t off = tell();
|
||||
size_t size = seek(0, SEEK_END);
|
||||
off_t size = seek(0, SEEK_END);
|
||||
seek(off, SEEK_SET);
|
||||
return size;
|
||||
}
|
||||
|
|
|
@ -164,7 +164,7 @@ int LocalFileHandle::sync() {
|
|||
return ret;
|
||||
}
|
||||
|
||||
size_t LocalFileHandle::size() {
|
||||
off_t LocalFileHandle::size() {
|
||||
lock();
|
||||
off_t off = semihost_flen(_fh);
|
||||
unlock();
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
|
||||
virtual int sync();
|
||||
|
||||
virtual size_t size();
|
||||
virtual off_t size();
|
||||
|
||||
protected:
|
||||
virtual void lock();
|
||||
|
|
|
@ -119,7 +119,7 @@ int Stream::sync() {
|
|||
return 0;
|
||||
}
|
||||
|
||||
size_t Stream::size() {
|
||||
off_t Stream::size() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ protected:
|
|||
virtual void rewind();
|
||||
virtual int isatty();
|
||||
virtual int sync();
|
||||
virtual size_t size();
|
||||
virtual off_t size();
|
||||
|
||||
virtual int _putc(int c) = 0;
|
||||
virtual int _getc() = 0;
|
||||
|
|
Loading…
Reference in New Issue