mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 16:07:45 +00:00
Kernel+LibC: Fix various build issues introduced by ssize_t
Now that ssize_t is derived from size_t, we have to
This commit is contained in:
parent
2fe6b3725a
commit
dd924b730a
14 changed files with 15 additions and 16 deletions
|
@ -47,7 +47,7 @@ bool FullDevice::can_read(const FileDescription&, size_t) const
|
|||
|
||||
ssize_t FullDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
|
||||
{
|
||||
ssize_t count = min(PAGE_SIZE, size);
|
||||
ssize_t count = min(static_cast<ssize_t>(PAGE_SIZE), size);
|
||||
memset(buffer, 0, (size_t)count);
|
||||
return count;
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ ssize_t NullDevice::read(FileDescription&, size_t, u8*, ssize_t)
|
|||
|
||||
ssize_t NullDevice::write(FileDescription&, size_t, const u8*, ssize_t buffer_size)
|
||||
{
|
||||
return min(PAGE_SIZE, buffer_size);
|
||||
return min(static_cast<ssize_t>(PAGE_SIZE), buffer_size);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -52,7 +52,7 @@ ssize_t RandomDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
|
|||
ssize_t RandomDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
|
||||
{
|
||||
// FIXME: Use input for entropy? I guess that could be a neat feature?
|
||||
return min(PAGE_SIZE, size);
|
||||
return min(static_cast<ssize_t>(PAGE_SIZE), size);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -46,14 +46,14 @@ bool ZeroDevice::can_read(const FileDescription&, size_t) const
|
|||
|
||||
ssize_t ZeroDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
|
||||
{
|
||||
ssize_t count = min(PAGE_SIZE, size);
|
||||
ssize_t count = min(static_cast<ssize_t>(PAGE_SIZE), size);
|
||||
memset(buffer, 0, (size_t)count);
|
||||
return count;
|
||||
}
|
||||
|
||||
ssize_t ZeroDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
|
||||
{
|
||||
return min(PAGE_SIZE, size);
|
||||
return min(static_cast<ssize_t>(PAGE_SIZE), size);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -179,7 +179,7 @@ ssize_t FileDescription::get_dir_entries(u8* buffer, ssize_t size)
|
|||
if (size < 0)
|
||||
return -EINVAL;
|
||||
|
||||
size_t size_to_allocate = max(PAGE_SIZE, metadata.size);
|
||||
size_t size_to_allocate = max(static_cast<size_t>(PAGE_SIZE), static_cast<size_t>(metadata.size));
|
||||
|
||||
auto temp_buffer = ByteBuffer::create_uninitialized(size_to_allocate);
|
||||
BufferStream stream(temp_buffer);
|
||||
|
|
|
@ -4259,7 +4259,7 @@ int Process::sys$get_process_name(char* buffer, int buffer_size)
|
|||
// We don't use the flag yet, but we could use it for distinguishing
|
||||
// random source like Linux, unlike the OpenBSD equivalent. However, if we
|
||||
// do, we should be able of the caveats that Linux has dealt with.
|
||||
int Process::sys$getrandom(void* buffer, size_t buffer_size, unsigned int flags __attribute__((unused)))
|
||||
ssize_t Process::sys$getrandom(void* buffer, size_t buffer_size, unsigned int flags __attribute__((unused)))
|
||||
{
|
||||
REQUIRE_PROMISE(stdio);
|
||||
if (buffer_size <= 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue