RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 17:55:06 +00:00
Code Issues Activity Actions

Kernel: Make File::write() and File::read() return KResultOr<size_t>

Browse source 
Instead of returning a ssize_t where negative values mean error,
we now return KResultOr<size_t> and use the error state to report
errors exclusively.
This commit is contained in:
Andreas Kling 2020-08-04 18:02:23 +02:00
parent 58feebeed2
commit 7a3ab6c517
58 changed files with 223 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/FileSystem/InodeFile.cpp
View file

@ -44,21 +44,25 @@ InodeFile::~InodeFile()
{
}
ssize_t InodeFile::read(FileDescription& description, size_t offset, u8* buffer, ssize_t count)
KResultOr<size_t> InodeFile::read(FileDescription& description, size_t offset, u8* buffer, size_t count)
{
ssize_t nread = m_inode->read_bytes(offset, count, buffer, &description);
if (nread > 0)
Thread::current()->did_file_read(nread);
if (nread < 0)
return KResult(nread);
return nread;
}
ssize_t InodeFile::write(FileDescription& description, size_t offset, const u8* data, ssize_t count)
KResultOr<size_t> InodeFile::write(FileDescription& description, size_t offset, const u8* data, size_t count)
{
ssize_t nwritten = m_inode->write_bytes(offset, count, data, &description);
if (nwritten > 0) {
m_inode->set_mtime(kgettimeofday().tv_sec);
Thread::current()->did_file_write(nwritten);
}
if (nwritten < 0)
return KResult(nwritten);
return nwritten;
}