diff --git a/AK/kstdio.h b/AK/kstdio.h index a766c347ad..ad8ee27b1f 100644 --- a/AK/kstdio.h +++ b/AK/kstdio.h @@ -33,7 +33,7 @@ # include extern "C" { int dbgprintf(const char* fmt, ...); -int dbgputstr(const char*, ssize_t); +ssize_t dbgputstr(const char*, ssize_t); int sprintf(char* buf, const char* fmt, ...); } template diff --git a/Kernel/Devices/FullDevice.cpp b/Kernel/Devices/FullDevice.cpp index 52f8ffb38b..895c34fc01 100644 --- a/Kernel/Devices/FullDevice.cpp +++ b/Kernel/Devices/FullDevice.cpp @@ -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(PAGE_SIZE), size); memset(buffer, 0, (size_t)count); return count; } diff --git a/Kernel/Devices/NullDevice.cpp b/Kernel/Devices/NullDevice.cpp index c197b2d696..7e1d0a0808 100644 --- a/Kernel/Devices/NullDevice.cpp +++ b/Kernel/Devices/NullDevice.cpp @@ -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(PAGE_SIZE), buffer_size); } } diff --git a/Kernel/Devices/RandomDevice.cpp b/Kernel/Devices/RandomDevice.cpp index ac4fa4a6b8..11896ee970 100644 --- a/Kernel/Devices/RandomDevice.cpp +++ b/Kernel/Devices/RandomDevice.cpp @@ -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(PAGE_SIZE), size); } } diff --git a/Kernel/Devices/ZeroDevice.cpp b/Kernel/Devices/ZeroDevice.cpp index 6a09cdf8b2..69f69defe3 100644 --- a/Kernel/Devices/ZeroDevice.cpp +++ b/Kernel/Devices/ZeroDevice.cpp @@ -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(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(PAGE_SIZE), size); } } diff --git a/Kernel/FileSystem/FileDescription.cpp b/Kernel/FileSystem/FileDescription.cpp index cbedbbecb4..d504032566 100644 --- a/Kernel/FileSystem/FileDescription.cpp +++ b/Kernel/FileSystem/FileDescription.cpp @@ -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(PAGE_SIZE), static_cast(metadata.size)); auto temp_buffer = ByteBuffer::create_uninitialized(size_to_allocate); BufferStream stream(temp_buffer); diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index c07374e6c9..bae78b5505 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -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) diff --git a/Libraries/LibC/dirent.cpp b/Libraries/LibC/dirent.cpp index 4cb4d570bc..2ef0d6b03d 100644 --- a/Libraries/LibC/dirent.cpp +++ b/Libraries/LibC/dirent.cpp @@ -103,7 +103,7 @@ static int allocate_dirp_buffer(DIR* dirp) errno = old_errno; return new_errno; } - size_t size_to_allocate = max(st.st_size, 4096); + size_t size_to_allocate = max(st.st_size, static_cast(4096)); dirp->buffer = (char*)malloc(size_to_allocate); ssize_t nread = syscall(SC_get_dir_entries, dirp->fd, dirp->buffer, size_to_allocate); if (nread < 0) { diff --git a/Libraries/LibC/stddef.h b/Libraries/LibC/stddef.h index 4af93185f5..340d409f88 100644 --- a/Libraries/LibC/stddef.h +++ b/Libraries/LibC/stddef.h @@ -29,7 +29,6 @@ #ifndef KERNEL #include -#include #ifdef __cplusplus # define NULL nullptr diff --git a/Libraries/LibC/stdio.cpp b/Libraries/LibC/stdio.cpp index 0bd0f0e679..249ad9aa01 100644 --- a/Libraries/LibC/stdio.cpp +++ b/Libraries/LibC/stdio.cpp @@ -993,7 +993,7 @@ void dbgputch(char ch) syscall(SC_dbgputch, ch); } -int dbgputstr(const char* characters, int length) +ssize_t dbgputstr(const char* characters, ssize_t length) { int rc = syscall(SC_dbgputstr, characters, length); __RETURN_WITH_ERRNO(rc, rc, -1); diff --git a/Libraries/LibC/stdio.h b/Libraries/LibC/stdio.h index 9c3031f097..6cd9ffe84c 100644 --- a/Libraries/LibC/stdio.h +++ b/Libraries/LibC/stdio.h @@ -93,7 +93,7 @@ int fprintf(FILE*, const char* fmt, ...); int printf(const char* fmt, ...); int dbgprintf(const char* fmt, ...); void dbgputch(char); -int dbgputstr(const char*, ssize_t); +ssize_t dbgputstr(const char*, ssize_t); int sprintf(char* buffer, const char* fmt, ...); int snprintf(char* buffer, size_t, const char* fmt, ...); int putchar(int ch); diff --git a/Libraries/LibDebug/Dwarf/Expression.cpp b/Libraries/LibDebug/Dwarf/Expression.cpp index b9d57628fb..ddc1dfcde4 100644 --- a/Libraries/LibDebug/Dwarf/Expression.cpp +++ b/Libraries/LibDebug/Dwarf/Expression.cpp @@ -41,13 +41,13 @@ Value evaluate(const ByteBuffer& bytes, const PtraceRegisters& regs) switch (static_cast(opcode)) { case Operations::RegEbp: { - int offset = 0; + ssize_t offset = 0; stream.read_LEB128_signed(offset); return Value { Type::UnsignedIntetger, regs.ebp + offset }; } case Operations::FbReg: { - int offset = 0; + ssize_t offset = 0; stream.read_LEB128_signed(offset); return Value { Type::UnsignedIntetger, regs.ebp + 2 * sizeof(size_t) + offset }; } diff --git a/Userland/ls.cpp b/Userland/ls.cpp index 665715ca49..c1fb436b79 100644 --- a/Userland/ls.cpp +++ b/Userland/ls.cpp @@ -303,7 +303,7 @@ bool print_filesystem_object(const String& path, const String& name, const struc ASSERT(st.st_size > 0); printf(" %10s ", human_readable_size((size_t)st.st_size).characters()); } else { - printf(" %10u ", st.st_size); + printf(" %10zd ", st.st_size); } } diff --git a/Userland/stat.cpp b/Userland/stat.cpp index d9000c23ea..05501ced25 100644 --- a/Userland/stat.cpp +++ b/Userland/stat.cpp @@ -48,7 +48,7 @@ static int stat(const char* file, bool should_follow_links) if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) printf(" Device: %u,%u\n", major(st.st_rdev), minor(st.st_rdev)); else - printf(" Size: %u\n", st.st_size); + printf(" Size: %zd\n", st.st_size); printf(" Links: %u\n", st.st_nlink); printf(" Blocks: %u\n", st.st_blocks); printf(" UID: %u", st.st_uid);