From 7248c34e358da73d100f61df906d828f1ce97aa5 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 9 Dec 2019 17:48:58 +0100 Subject: [PATCH] AK: SinglyLinkedList::size_slow() should return size_t --- AK/SinglyLinkedList.h | 4 ++-- Kernel/Net/IPv4Socket.cpp | 6 +++--- Kernel/Process.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AK/SinglyLinkedList.h b/AK/SinglyLinkedList.h index 3fff790bc4..9ede7a8246 100644 --- a/AK/SinglyLinkedList.h +++ b/AK/SinglyLinkedList.h @@ -53,9 +53,9 @@ public: bool is_empty() const { return !head(); } - inline int size_slow() const + inline size_t size_slow() const { - int size = 0; + size_t size = 0; for (auto* node = m_head; node; node = node->next) ++size; return size; diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index a1f4cd6229..5bddcf6054 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -238,7 +238,7 @@ ssize_t IPv4Socket::recvfrom(FileDescription& description, void* buffer, size_t packet = m_receive_queue.take_first(); m_can_read = !m_receive_queue.is_empty(); #ifdef IPV4_SOCKET_DEBUG - kprintf("IPv4Socket(%p): recvfrom without blocking %d bytes, packets in queue: %d\n", this, packet.data.value().size(), m_receive_queue.size_slow()); + kprintf("IPv4Socket(%p): recvfrom without blocking %d bytes, packets in queue: %zu\n", this, packet.data.value().size(), m_receive_queue.size_slow()); #endif } } @@ -264,7 +264,7 @@ ssize_t IPv4Socket::recvfrom(FileDescription& description, void* buffer, size_t packet = m_receive_queue.take_first(); m_can_read = !m_receive_queue.is_empty(); #ifdef IPV4_SOCKET_DEBUG - kprintf("IPv4Socket(%p): recvfrom with blocking %d bytes, packets in queue: %d\n", this, packet.data.value().size(), m_receive_queue.size_slow()); + kprintf("IPv4Socket(%p): recvfrom with blocking %d bytes, packets in queue: %zu\n", this, packet.data.value().size(), m_receive_queue.size_slow()); #endif } ASSERT(packet.data.has_value()); @@ -306,7 +306,7 @@ bool IPv4Socket::did_receive(const IPv4Address& source_address, u16 source_port, m_can_read = true; m_bytes_received += packet_size; #ifdef IPV4_SOCKET_DEBUG - kprintf("IPv4Socket(%p): did_receive %d bytes, total_received=%u, packets in queue: %d\n", this, packet_size, m_bytes_received, m_receive_queue.size_slow()); + kprintf("IPv4Socket(%p): did_receive %d bytes, total_received=%u, packets in queue: %zu\n", this, packet_size, m_bytes_received, m_receive_queue.size_slow()); #endif return true; } diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index dd174d24c3..a8a4ff1660 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -74,7 +74,7 @@ Vector Process::all_pids() { Vector pids; InterruptDisabler disabler; - pids.ensure_capacity(g_processes->size_slow()); + pids.ensure_capacity((int)g_processes->size_slow()); for (auto& process : *g_processes) pids.append(process.pid()); return pids; @@ -84,7 +84,7 @@ Vector Process::all_processes() { Vector processes; InterruptDisabler disabler; - processes.ensure_capacity(g_processes->size_slow()); + processes.ensure_capacity((int)g_processes->size_slow()); for (auto& process : *g_processes) processes.append(&process); return processes;