ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-17 06:38:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: remove 'file_size' from read/write interfaces

Browse Source 
The 'file_size' type denotes the size of files on disk in bytes. On
32-bit architectures it is larger than the size_t, which refers to
in-memory object sizes.

Whereas the use of 'file_size' is appropriate for ftruncate and seek, it
is not a suitable type for the parameters of read/write operations
because those operations refer to in-memory buffers.

This patch replaces the use of 'file_size' by size_t. However, since it
affects all sites where the read/write interface is uses, it takes the
opportunity to replace the C-style (pointer, size) arguments by
'Byte_range_ptr' and 'Const_byte_range_ptr'.

Issue #4706
This commit is contained in:
Norman Feske
2023-02-09 15:07:24 +01:00
committed by Christian Helmuth
parent 6e1517ca3c
commit bdf47785b8
55 changed files with 1295 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
repos/os/src/lib/vfs/rom_file_system.h
View File

@ -39,17 +39,17 @@ class Vfs::Rom_file_system : public Single_file_system
Genode::Attached_rom_dataspace _rom { _env, _label.string() };
file_size _init_content_size()
size_t _init_content_size()
{
if (!_binary)
for (file_size pos = 0; pos < _rom.size(); pos++)
for (size_t pos = 0; pos < _rom.size(); pos++)
if (_rom.local_addr<char>()[pos] == 0x00)
return pos;
return _rom.size();
}
file_size _content_size = _init_content_size();
size_t _content_size = _init_content_size();
void _update()
{
@ -63,7 +63,7 @@ class Vfs::Rom_file_system : public Single_file_system
Genode::Attached_rom_dataspace &_rom;
file_size const &_content_size;
size_t const &_content_size;
public:
@ -71,23 +71,22 @@ class Vfs::Rom_file_system : public Single_file_system
File_io_service &fs,
Genode::Allocator &alloc,
Genode::Attached_rom_dataspace &rom,
file_size const &content_size)
size_t const &content_size)
:
Single_vfs_handle(ds, fs, alloc, 0),
_rom(rom), _content_size(content_size)
{ }
Read_result read(char *dst, file_size count,
file_size &out_count) override
Read_result read(Byte_range_ptr const &dst, size_t &out_count) override
{
/* file read limit is the size of the dataspace */
file_size const max_size = _content_size;
size_t const max_size = _content_size;
/* current read offset */
file_size const read_offset = seek();
size_t const read_offset = size_t(seek());
/* maximum read offset, clamped to dataspace size */
file_size const end_offset = min(count + read_offset, max_size);
size_t const end_offset = min(dst.num_bytes + read_offset, max_size);
/* check if end of file is reached */
if (read_offset >= end_offset) {
@ -99,16 +98,15 @@ class Vfs::Rom_file_system : public Single_file_system
char const *src = _rom.local_addr<char>() + read_offset;
/* copy-out bytes from ROM dataspace */
file_size const num_bytes = end_offset - read_offset;
size_t const num_bytes = end_offset - read_offset;
memcpy(dst, src, (size_t)num_bytes);
memcpy(dst.start, src, num_bytes);
out_count = num_bytes;
return READ_OK;
}
Write_result write(char const *, file_size,
file_size &out_count) override
Write_result write(Const_byte_range_ptr const &, size_t &out_count) override
{
out_count = 0;
return WRITE_ERR_INVALID;