From 938e5c7719ee546538bdfc44339b6c561b45edc9 Mon Sep 17 00:00:00 2001 From: asynts Date: Sat, 9 Jan 2021 18:51:44 +0100 Subject: [PATCH] Everywhere: Replace a bundle of dbg with dbgln. These changes are arbitrarily divided into multiple commits to make it easier to find potentially introduced bugs with git bisect.Everything: The modifications in this commit were automatically made using the following command: find . -name '*.cpp' -exec sed -i -E 's/dbg\(\) << ("[^"{]*");/dbgln\(\1\);/' {} \; --- Kernel/ACPI/Parser.cpp | 8 +- Kernel/Arch/i386/CPU.cpp | 6 +- Kernel/Devices/I8042Controller.cpp | 12 +- Kernel/Devices/KeyboardDevice.cpp | 2 +- Kernel/Devices/PS2MouseDevice.cpp | 6 +- Kernel/FileSystem/DevFS.cpp | 2 +- Kernel/FileSystem/Ext2FileSystem.cpp | 8 +- Kernel/FileSystem/Plan9FileSystem.cpp | 8 +- Kernel/FileSystem/ProcFS.cpp | 2 +- Kernel/FileSystem/VirtualFileSystem.cpp | 2 +- Kernel/Interrupts/APIC.cpp | 2 +- Kernel/Interrupts/InterruptManagement.cpp | 4 +- Kernel/Net/Socket.cpp | 2 +- Kernel/Net/TCPSocket.cpp | 4 +- Kernel/PCI/IOAccess.cpp | 4 +- Kernel/PCI/MMIOAccess.cpp | 4 +- Kernel/Storage/IDEChannel.cpp | 6 +- Kernel/Syscalls/fork.cpp | 2 +- Kernel/Syscalls/module.cpp | 2 +- Kernel/Syscalls/mount.cpp | 2 +- Kernel/Syscalls/select.cpp | 2 +- Kernel/Syscalls/shutdown.cpp | 16 +-- Kernel/Syscalls/thread.cpp | 2 +- Kernel/TTY/VirtualConsole.cpp | 4 +- Kernel/Tasks/SyncTask.cpp | 2 +- Kernel/Time/HPET.cpp | 2 +- Kernel/Time/HPETComparator.cpp | 2 +- Kernel/Time/TimeManagement.cpp | 12 +- Kernel/VM/AnonymousVMObject.cpp | 6 +- Kernel/VM/RangeAllocator.cpp | 2 +- Kernel/VM/Region.cpp | 4 +- Libraries/LibC/stdio.cpp | 2 +- Libraries/LibC/ulimit.cpp | 2 +- Libraries/LibC/unistd.cpp | 2 +- Libraries/LibCore/Gzip.cpp | 14 +-- Libraries/LibCore/LocalServer.cpp | 4 +- Libraries/LibCore/LocalSocket.cpp | 2 +- .../NumberTheory/ModularFunctions.cpp | 2 +- Libraries/LibCrypto/PK/RSA.cpp | 22 ++-- Libraries/LibDiff/Hunks.cpp | 6 +- Libraries/LibGUI/AbstractView.cpp | 6 +- Libraries/LibGUI/ColumnsView.cpp | 4 +- Libraries/LibGUI/Widget.cpp | 6 +- Libraries/LibGemini/GeminiJob.cpp | 4 +- Libraries/LibGemini/Job.cpp | 4 +- Libraries/LibGfx/GIFLoader.cpp | 6 +- Libraries/LibGfx/JPGLoader.cpp | 2 +- Libraries/LibGfx/PNGLoader.cpp | 4 +- Libraries/LibHTTP/HttpJob.cpp | 2 +- Libraries/LibHTTP/HttpsJob.cpp | 4 +- Libraries/LibHTTP/Job.cpp | 12 +- Libraries/LibImageDecoderClient/Client.cpp | 6 +- Libraries/LibLine/Editor.cpp | 6 +- Libraries/LibMarkdown/Text.cpp | 4 +- Libraries/LibProtocol/Download.cpp | 2 +- Libraries/LibRegex/RegexMatcher.cpp | 2 +- Libraries/LibRegex/Tests/Regex.cpp | 12 +- Libraries/LibTLS/ClientHandshake.cpp | 108 +++++++++--------- Libraries/LibTLS/Exchange.cpp | 30 ++--- Libraries/LibTLS/Record.cpp | 28 ++--- Libraries/LibTLS/Socket.cpp | 8 +- Libraries/LibTLS/TLSv12.cpp | 72 ++++++------ Libraries/LibTTF/Font.cpp | 30 ++--- Libraries/LibVT/Terminal.cpp | 4 +- Libraries/LibWeb/CSS/Parser/CSSParser.cpp | 6 +- .../CodeGenerators/WrapperGenerator.cpp | 4 +- Libraries/LibWeb/DOM/Node.cpp | 2 +- .../LibWeb/HTML/CanvasRenderingContext2D.cpp | 2 +- Libraries/LibWeb/Loader/Resource.cpp | 2 +- Libraries/LibWeb/SVG/SVGPathElement.cpp | 2 +- Libraries/LibWeb/WebContentClient.cpp | 4 +- Meta/Lagom/Fuzzers/FuzzilliJs.cpp | 2 +- Meta/Lagom/TestApp.cpp | 2 +- Services/AudioServer/main.cpp | 2 +- Services/Clipboard/main.cpp | 2 +- Services/DHCPClient/DHCPv4Client.cpp | 4 +- Services/ImageDecoder/ClientConnection.cpp | 6 +- Services/LaunchServer/main.cpp | 4 +- Services/NotificationServer/main.cpp | 2 +- Services/SystemServer/Service.cpp | 4 +- Services/SystemServer/main.cpp | 2 +- Services/WebContent/ClientConnection.cpp | 4 +- Services/WindowServer/ClientConnection.cpp | 2 +- Services/WindowServer/Compositor.cpp | 2 +- Services/WindowServer/Cursor.cpp | 4 +- Services/WindowServer/EventLoop.cpp | 2 +- Services/WindowServer/Menu.cpp | 2 +- Services/WindowServer/MenuManager.cpp | 2 +- Services/WindowServer/WindowManager.cpp | 6 +- Services/WindowServer/main.cpp | 2 +- Userland/DynamicLoader/misc.cpp | 2 +- .../Tests/Kernel/kill-pidtid-confusion.cpp | 12 +- Userland/mount.cpp | 2 +- Userland/test-crypto.cpp | 2 +- Userland/test-web.cpp | 2 +- 95 files changed, 331 insertions(+), 331 deletions(-) diff --git a/Kernel/ACPI/Parser.cpp b/Kernel/ACPI/Parser.cpp index adb792eaec..1c44837669 100644 --- a/Kernel/ACPI/Parser.cpp +++ b/Kernel/ACPI/Parser.cpp @@ -66,7 +66,7 @@ void Parser::locate_static_data() PhysicalAddress Parser::find_table(const StringView& signature) { #ifdef ACPI_DEBUG - dbg() << "ACPI: Calling Find Table method!"; + dbgln("ACPI: Calling Find Table method!"); #endif for (auto p_sdt : m_sdt_pointers) { auto sdt = map_typed(p_sdt); @@ -244,7 +244,7 @@ size_t Parser::get_table_size(PhysicalAddress table_header) { InterruptDisabler disabler; #ifdef ACPI_DEBUG - dbg() << "ACPI: Checking SDT Length"; + dbgln("ACPI: Checking SDT Length"); #endif return map_typed(table_header)->length; } @@ -253,7 +253,7 @@ u8 Parser::get_table_revision(PhysicalAddress table_header) { InterruptDisabler disabler; #ifdef ACPI_DEBUG - dbg() << "ACPI: Checking SDT Revision"; + dbgln("ACPI: Checking SDT Revision"); #endif return map_typed(table_header)->revision; } @@ -261,7 +261,7 @@ u8 Parser::get_table_revision(PhysicalAddress table_header) void Parser::initialize_main_system_description_table() { #ifdef ACPI_DEBUG - dbg() << "ACPI: Checking Main SDT Length to choose the correct mapping size"; + dbgln("ACPI: Checking Main SDT Length to choose the correct mapping size"); #endif ASSERT(!m_main_system_description_table.is_null()); auto length = get_table_size(m_main_system_description_table); diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index 825f98e7b0..ceb54803c2 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -471,7 +471,7 @@ void page_fault_handler(TrapFrame* trap) handle_crash(regs, "Page Fault", SIGSEGV, response == PageFaultResponse::OutOfMemory); } else if (response == PageFaultResponse::Continue) { #ifdef PAGE_FAULT_DEBUG - dbg() << "Continuing after resolved page fault"; + dbgln("Continuing after resolved page fault"); #endif } else { ASSERT_NOT_REACHED(); @@ -605,7 +605,7 @@ void unregister_generic_interrupt_handler(u8 interrupt_number, GenericInterruptH { ASSERT(s_interrupt_handler[interrupt_number] != nullptr); if (s_interrupt_handler[interrupt_number]->type() == HandlerType::UnhandledInterruptHandler) { - dbg() << "Trying to unregister unused handler (?)"; + dbgln("Trying to unregister unused handler (?)"); return; } if (s_interrupt_handler[interrupt_number]->is_shared_handler() && !s_interrupt_handler[interrupt_number]->is_sharing_with_others()) { @@ -844,7 +844,7 @@ static void idt_init() register_interrupt_handler(0xfe, interrupt_254_asm_entry); register_interrupt_handler(0xff, interrupt_255_asm_entry); - dbg() << "Installing Unhandled Handlers"; + dbgln("Installing Unhandled Handlers"); for (u8 i = 0; i < GENERIC_INTERRUPT_HANDLERS_COUNT; ++i) { new UnhandledInterruptHandler(i); diff --git a/Kernel/Devices/I8042Controller.cpp b/Kernel/Devices/I8042Controller.cpp index ed65c1ef9b..790f51882f 100644 --- a/Kernel/Devices/I8042Controller.cpp +++ b/Kernel/Devices/I8042Controller.cpp @@ -76,7 +76,7 @@ I8042Controller::I8042Controller() do_wait_then_write(I8042_STATUS, 0x60); do_wait_then_write(I8042_BUFFER, configuration); } else { - dbg() << "I8042: Controller self test failed"; + dbgln("I8042: Controller self test failed"); } // Test ports and enable them if available @@ -88,7 +88,7 @@ I8042Controller::I8042Controller() configuration |= 1; configuration &= ~(1 << 4); } else { - dbg() << "I8042: Keyboard port not available"; + dbgln("I8042: Keyboard port not available"); } if (m_is_dual_channel) { @@ -99,7 +99,7 @@ I8042Controller::I8042Controller() configuration |= 2; configuration &= ~(1 << 5); } else { - dbg() << "I8042: Mouse port not available"; + dbgln("I8042: Mouse port not available"); } } @@ -116,7 +116,7 @@ I8042Controller::I8042Controller() if (KeyboardDevice::the().initialize()) { m_devices[0].device = &KeyboardDevice::the(); } else { - dbg() << "I8042: Keyboard device failed to initialize, disable"; + dbgln("I8042: Keyboard device failed to initialize, disable"); m_devices[0].available = false; configuration &= ~1; configuration |= 1 << 4; @@ -129,7 +129,7 @@ I8042Controller::I8042Controller() if (PS2MouseDevice::the().initialize()) { m_devices[1].device = &PS2MouseDevice::the(); } else { - dbg() << "I8042: Mouse device failed to initialize, disable"; + dbgln("I8042: Mouse device failed to initialize, disable"); m_devices[1].available = false; configuration |= 1 << 5; ScopedSpinLock lock(m_lock); @@ -223,7 +223,7 @@ u8 I8042Controller::do_write_to_device(Device device, u8 data) response = do_wait_then_read(I8042_BUFFER); } while (response == I8042_RESEND && ++attempts < 3); if (attempts >= 3) - dbg() << "Failed to write byte to device, gave up"; + dbgln("Failed to write byte to device, gave up"); return response; } diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp index 72c8346e0e..46cc89bda0 100644 --- a/Kernel/Devices/KeyboardDevice.cpp +++ b/Kernel/Devices/KeyboardDevice.cpp @@ -356,7 +356,7 @@ KeyboardDevice::~KeyboardDevice() bool KeyboardDevice::initialize() { if (!m_controller.reset_device(I8042Controller::Device::Keyboard)) { - dbg() << "KeyboardDevice: I8042 controller failed to reset device"; + dbgln("KeyboardDevice: I8042 controller failed to reset device"); return false; } return true; diff --git a/Kernel/Devices/PS2MouseDevice.cpp b/Kernel/Devices/PS2MouseDevice.cpp index 1aa5222ee0..8b2d0d7fd7 100644 --- a/Kernel/Devices/PS2MouseDevice.cpp +++ b/Kernel/Devices/PS2MouseDevice.cpp @@ -118,7 +118,7 @@ void PS2MouseDevice::irq_handle_byte_read(u8 byte) switch (m_data_state) { case 0: if (!(byte & 0x08)) { - dbg() << "PS2Mouse: Stream out of sync."; + dbgln("PS2Mouse: Stream out of sync."); break; } ++m_data_state; @@ -223,7 +223,7 @@ void PS2MouseDevice::set_sample_rate(u8 rate) bool PS2MouseDevice::initialize() { if (!m_controller.reset_device(I8042Controller::Device::Mouse)) { - dbg() << "PS2MouseDevice: I8042 controller failed to reset device"; + dbgln("PS2MouseDevice: I8042 controller failed to reset device"); return false; } @@ -284,7 +284,7 @@ KResultOr PS2MouseDevice::read(FileDescription&, size_t, UserOrKernelBuf #ifdef PS2MOUSE_DEBUG dbg() << "PS2 Mouse Read: Buttons " << String::format("%x", packet.buttons); dbg() << "PS2 Mouse: X " << packet.x << ", Y " << packet.y << ", Z " << packet.z << " Relative " << packet.buttons; - dbg() << "PS2 Mouse Read: Filter packets"; + dbgln("PS2 Mouse Read: Filter packets"); #endif size_t bytes_read_from_packet = min(remaining_space_in_buffer, sizeof(MousePacket)); if (!buffer.write(&packet, nread, bytes_read_from_packet)) diff --git a/Kernel/FileSystem/DevFS.cpp b/Kernel/FileSystem/DevFS.cpp index 127a67de90..84e7176b4b 100644 --- a/Kernel/FileSystem/DevFS.cpp +++ b/Kernel/FileSystem/DevFS.cpp @@ -302,7 +302,7 @@ KResultOr> DevFSRootDirectoryInode::create_child(const Stri if (link.name() == name) return KResult(-EEXIST); } - dbg() << "DevFS: Success on create new symlink"; + dbgln("DevFS: Success on create new symlink"); auto new_link_inode = adopt(*new DevFSLinkInode(m_parent_fs, name)); m_links.append(new_link_inode); m_parent_fs.m_nodes.append(new_link_inode); diff --git a/Kernel/FileSystem/Ext2FileSystem.cpp b/Kernel/FileSystem/Ext2FileSystem.cpp index 1c9c2a1e66..25a72160f0 100644 --- a/Kernel/FileSystem/Ext2FileSystem.cpp +++ b/Kernel/FileSystem/Ext2FileSystem.cpp @@ -215,7 +215,7 @@ Ext2FS::BlockListShape Ext2FS::compute_block_list_shape(unsigned blocks) const if (!blocks_remaining) return shape; - dbg() << "we don't know how to compute tind ext2fs blocks yet!"; + dbgln("we don't know how to compute tind ext2fs blocks yet!"); ASSERT_NOT_REACHED(); shape.triply_indirect_blocks = min(blocks_remaining, entries_per_block * entries_per_block * entries_per_block); @@ -420,7 +420,7 @@ bool Ext2FS::write_block_list_for_inode(InodeIndex inode_index, ext2_inode& e2in return true; // FIXME: Implement! - dbg() << "we don't know how to write tind ext2fs blocks yet!"; + dbgln("we don't know how to write tind ext2fs blocks yet!"); ASSERT_NOT_REACHED(); } @@ -1137,7 +1137,7 @@ Vector Ext2FS::allocate_blocks(GroupIndex preferred_group_in Vector blocks; #ifdef EXT2_DEBUG - dbg() << "Ext2FS: allocate_blocks:"; + dbgln("Ext2FS: allocate_blocks:"); #endif blocks.ensure_capacity(count); @@ -1474,7 +1474,7 @@ KResultOr> Ext2FS::create_inode(InodeIdentifier parent_id, size_t needed_blocks = ceil_div(static_cast(size), block_size()); if ((size_t)needed_blocks > super_block().s_free_blocks_count) { - dbg() << "Ext2FS: create_inode: not enough free blocks"; + dbgln("Ext2FS: create_inode: not enough free blocks"); return KResult(-ENOSPC); } diff --git a/Kernel/FileSystem/Plan9FileSystem.cpp b/Kernel/FileSystem/Plan9FileSystem.cpp index ff9b62b550..2bbc2256a5 100644 --- a/Kernel/FileSystem/Plan9FileSystem.cpp +++ b/Kernel/FileSystem/Plan9FileSystem.cpp @@ -246,7 +246,7 @@ bool Plan9FS::initialize() result = post_message_and_wait_for_a_reply(attach_message); if (result.is_error()) { - dbg() << "Attaching failed"; + dbgln("Attaching failed"); return false; } @@ -663,7 +663,7 @@ ssize_t Plan9FS::adjust_buffer_size(ssize_t size) const void Plan9FS::thread_main() { - dbg() << "Plan9FS: Thread running"; + dbgln("Plan9FS: Thread running"); do { auto result = read_and_dispatch_one_message(); if (result.is_error()) { @@ -676,11 +676,11 @@ void Plan9FS::thread_main() } m_completions.clear(); m_completion_blocker.unblock_all(); - dbg() << "Plan9FS: Thread terminating, error reading"; + dbgln("Plan9FS: Thread terminating, error reading"); return; } } while (!m_thread_shutdown); - dbg() << "Plan9FS: Thread terminating"; + dbgln("Plan9FS: Thread terminating"); } void Plan9FS::ensure_thread() diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index 58865874df..4d4b566b80 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -1296,7 +1296,7 @@ ssize_t ProcFSInode::read_bytes(off_t offset, ssize_t count, UserOrKernelBuffer& return -EIO; if (!description->data()) { #ifdef PROCFS_DEBUG - dbg() << "ProcFS: Do not have cached data!"; + dbgln("ProcFS: Do not have cached data!"); #endif return -EIO; } diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index d10152ff07..29e69308f2 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -119,7 +119,7 @@ KResult VFS::unmount(Inode& guest_inode) if (&mount.guest() == &guest_inode) { auto result = mount.guest_fs().prepare_to_unmount(); if (result.is_error()) { - dbg() << "VFS: Failed to unmount!"; + dbgln("VFS: Failed to unmount!"); return result; } dbg() << "VFS: found fs " << mount.guest_fs().fsid() << " at mount index " << i << "! Unmounting..."; diff --git a/Kernel/Interrupts/APIC.cpp b/Kernel/Interrupts/APIC.cpp index 6f9378ba5f..87baac04eb 100644 --- a/Kernel/Interrupts/APIC.cpp +++ b/Kernel/Interrupts/APIC.cpp @@ -414,7 +414,7 @@ void APIC::boot_aps() Processor::smp_enable(); #ifdef APIC_DEBUG - dbg() << "All processors initialized and waiting, trigger all to continue"; + dbgln("All processors initialized and waiting, trigger all to continue"); #endif // Now trigger all APs to continue execution (need to do this after diff --git a/Kernel/Interrupts/InterruptManagement.cpp b/Kernel/Interrupts/InterruptManagement.cpp index b59aecb23c..75fbef16d3 100644 --- a/Kernel/Interrupts/InterruptManagement.cpp +++ b/Kernel/Interrupts/InterruptManagement.cpp @@ -127,7 +127,7 @@ RefPtr InterruptManagement::get_responsible_irq_controller(u8 int PhysicalAddress InterruptManagement::search_for_madt() { - dbg() << "Early access to ACPI tables for interrupt setup"; + dbgln("Early access to ACPI tables for interrupt setup"); auto rsdp = ACPI::StaticParsing::find_rsdp(); if (!rsdp.has_value()) return {}; @@ -165,7 +165,7 @@ void InterruptManagement::switch_to_ioapic_mode() InterruptDisabler disabler; if (m_madt.is_null()) { - dbg() << "Interrupts: ACPI MADT is not available, reverting to PIC mode"; + dbgln("Interrupts: ACPI MADT is not available, reverting to PIC mode"); switch_to_pic_mode(); return; } diff --git a/Kernel/Net/Socket.cpp b/Kernel/Net/Socket.cpp index 4aeccb254b..0a11bbbca0 100644 --- a/Kernel/Net/Socket.cpp +++ b/Kernel/Net/Socket.cpp @@ -188,7 +188,7 @@ KResult Socket::getsockopt(FileDescription&, int level, int option, Userspace(value), &errno)) return KResult(-EFAULT); diff --git a/Kernel/Net/TCPSocket.cpp b/Kernel/Net/TCPSocket.cpp index 02f03c6f6f..6bc37976cc 100644 --- a/Kernel/Net/TCPSocket.cpp +++ b/Kernel/Net/TCPSocket.cpp @@ -460,7 +460,7 @@ void TCPSocket::shut_down_for_writing() { if (state() == State::Established) { #ifdef TCP_SOCKET_DEBUG - dbg() << " Sending FIN/ACK from Established and moving into FinWait1"; + dbgln(" Sending FIN/ACK from Established and moving into FinWait1"); #endif [[maybe_unused]] auto rc = send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK); set_state(State::FinWait1); @@ -475,7 +475,7 @@ KResult TCPSocket::close() auto result = IPv4Socket::close(); if (state() == State::CloseWait) { #ifdef TCP_SOCKET_DEBUG - dbg() << " Sending FIN from CloseWait and moving into LastAck"; + dbgln(" Sending FIN from CloseWait and moving into LastAck"); #endif [[maybe_unused]] auto rc = send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK); set_state(State::LastAck); diff --git a/Kernel/PCI/IOAccess.cpp b/Kernel/PCI/IOAccess.cpp index 9bb33ebf0c..379a9aac49 100644 --- a/Kernel/PCI/IOAccess.cpp +++ b/Kernel/PCI/IOAccess.cpp @@ -37,7 +37,7 @@ void IOAccess::initialize() if (!Access::is_initialized()) { new IOAccess(); #ifdef PCI_DEBUG - dbg() << "PCI: IO access initialised."; + dbgln("PCI: IO access initialised."); #endif } } @@ -102,7 +102,7 @@ void IOAccess::write32_field(Address address, u32 field, u32 value) void IOAccess::enumerate_hardware(Function callback) { #ifdef PCI_DEBUG - dbg() << "PCI: IO enumerating hardware"; + dbgln("PCI: IO enumerating hardware"); #endif // Single PCI host controller. if ((read8_field(Address(), PCI_HEADER_TYPE) & 0x80) == 0) { diff --git a/Kernel/PCI/MMIOAccess.cpp b/Kernel/PCI/MMIOAccess.cpp index 10e91c89dd..0a0065d97b 100644 --- a/Kernel/PCI/MMIOAccess.cpp +++ b/Kernel/PCI/MMIOAccess.cpp @@ -85,7 +85,7 @@ void MMIOAccess::initialize(PhysicalAddress mcfg) if (!Access::is_initialized()) { new MMIOAccess(mcfg); #ifdef PCI_DEBUG - dbg() << "PCI: MMIO access initialised."; + dbgln("PCI: MMIO access initialised."); #endif } } @@ -97,7 +97,7 @@ MMIOAccess::MMIOAccess(PhysicalAddress p_mcfg) auto checkup_region = MM.allocate_kernel_region(p_mcfg.page_base(), (PAGE_SIZE * 2), "PCI MCFG Checkup", Region::Access::Read | Region::Access::Write); #ifdef PCI_DEBUG - dbg() << "PCI: Checking MCFG Table length to choose the correct mapping size"; + dbgln("PCI: Checking MCFG Table length to choose the correct mapping size"); #endif auto* sdt = (ACPI::Structures::SDTHeader*)checkup_region->vaddr().offset(p_mcfg.offset_in_page()).as_ptr(); diff --git a/Kernel/Storage/IDEChannel.cpp b/Kernel/Storage/IDEChannel.cpp index 49e4e6dfd5..db40aeea54 100644 --- a/Kernel/Storage/IDEChannel.cpp +++ b/Kernel/Storage/IDEChannel.cpp @@ -147,7 +147,7 @@ void IDEChannel::start_request(AsyncBlockDeviceRequest& request, bool use_dma, b { ScopedSpinLock lock(m_request_lock); #ifdef PATA_DEBUG - dbg() << "IDEChannel::start_request"; + dbgln("IDEChannel::start_request"); #endif m_current_request = &request; m_current_request_block_index = 0; @@ -246,7 +246,7 @@ void IDEChannel::handle_irq(const RegisterState&) if (!m_current_request) { #ifdef PATA_DEBUG - dbg() << "IDEChannel: IRQ but no pending request!"; + dbgln("IDEChannel: IRQ but no pending request!"); #endif return; } @@ -444,7 +444,7 @@ void IDEChannel::ata_read_sectors(bool slave_request) auto& request = *m_current_request; ASSERT(request.block_count() <= 256); #ifdef PATA_DEBUG - dbg() << "IDEChannel::ata_read_sectors"; + dbgln("IDEChannel::ata_read_sectors"); #endif while (m_io_group.io_base().offset(ATA_REG_STATUS).in() & ATA_SR_BSY) diff --git a/Kernel/Syscalls/fork.cpp b/Kernel/Syscalls/fork.cpp index ac4ee52fad..dbf9cfdeba 100644 --- a/Kernel/Syscalls/fork.cpp +++ b/Kernel/Syscalls/fork.cpp @@ -90,7 +90,7 @@ pid_t Process::sys$fork(RegisterState& regs) #endif auto region_clone = region.clone(*child); if (!region_clone) { - dbg() << "fork: Cannot clone region, insufficient memory"; + dbgln("fork: Cannot clone region, insufficient memory"); // TODO: tear down new process? return -ENOMEM; } diff --git a/Kernel/Syscalls/module.cpp b/Kernel/Syscalls/module.cpp index 0bcb75a2de..7728b2faa4 100644 --- a/Kernel/Syscalls/module.cpp +++ b/Kernel/Syscalls/module.cpp @@ -128,7 +128,7 @@ int Process::sys$module_load(Userspace user_path, size_t path_lengt auto* text_base = section_storage_by_name.get(".text").value_or(nullptr); if (!text_base) { - dbg() << "No .text section found in module!"; + dbgln("No .text section found in module!"); return -EINVAL; } diff --git a/Kernel/Syscalls/mount.cpp b/Kernel/Syscalls/mount.cpp index e2d12c8141..769a588272 100644 --- a/Kernel/Syscalls/mount.cpp +++ b/Kernel/Syscalls/mount.cpp @@ -89,7 +89,7 @@ int Process::sys$mount(Userspace user_params) if (description.is_null()) return -EBADF; if (!description->file().is_seekable()) { - dbg() << "mount: this is not a seekable file"; + dbgln("mount: this is not a seekable file"); return -ENODEV; } diff --git a/Kernel/Syscalls/select.cpp b/Kernel/Syscalls/select.cpp index 7fc3a46a5f..fedf6a863f 100644 --- a/Kernel/Syscalls/select.cpp +++ b/Kernel/Syscalls/select.cpp @@ -104,7 +104,7 @@ int Process::sys$select(const Syscall::SC_select_params* user_params) if (current_thread->block(timeout, fds_info).was_interrupted()) { #ifdef DEBUG_POLL_SELECT - dbg() << "select was interrupted"; + dbgln("select was interrupted"); #endif return -EINTR; } diff --git a/Kernel/Syscalls/shutdown.cpp b/Kernel/Syscalls/shutdown.cpp index ddfb09c46e..52d43c180e 100644 --- a/Kernel/Syscalls/shutdown.cpp +++ b/Kernel/Syscalls/shutdown.cpp @@ -38,14 +38,14 @@ int Process::sys$reboot() REQUIRE_NO_PROMISES; - dbg() << "acquiring FS locks..."; + dbgln("acquiring FS locks..."); FS::lock_all(); - dbg() << "syncing mounted filesystems..."; + dbgln("syncing mounted filesystems..."); FS::sync(); - dbg() << "attempting reboot via ACPI"; + dbgln("attempting reboot via ACPI"); if (ACPI::is_enabled()) ACPI::Parser::the()->try_acpi_reboot(); - dbg() << "attempting reboot via KB Controller..."; + dbgln("attempting reboot via KB Controller..."); IO::out8(0x64, 0xFE); return 0; @@ -58,18 +58,18 @@ int Process::sys$halt() REQUIRE_NO_PROMISES; - dbg() << "acquiring FS locks..."; + dbgln("acquiring FS locks..."); FS::lock_all(); - dbg() << "syncing mounted filesystems..."; + dbgln("syncing mounted filesystems..."); FS::sync(); - dbg() << "attempting system shutdown..."; + dbgln("attempting system shutdown..."); // QEMU Shutdown IO::out16(0x604, 0x2000); // If we're here, the shutdown failed. Try VirtualBox shutdown. IO::out16(0x4004, 0x3400); // VirtualBox shutdown failed. Try Bochs/Old QEMU shutdown. IO::out16(0xb004, 0x2000); - dbg() << "shutdown attempts failed, applications will stop responding."; + dbgln("shutdown attempts failed, applications will stop responding."); return 0; } diff --git a/Kernel/Syscalls/thread.cpp b/Kernel/Syscalls/thread.cpp index 9b296e5e7d..3b8bc80c3d 100644 --- a/Kernel/Syscalls/thread.cpp +++ b/Kernel/Syscalls/thread.cpp @@ -140,7 +140,7 @@ int Process::sys$join_thread(pid_t tid, Userspace exit_value) } if (result == Thread::BlockResult::InterruptedByDeath) break; - dbg() << "join_thread: retrying"; + dbgln("join_thread: retrying"); } if (exit_value && !copy_to_user(exit_value, &joinee_exit_value)) diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp index f73e07bd4f..6b00892a3d 100644 --- a/Kernel/TTY/VirtualConsole.cpp +++ b/Kernel/TTY/VirtualConsole.cpp @@ -95,7 +95,7 @@ void VirtualConsole::switch_to(unsigned index) // can set the video mode on our own. Just stop anyone from trying for // now. if (active_console->is_graphical()) { - dbg() << "Cannot switch away from graphical console yet :("; + dbgln("Cannot switch away from graphical console yet :("); return; } active_console->set_active(false); @@ -305,7 +305,7 @@ void VirtualConsole::flush_dirty_lines() void VirtualConsole::beep() { // TODO - dbg() << "Beep!1"; + dbgln("Beep!1"); } void VirtualConsole::set_window_title(const StringView&) diff --git a/Kernel/Tasks/SyncTask.cpp b/Kernel/Tasks/SyncTask.cpp index 4b463dc7e2..2fee014756 100644 --- a/Kernel/Tasks/SyncTask.cpp +++ b/Kernel/Tasks/SyncTask.cpp @@ -35,7 +35,7 @@ void SyncTask::spawn() { RefPtr syncd_thread; Process::create_kernel_process(syncd_thread, "SyncTask", [] { - dbg() << "SyncTask is running"; + dbgln("SyncTask is running"); for (;;) { VFS::the().sync(); Thread::current()->sleep({ 1, 0 }); diff --git a/Kernel/Time/HPET.cpp b/Kernel/Time/HPET.cpp index 402c85dd42..c4d0c7adbd 100644 --- a/Kernel/Time/HPET.cpp +++ b/Kernel/Time/HPET.cpp @@ -147,7 +147,7 @@ bool HPET::test_and_initialize() if (TimeManagement::is_hpet_periodic_mode_allowed()) { if (!check_for_exisiting_periodic_timers()) { - dbg() << "HPET: No periodic capable timers"; + dbgln("HPET: No periodic capable timers"); return false; } } diff --git a/Kernel/Time/HPETComparator.cpp b/Kernel/Time/HPETComparator.cpp index 9507cee02e..e172736d6f 100644 --- a/Kernel/Time/HPETComparator.cpp +++ b/Kernel/Time/HPETComparator.cpp @@ -90,7 +90,7 @@ size_t HPETComparator::ticks_per_second() const void HPETComparator::reset_to_default_ticks_per_second() { - dbg() << "reset_to_default_ticks_per_second"; + dbgln("reset_to_default_ticks_per_second"); m_frequency = OPTIMAL_TICKS_PER_SECOND_RATE; if (!is_periodic()) set_new_countdown(); diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp index 0b0b3afb5e..85068d5660 100644 --- a/Kernel/Time/TimeManagement.cpp +++ b/Kernel/Time/TimeManagement.cpp @@ -224,7 +224,7 @@ timeval TimeManagement::now_as_timeval() Vector TimeManagement::scan_and_initialize_periodic_timers() { bool should_enable = is_hpet_periodic_mode_allowed(); - dbg() << "Time: Scanning for periodic timers"; + dbgln("Time: Scanning for periodic timers"); Vector timers; for (auto& hardware_timer : m_hardware_timers) { if (hardware_timer.is_periodic_capable()) { @@ -238,7 +238,7 @@ Vector TimeManagement::scan_and_initialize_periodic_timers() Vector TimeManagement::scan_for_non_periodic_timers() { - dbg() << "Time: Scanning for non-periodic timers"; + dbgln("Time: Scanning for non-periodic timers"); Vector timers; for (auto& hardware_timer : m_hardware_timers) { if (!hardware_timer.is_periodic_capable()) @@ -264,10 +264,10 @@ bool TimeManagement::probe_and_set_non_legacy_hardware_timers() if (!HPET::test_and_initialize()) return false; if (!HPET::the().comparators().size()) { - dbg() << "HPET initialization aborted."; + dbgln("HPET initialization aborted."); return false; } - dbg() << "HPET: Setting appropriate functions to timers."; + dbgln("HPET: Setting appropriate functions to timers."); for (auto& hpet_comparator : HPET::the().comparators()) m_hardware_timers.append(hpet_comparator); @@ -315,10 +315,10 @@ bool TimeManagement::probe_and_set_legacy_hardware_timers() { if (ACPI::is_enabled()) { if (ACPI::Parser::the()->x86_specific_flags().cmos_rtc_not_present) { - dbg() << "ACPI: CMOS RTC Not Present"; + dbgln("ACPI: CMOS RTC Not Present"); return false; } else { - dbg() << "ACPI: CMOS RTC Present"; + dbgln("ACPI: CMOS RTC Present"); } } diff --git a/Kernel/VM/AnonymousVMObject.cpp b/Kernel/VM/AnonymousVMObject.cpp index 875112e14b..5c722e8a4b 100644 --- a/Kernel/VM/AnonymousVMObject.cpp +++ b/Kernel/VM/AnonymousVMObject.cpp @@ -446,7 +446,7 @@ PageFaultResponse AnonymousVMObject::handle_cow_fault(size_t page_index, Virtual bool have_committed = m_shared_committed_cow_pages && is_nonvolatile(page_index); if (page_slot->ref_count() == 1) { #ifdef PAGE_FAULT_DEBUG - dbg() << " >> It's a COW page but nobody is sharing it anymore. Remap r/w"; + dbgln(" >> It's a COW page but nobody is sharing it anymore. Remap r/w"); #endif set_should_cow(page_index, false); if (have_committed) { @@ -459,12 +459,12 @@ PageFaultResponse AnonymousVMObject::handle_cow_fault(size_t page_index, Virtual RefPtr page; if (have_committed) { #ifdef PAGE_FAULT_DEBUG - dbg() << " >> It's a committed COW page and it's time to COW!"; + dbgln(" >> It's a committed COW page and it's time to COW!"); #endif page = m_shared_committed_cow_pages->allocate_one(); } else { #ifdef PAGE_FAULT_DEBUG - dbg() << " >> It's a COW page and it's time to COW!"; + dbgln(" >> It's a COW page and it's time to COW!"); #endif page = MM.allocate_user_physical_page(MemoryManager::ShouldZeroFill::No); if (page.is_null()) { diff --git a/Kernel/VM/RangeAllocator.cpp b/Kernel/VM/RangeAllocator.cpp index 49160dda35..a7ced5d636 100644 --- a/Kernel/VM/RangeAllocator.cpp +++ b/Kernel/VM/RangeAllocator.cpp @@ -209,7 +209,7 @@ void RangeAllocator::deallocate(Range range) } } #ifdef VRA_DEBUG - dbg() << "VRA: After deallocate"; + dbgln("VRA: After deallocate"); dump(); #endif } diff --git a/Kernel/VM/Region.cpp b/Kernel/VM/Region.cpp index 98c98cebe4..d5df2e4b3c 100644 --- a/Kernel/VM/Region.cpp +++ b/Kernel/VM/Region.cpp @@ -500,7 +500,7 @@ PageFaultResponse Region::handle_zero_fault(size_t page_index_in_region) if (!page_slot.is_null() && !page_slot->is_shared_zero_page() && !page_slot->is_lazy_committed_page()) { #ifdef PAGE_FAULT_DEBUG - dbg() << "MM: zero_page() but page already present. Fine with me!"; + dbgln("MM: zero_page() but page already present. Fine with me!"); #endif if (!remap_vmobject_page(page_index_in_vmobject)) return PageFaultResponse::OutOfMemory; @@ -581,7 +581,7 @@ PageFaultResponse Region::handle_inode_fault(size_t page_index_in_region) current_thread->did_inode_fault(); #ifdef MM_DEBUG - dbg() << "MM: page_in_from_inode ready to read from inode"; + dbgln("MM: page_in_from_inode ready to read from inode"); #endif u8 page_buffer[PAGE_SIZE]; diff --git a/Libraries/LibC/stdio.cpp b/Libraries/LibC/stdio.cpp index a8a0cfc022..99d6f15a1a 100644 --- a/Libraries/LibC/stdio.cpp +++ b/Libraries/LibC/stdio.cpp @@ -624,7 +624,7 @@ int feof(FILE* stream) int fflush(FILE* stream) { if (!stream) { - dbg() << "FIXME: fflush(nullptr) should flush all open streams"; + dbgln("FIXME: fflush(nullptr) should flush all open streams"); return 0; } return stream->flush() ? 0 : EOF; diff --git a/Libraries/LibC/ulimit.cpp b/Libraries/LibC/ulimit.cpp index 0bd284c538..1ab9b7dc3a 100644 --- a/Libraries/LibC/ulimit.cpp +++ b/Libraries/LibC/ulimit.cpp @@ -39,7 +39,7 @@ long ulimit([[maybe_unused]] int cmd, [[maybe_unused]] long newlimit) int getrusage([[maybe_unused]] int who, [[maybe_unused]] struct rusage* usage) { - dbg() << "LibC: getrusage is not implemented"; + dbgln("LibC: getrusage is not implemented"); return -1; } } diff --git a/Libraries/LibC/unistd.cpp b/Libraries/LibC/unistd.cpp index f3595e8fc1..de5838be4a 100644 --- a/Libraries/LibC/unistd.cpp +++ b/Libraries/LibC/unistd.cpp @@ -138,7 +138,7 @@ int execvpe(const char* filename, char* const argv[], char* const envp[]) } } errno_rollback.set_override_rollback_value(ENOENT); - dbg() << "execvpe() leaving :("; + dbgln("execvpe() leaving :("); return -1; } diff --git a/Libraries/LibCore/Gzip.cpp b/Libraries/LibCore/Gzip.cpp index 4b5b868460..268e9a4702 100644 --- a/Libraries/LibCore/Gzip.cpp +++ b/Libraries/LibCore/Gzip.cpp @@ -55,12 +55,12 @@ static Optional get_gzip_payload(const ByteBuffer& data) }; #ifdef DEBUG_GZIP - dbg() << "get_gzip_payload: Skipping over gzip header."; + dbgln("get_gzip_payload: Skipping over gzip header."); #endif // Magic Header if (read_byte() != 0x1F || read_byte() != 0x8B) { - dbg() << "get_gzip_payload: Wrong magic number."; + dbgln("get_gzip_payload: Wrong magic number."); return Optional(); } @@ -85,21 +85,21 @@ static Optional get_gzip_payload(const ByteBuffer& data) // FNAME if (flags & 8) { - dbg() << "get_gzip_payload: Header has FNAME flag set."; + dbgln("get_gzip_payload: Header has FNAME flag set."); while (read_byte() != '\0') ; } // FCOMMENT if (flags & 16) { - dbg() << "get_gzip_payload: Header has FCOMMENT flag set."; + dbgln("get_gzip_payload: Header has FCOMMENT flag set."); while (read_byte() != '\0') ; } // FHCRC if (flags & 2) { - dbg() << "get_gzip_payload: Header has FHCRC flag set."; + dbgln("get_gzip_payload: Header has FHCRC flag set."); current += 2; } @@ -142,7 +142,7 @@ Optional Gzip::decompress(const ByteBuffer& data) if (puff_ret == 0) { #ifdef DEBUG_GZIP - dbg() << "Gzip::decompress: Decompression success."; + dbgln("Gzip::decompress: Decompression success."); #endif destination.trim(destination_len); break; @@ -151,7 +151,7 @@ Optional Gzip::decompress(const ByteBuffer& data) if (puff_ret == 1) { // FIXME: Find a better way of decompressing without needing to try over and over again. #ifdef DEBUG_GZIP - dbg() << "Gzip::decompress: Output buffer exhausted. Growing."; + dbgln("Gzip::decompress: Output buffer exhausted. Growing."); #endif destination.grow(destination.size() * 2); } else { diff --git a/Libraries/LibCore/LocalServer.cpp b/Libraries/LibCore/LocalServer.cpp index 8b41ddcf21..092cf82388 100644 --- a/Libraries/LibCore/LocalServer.cpp +++ b/Libraries/LibCore/LocalServer.cpp @@ -78,11 +78,11 @@ bool LocalServer::take_over_from_system_server() } else { if (rc != 0) perror("fstat"); - dbg() << "It's not a socket, what the heck??"; + dbgln("It's not a socket, what the heck??"); } } - dbg() << "Failed to take the socket over from SystemServer"; + dbgln("Failed to take the socket over from SystemServer"); return false; } diff --git a/Libraries/LibCore/LocalSocket.cpp b/Libraries/LibCore/LocalSocket.cpp index 65a38d8de6..d49aa1d166 100644 --- a/Libraries/LibCore/LocalSocket.cpp +++ b/Libraries/LibCore/LocalSocket.cpp @@ -88,7 +88,7 @@ RefPtr LocalSocket::take_over_accepted_socket_from_system_server() if (rc < 0 || !S_ISSOCK(stat.st_mode)) { if (rc != 0) perror("fstat"); - dbg() << "ERROR: The fd we got from SystemServer is not a socket"; + dbgln("ERROR: The fd we got from SystemServer is not a socket"); return nullptr; } diff --git a/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp b/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp index 92d0bd90f6..9f6e49ef45 100644 --- a/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp +++ b/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp @@ -221,7 +221,7 @@ UnsignedBigInteger LCM(const UnsignedBigInteger& a, const UnsignedBigInteger& b) GCD_without_allocation(a, b, temp_a, temp_b, temp_1, temp_2, temp_3, temp_4, temp_quotient, temp_remainder, gcd_output); if (gcd_output == 0) { #ifdef NT_DEBUG - dbg() << "GCD is zero"; + dbgln("GCD is zero"); #endif return output; } diff --git a/Libraries/LibCrypto/PK/RSA.cpp b/Libraries/LibCrypto/PK/RSA.cpp index 5f1de4c039..d1ca1ab629 100644 --- a/Libraries/LibCrypto/PK/RSA.cpp +++ b/Libraries/LibCrypto/PK/RSA.cpp @@ -85,7 +85,7 @@ RSA::KeyPairType RSA::parse_rsa_key(ReadonlyBytes in) ASN1::Kind::Integer, 1, &n)) { // that's no key // that's a death star - dbg() << "that's a death star"; + dbgln("that's a death star"); return keypair; } @@ -105,7 +105,7 @@ RSA::KeyPairType RSA::parse_rsa_key(ReadonlyBytes in) } if (n == 1) { // multiprime key, we don't know how to deal with this - dbg() << "Unsupported key type"; + dbgln("Unsupported key type"); return keypair; } // it's a broken public key @@ -120,7 +120,7 @@ void RSA::encrypt(ReadonlyBytes in, Bytes& out) #endif auto in_integer = UnsignedBigInteger::import_data(in.data(), in.size()); if (!(in_integer < m_public_key.modulus())) { - dbg() << "value too large for key"; + dbgln("value too large for key"); out = {}; return; } @@ -175,7 +175,7 @@ void RSA::import_private_key(ReadonlyBytes bytes, bool pem) auto key = parse_rsa_key(bytes); if (!key.private_key.length()) { - dbg() << "We expected to see a private key, but we found none"; + dbgln("We expected to see a private key, but we found none"); ASSERT_NOT_REACHED(); } m_private_key = key.private_key; @@ -191,7 +191,7 @@ void RSA::import_public_key(ReadonlyBytes bytes, bool pem) auto key = parse_rsa_key(bytes); if (!key.public_key.length()) { - dbg() << "We expected to see a public key, but we found none"; + dbgln("We expected to see a public key, but we found none"); ASSERT_NOT_REACHED(); } m_public_key = key.public_key; @@ -235,12 +235,12 @@ void RSA_PKCS1_EME::encrypt(ReadonlyBytes in, Bytes& out) dbg() << "key size: " << mod_len; #endif if (in.size() > mod_len - 11) { - dbg() << "message too long :("; + dbgln("message too long :("); out = out.trim(0); return; } if (out.size() < mod_len) { - dbg() << "output buffer too small"; + dbgln("output buffer too small"); return; } @@ -303,14 +303,14 @@ void RSA_PKCS1_EME::decrypt(ReadonlyBytes in, Bytes& out) ++offset; if (offset == out.size()) { - dbg() << "garbage data, no zero to split padding"; + dbgln("garbage data, no zero to split padding"); return; } ++offset; if (offset - 3 < 8) { - dbg() << "PS too small"; + dbgln("PS too small"); return; } @@ -319,11 +319,11 @@ void RSA_PKCS1_EME::decrypt(ReadonlyBytes in, Bytes& out) void RSA_PKCS1_EME::sign(ReadonlyBytes, Bytes&) { - dbg() << "FIXME: RSA_PKCS_EME::sign"; + dbgln("FIXME: RSA_PKCS_EME::sign"); } void RSA_PKCS1_EME::verify(ReadonlyBytes, Bytes&) { - dbg() << "FIXME: RSA_PKCS_EME::verify"; + dbgln("FIXME: RSA_PKCS_EME::verify"); } } } diff --git a/Libraries/LibDiff/Hunks.cpp b/Libraries/LibDiff/Hunks.cpp index c7828c2f64..d806b2b386 100644 --- a/Libraries/LibDiff/Hunks.cpp +++ b/Libraries/LibDiff/Hunks.cpp @@ -80,14 +80,14 @@ Vector parse_hunks(const String& diff) #ifdef DEBUG_HUNKS for (const auto& hunk : hunks) { - dbg() << "Hunk location:"; + dbgln("Hunk location:"); dbg() << "orig: " << hunk.original_start_line; dbg() << "target: " << hunk.target_start_line; - dbg() << "removed:"; + dbgln("removed:"); for (const auto& line : hunk.removed_lines) { dbg() << "- " << line; } - dbg() << "added:"; + dbgln("added:"); for (const auto& line : hunk.added_lines) { dbg() << "+ " << line; } diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp index d74e630cd1..701733cb07 100644 --- a/Libraries/LibGUI/AbstractView.cpp +++ b/Libraries/LibGUI/AbstractView.cpp @@ -308,7 +308,7 @@ void AbstractView::mousemove_event(MouseEvent& event) // Prevent this by just ignoring later drag initiations (until the current drag operation ends). TemporaryChange dragging { m_is_dragging, true }; - dbg() << "Initiate drag!"; + dbgln("Initiate drag!"); auto drag_operation = DragOperation::construct(); drag_operation->set_mime_data(m_model->mime_data(m_selection)); @@ -317,10 +317,10 @@ void AbstractView::mousemove_event(MouseEvent& event) switch (outcome) { case DragOperation::Outcome::Accepted: - dbg() << "Drag was accepted!"; + dbgln("Drag was accepted!"); break; case DragOperation::Outcome::Cancelled: - dbg() << "Drag was cancelled!"; + dbgln("Drag was cancelled!"); break; default: ASSERT_NOT_REACHED(); diff --git a/Libraries/LibGUI/ColumnsView.cpp b/Libraries/LibGUI/ColumnsView.cpp index e0c061a546..7e702f9abb 100644 --- a/Libraries/LibGUI/ColumnsView.cpp +++ b/Libraries/LibGUI/ColumnsView.cpp @@ -192,7 +192,7 @@ void ColumnsView::push_column(const ModelIndex& parent_index) } // Add the new column. - dbg() << "Adding a new column"; + dbgln("Adding a new column"); m_columns.append({ parent_index, 0 }); update_column_sizes(); update(); @@ -278,7 +278,7 @@ void ColumnsView::model_did_update(unsigned flags) AbstractView::model_did_update(flags); // FIXME: Don't drop the columns on minor updates. - dbg() << "Model was updated; dropping columns :("; + dbgln("Model was updated; dropping columns :("); m_columns.clear(); m_columns.append({ {}, 0 }); diff --git a/Libraries/LibGUI/Widget.cpp b/Libraries/LibGUI/Widget.cpp index 04e8249e69..0a83919af5 100644 --- a/Libraries/LibGUI/Widget.cpp +++ b/Libraries/LibGUI/Widget.cpp @@ -968,14 +968,14 @@ bool Widget::load_from_json(const JsonObject& json) auto layout_value = json.get("layout"); if (!layout_value.is_null() && !layout_value.is_object()) { - dbg() << "layout is not an object"; + dbgln("layout is not an object"); return false; } if (layout_value.is_object()) { auto& layout = layout_value.as_object(); auto class_name = layout.get("class"); if (class_name.is_null()) { - dbg() << "Invalid layout class name"; + dbgln("Invalid layout class name"); return false; } @@ -1001,7 +1001,7 @@ bool Widget::load_from_json(const JsonObject& json) auto& child_json = child_json_value.as_object(); auto class_name = child_json.get("class"); if (!class_name.is_string()) { - dbg() << "No class name in entry"; + dbgln("No class name in entry"); return false; } auto* registration = WidgetClassRegistration::find(class_name.as_string()); diff --git a/Libraries/LibGemini/GeminiJob.cpp b/Libraries/LibGemini/GeminiJob.cpp index 7e5863be00..afba44932d 100644 --- a/Libraries/LibGemini/GeminiJob.cpp +++ b/Libraries/LibGemini/GeminiJob.cpp @@ -42,7 +42,7 @@ void GeminiJob::start() m_socket->set_root_certificates(m_override_ca_certificates ? *m_override_ca_certificates : DefaultRootCACertificates::the().certificates()); m_socket->on_tls_connected = [this] { #ifdef GEMINIJOB_DEBUG - dbg() << "GeminiJob: on_connected callback"; + dbgln("GeminiJob: on_connected callback"); #endif on_socket_connected(); }; @@ -97,7 +97,7 @@ void GeminiJob::read_while_data_available(Function read) void GeminiJob::set_certificate(String certificate, String private_key) { if (!m_socket->add_client_key(certificate.bytes(), private_key.bytes())) { - dbg() << "LibGemini: Failed to set a client certificate"; + dbgln("LibGemini: Failed to set a client certificate"); // FIXME: Do something about this failure ASSERT_NOT_REACHED(); } diff --git a/Libraries/LibGemini/Job.cpp b/Libraries/LibGemini/Job.cpp index 8c6265de26..c260951e70 100644 --- a/Libraries/LibGemini/Job.cpp +++ b/Libraries/LibGemini/Job.cpp @@ -68,7 +68,7 @@ void Job::on_socket_connected() m_sent_data = true; auto raw_request = m_request.to_raw_request(); #ifdef JOB_DEBUG - dbg() << "Job: raw_request:"; + dbgln("Job: raw_request:"); dbg() << String::copy(raw_request).characters(); #endif bool success = write(raw_request); @@ -153,7 +153,7 @@ void Job::on_socket_connected() if (!is_established()) { #ifdef JOB_DEBUG - dbg() << "Connection appears to have closed, finishing up"; + dbgln("Connection appears to have closed, finishing up"); #endif finish_up(); } diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp index 10375ee35f..aad9c6d6ed 100644 --- a/Libraries/LibGfx/GIFLoader.cpp +++ b/Libraries/LibGfx/GIFLoader.cpp @@ -357,7 +357,7 @@ static bool decode_frame(GIFLoadingContext& context, size_t frame_index) Optional code = decoder.next_code(); if (!code.has_value()) { #ifdef GIF_DEBUG - dbg() << "Unexpectedly reached end of gif frame data"; + dbgln("Unexpectedly reached end of gif frame data"); #endif return false; } @@ -506,7 +506,7 @@ static bool load_gif_frame_descriptors(GIFLoadingContext& context) if (extension_type == 0xF9) { if (sub_block.size() != 4) { #ifdef GIF_DEBUG - dbg() << "Unexpected graphic control size"; + dbgln("Unexpected graphic control size"); #endif continue; } @@ -536,7 +536,7 @@ static bool load_gif_frame_descriptors(GIFLoadingContext& context) if (sub_block[11] != 1) { #ifdef GIF_DEBUG - dbg() << "Unexpected application extension format"; + dbgln("Unexpected application extension format"); #endif continue; } diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp index 61b4bcc3a9..124dadae4d 100644 --- a/Libraries/LibGfx/JPGLoader.cpp +++ b/Libraries/LibGfx/JPGLoader.cpp @@ -273,7 +273,7 @@ static Optional get_next_symbol(HuffmanStreamState& hstream, const HuffmanTa } #ifdef JPG_DEBUG - dbg() << "If you're seeing this...the jpeg decoder needs to support more kinds of JPEGs!"; + dbgln("If you're seeing this...the jpeg decoder needs to support more kinds of JPEGs!"); #endif return {}; } diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp index 6d6492aa56..bbb9b44103 100644 --- a/Libraries/LibGfx/PNGLoader.cpp +++ b/Libraries/LibGfx/PNGLoader.cpp @@ -528,7 +528,7 @@ static bool decode_png_header(PNGLoadingContext& context) if (!context.data || context.data_size < sizeof(png_header)) { #ifdef PNG_DEBUG - dbg() << "Missing PNG header"; + dbgln("Missing PNG header"); #endif context.state = PNGLoadingContext::State::Error; return false; @@ -536,7 +536,7 @@ static bool decode_png_header(PNGLoadingContext& context) if (memcmp(context.data, png_header, sizeof(png_header)) != 0) { #ifdef PNG_DEBUG - dbg() << "Invalid PNG header"; + dbgln("Invalid PNG header"); #endif context.state = PNGLoadingContext::State::Error; return false; diff --git a/Libraries/LibHTTP/HttpJob.cpp b/Libraries/LibHTTP/HttpJob.cpp index 9013ea1862..87db14756d 100644 --- a/Libraries/LibHTTP/HttpJob.cpp +++ b/Libraries/LibHTTP/HttpJob.cpp @@ -40,7 +40,7 @@ void HttpJob::start() m_socket = Core::TCPSocket::construct(this); m_socket->on_connected = [this] { #ifdef CHTTPJOB_DEBUG - dbg() << "HttpJob: on_connected callback"; + dbgln("HttpJob: on_connected callback"); #endif on_socket_connected(); }; diff --git a/Libraries/LibHTTP/HttpsJob.cpp b/Libraries/LibHTTP/HttpsJob.cpp index 20e50d9503..ab12ee971a 100644 --- a/Libraries/LibHTTP/HttpsJob.cpp +++ b/Libraries/LibHTTP/HttpsJob.cpp @@ -43,7 +43,7 @@ void HttpsJob::start() m_socket->set_root_certificates(m_override_ca_certificates ? *m_override_ca_certificates : DefaultRootCACertificates::the().certificates()); m_socket->on_tls_connected = [this] { #ifdef HTTPSJOB_DEBUG - dbg() << "HttpsJob: on_connected callback"; + dbgln("HttpsJob: on_connected callback"); #endif on_socket_connected(); }; @@ -90,7 +90,7 @@ void HttpsJob::shutdown() void HttpsJob::set_certificate(String certificate, String private_key) { if (!m_socket->add_client_key(certificate.bytes(), private_key.bytes())) { - dbg() << "LibHTTP: Failed to set a client certificate"; + dbgln("LibHTTP: Failed to set a client certificate"); // FIXME: Do something about this failure ASSERT_NOT_REACHED(); } diff --git a/Libraries/LibHTTP/Job.cpp b/Libraries/LibHTTP/Job.cpp index aa0672b259..af3f53c19b 100644 --- a/Libraries/LibHTTP/Job.cpp +++ b/Libraries/LibHTTP/Job.cpp @@ -43,16 +43,16 @@ static ByteBuffer handle_content_encoding(const ByteBuffer& buf, const String& c if (content_encoding == "gzip") { if (!Core::Gzip::is_compressed(buf)) { - dbg() << "Job::handle_content_encoding: buf is not gzip compressed!"; + dbgln("Job::handle_content_encoding: buf is not gzip compressed!"); } #ifdef JOB_DEBUG - dbg() << "Job::handle_content_encoding: buf is gzip compressed!"; + dbgln("Job::handle_content_encoding: buf is gzip compressed!"); #endif auto uncompressed = Core::Gzip::decompress(buf); if (!uncompressed.has_value()) { - dbg() << "Job::handle_content_encoding: Gzip::decompress() failed. Returning original buffer."; + dbgln("Job::handle_content_encoding: Gzip::decompress() failed. Returning original buffer."); return buf; } @@ -115,7 +115,7 @@ void Job::on_socket_connected() m_sent_data = true; auto raw_request = m_request.to_raw_request(); #ifdef JOB_DEBUG - dbg() << "Job: raw_request:"; + dbgln("Job: raw_request:"); dbg() << String::copy(raw_request).characters(); #endif bool success = write(raw_request); @@ -234,7 +234,7 @@ void Job::on_socket_connected() dbg() << "Job: Received a chunk with size _" << size_data << "_"; #endif if (size_lines.size() == 0) { - dbg() << "Job: Reached end of stream"; + dbgln("Job: Reached end of stream"); finish_up(); return IterationDecision::Break; } else { @@ -355,7 +355,7 @@ void Job::on_socket_connected() if (!is_established()) { #ifdef JOB_DEBUG - dbg() << "Connection appears to have closed, finishing up"; + dbgln("Connection appears to have closed, finishing up"); #endif finish_up(); } diff --git a/Libraries/LibImageDecoderClient/Client.cpp b/Libraries/LibImageDecoderClient/Client.cpp index 04fc6135db..cd5fa7243d 100644 --- a/Libraries/LibImageDecoderClient/Client.cpp +++ b/Libraries/LibImageDecoderClient/Client.cpp @@ -53,7 +53,7 @@ RefPtr Client::decode_image(const ByteBuffer& encoded_data) auto encoded_buffer = SharedBuffer::create_with_size(encoded_data.size()); if (!encoded_buffer) { - dbg() << "Could not allocate encoded shbuf"; + dbgln("Could not allocate encoded shbuf"); return nullptr; } @@ -66,13 +66,13 @@ RefPtr Client::decode_image(const ByteBuffer& encoded_data) auto bitmap_format = (Gfx::BitmapFormat)response->bitmap_format(); if (bitmap_format == Gfx::BitmapFormat::Invalid) { #ifdef IMAGE_DECODER_CLIENT_DEBUG - dbg() << "Response image was invalid"; + dbgln("Response image was invalid"); #endif return nullptr; } if (response->size().is_empty()) { - dbg() << "Response image was empty"; + dbgln("Response image was empty"); return nullptr; } diff --git a/Libraries/LibLine/Editor.cpp b/Libraries/LibLine/Editor.cpp index 781fce17a0..8631db1586 100644 --- a/Libraries/LibLine/Editor.cpp +++ b/Libraries/LibLine/Editor.cpp @@ -1548,7 +1548,7 @@ Vector Editor::vt_dsr() if (nread == 0) { m_input_error = Error::Empty; finish(); - dbg() << "Terminal DSR issue; received no response"; + dbgln("Terminal DSR issue; received no response"); return { 1, 1 }; } length += nread; @@ -1559,13 +1559,13 @@ Vector Editor::vt_dsr() auto parts = StringView(buf + 2, length - 3).split_view(';'); auto row_opt = parts[0].to_int(); if (!row_opt.has_value()) { - dbg() << "Terminal DSR issue; received garbage row"; + dbgln("Terminal DSR issue; received garbage row"); } else { row = row_opt.value(); } auto col_opt = parts[1].to_int(); if (!col_opt.has_value()) { - dbg() << "Terminal DSR issue; received garbage col"; + dbgln("Terminal DSR issue; received garbage col"); } else { col = col_opt.value(); } diff --git a/Libraries/LibMarkdown/Text.cpp b/Libraries/LibMarkdown/Text.cpp index 75273e3a8f..ddb0ea2d81 100644 --- a/Libraries/LibMarkdown/Text.cpp +++ b/Libraries/LibMarkdown/Text.cpp @@ -245,14 +245,14 @@ Optional Text::parse(const StringView& str) case '[': #ifdef DEBUG_MARKDOWN if (first_span_in_the_current_link != -1) - dbg() << "Dropping the outer link"; + dbgln("Dropping the outer link"); #endif first_span_in_the_current_link = spans.size(); break; case ']': { if (first_span_in_the_current_link == -1) { #ifdef DEBUG_MARKDOWN - dbg() << "Unmatched ]"; + dbgln("Unmatched ]"); #endif continue; } diff --git a/Libraries/LibProtocol/Download.cpp b/Libraries/LibProtocol/Download.cpp index 3c226694d8..07f5e76fff 100644 --- a/Libraries/LibProtocol/Download.cpp +++ b/Libraries/LibProtocol/Download.cpp @@ -135,7 +135,7 @@ void Download::did_request_certificates(Badge) if (on_certificate_requested) { auto result = on_certificate_requested(); if (!m_client->set_certificate({}, *this, result.certificate, result.key)) { - dbg() << "Download: set_certificate failed"; + dbgln("Download: set_certificate failed"); } } } diff --git a/Libraries/LibRegex/RegexMatcher.cpp b/Libraries/LibRegex/RegexMatcher.cpp index c5d618d7be..fd2f7dab75 100644 --- a/Libraries/LibRegex/RegexMatcher.cpp +++ b/Libraries/LibRegex/RegexMatcher.cpp @@ -310,7 +310,7 @@ Optional Matcher::execute(const MatchInput& input, MatchState& sta auto* opcode = bytecode.get_opcode(state); if (!opcode) { - dbg() << "Wrong opcode... failed!"; + dbgln("Wrong opcode... failed!"); return {}; } diff --git a/Libraries/LibRegex/Tests/Regex.cpp b/Libraries/LibRegex/Tests/Regex.cpp index 0bb2e8d2ef..fc920140d0 100644 --- a/Libraries/LibRegex/Tests/Regex.cpp +++ b/Libraries/LibRegex/Tests/Regex.cpp @@ -507,12 +507,12 @@ TEST_CASE(ECMA262_parse) Regex re(test.pattern); EXPECT_EQ(re.parser_result.error, test.expected_error); #ifdef REGEX_DEBUG - dbg() << "\n"; + dbgln("\n"); RegexDebug regex_dbg(stderr); regex_dbg.print_raw_bytecode(re); regex_dbg.print_header(); regex_dbg.print_bytecode(re); - dbg() << "\n"; + dbgln("\n"); #endif } } @@ -552,12 +552,12 @@ TEST_CASE(ECMA262_match) for (auto& test : tests) { Regex re(test.pattern, test.options); #ifdef REGEX_DEBUG - dbg() << "\n"; + dbgln("\n"); RegexDebug regex_dbg(stderr); regex_dbg.print_raw_bytecode(re); regex_dbg.print_header(); regex_dbg.print_bytecode(re); - dbg() << "\n"; + dbgln("\n"); #endif EXPECT_EQ(re.parser_result.error, Error::NoError); EXPECT_EQ(re.match(test.subject).success, test.matches); @@ -585,12 +585,12 @@ TEST_CASE(replace) for (auto& test : tests) { Regex re(test.pattern, test.options); #ifdef REGEX_DEBUG - dbg() << "\n"; + dbgln("\n"); RegexDebug regex_dbg(stderr); regex_dbg.print_raw_bytecode(re); regex_dbg.print_header(); regex_dbg.print_bytecode(re); - dbg() << "\n"; + dbgln("\n"); #endif EXPECT_EQ(re.parser_result.error, Error::NoError); EXPECT_EQ(re.replace(test.subject, test.replacement), test.expected); diff --git a/Libraries/LibTLS/ClientHandshake.cpp b/Libraries/LibTLS/ClientHandshake.cpp index fecda66d17..1632bf6a76 100644 --- a/Libraries/LibTLS/ClientHandshake.cpp +++ b/Libraries/LibTLS/ClientHandshake.cpp @@ -51,14 +51,14 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe { write_packets = WritePacketStage::Initial; if (m_context.connection_status != ConnectionStatus::Disconnected && m_context.connection_status != ConnectionStatus::Renegotiating) { - dbg() << "unexpected hello message"; + dbgln("unexpected hello message"); return (i8)Error::UnexpectedMessage; } ssize_t res = 0; size_t min_hello_size = 41; if (min_hello_size > buffer.size()) { - dbg() << "need more data"; + dbgln("need more data"); return (i8)Error::NeedMoreData; } size_t following_bytes = buffer[0] * 0x10000 + buffer[1] * 0x100 + buffer[2]; @@ -69,7 +69,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe } if (buffer.size() - res < 2) { - dbg() << "not enough data for version"; + dbgln("not enough data for version"); return (i8)Error::NeedMoreData; } auto version = (Version)AK::convert_between_host_and_network_endian(*(const u16*)buffer.offset_pointer(res)); @@ -83,7 +83,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe u8 session_length = buffer[res++]; if (buffer.size() - res < session_length) { - dbg() << "not enough data for session id"; + dbgln("not enough data for session id"); return (i8)Error::NeedMoreData; } @@ -91,7 +91,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe memcpy(m_context.session_id, buffer.offset_pointer(res), session_length); m_context.session_id_size = session_length; #ifdef TLS_DEBUG - dbg() << "Remote session ID:"; + dbgln("Remote session ID:"); print_buffer(ReadonlyBytes { m_context.session_id, session_length }); #endif } else { @@ -100,14 +100,14 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe res += session_length; if (buffer.size() - res < 2) { - dbg() << "not enough data for cipher suite listing"; + dbgln("not enough data for cipher suite listing"); return (i8)Error::NeedMoreData; } auto cipher = (CipherSuite)AK::convert_between_host_and_network_endian(*(const u16*)buffer.offset_pointer(res)); res += 2; if (!supports_cipher(cipher)) { m_context.cipher = CipherSuite::Invalid; - dbg() << "No supported cipher could be agreed upon"; + dbgln("No supported cipher could be agreed upon"); return (i8)Error::NoCommonCipher; } m_context.cipher = cipher; @@ -119,12 +119,12 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe m_context.handshake_hash.initialize(Crypto::Hash::HashKind::SHA256); if (buffer.size() - res < 1) { - dbg() << "not enough data for compression spec"; + dbgln("not enough data for compression spec"); return (i8)Error::NeedMoreData; } u8 compression = buffer[res++]; if (compression != 0) { - dbg() << "Server told us to compress, we will not!"; + dbgln("Server told us to compress, we will not!"); return (i8)Error::CompressionNotSupported; } @@ -132,7 +132,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe if (m_context.connection_status != ConnectionStatus::Renegotiating) m_context.connection_status = ConnectionStatus::Negotiating; if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); write_packets = WritePacketStage::ServerHandshake; } } @@ -152,7 +152,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe #endif if (extension_length) { if (buffer.size() - res < extension_length) { - dbg() << "not enough data for extension"; + dbgln("not enough data for extension"); return (i8)Error::NeedMoreData; } @@ -191,7 +191,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe } } } else if (extension_type == HandshakeExtension::SignatureAlgorithms) { - dbg() << "supported signatures: "; + dbgln("supported signatures: "); print_buffer(buffer.slice(res, extension_length)); // FIXME: what are we supposed to do here? } @@ -205,7 +205,7 @@ ssize_t TLSv12::handle_hello(ReadonlyBytes buffer, WritePacketStage& write_packe ssize_t TLSv12::handle_finished(ReadonlyBytes buffer, WritePacketStage& write_packets) { if (m_context.connection_status < ConnectionStatus::KeyExchange || m_context.connection_status == ConnectionStatus::Established) { - dbg() << "unexpected finished message"; + dbgln("unexpected finished message"); return (i8)Error::UnexpectedMessage; } @@ -235,7 +235,7 @@ ssize_t TLSv12::handle_finished(ReadonlyBytes buffer, WritePacketStage& write_pa // TODO: Compare Hashes #ifdef TLS_DEBUG - dbg() << "FIXME: handle_finished :: Check message validity"; + dbgln("FIXME: handle_finished :: Check message validity"); #endif m_context.connection_status = ConnectionStatus::Established; @@ -266,7 +266,7 @@ void TLSv12::build_random(PacketBuilder& builder) } if (m_context.is_server) { - dbg() << "Server mode not supported"; + dbgln("Server mode not supported"); return; } else { *(u16*)random_bytes = AK::convert_between_host_and_network_endian((u16)Version::V12); @@ -276,14 +276,14 @@ void TLSv12::build_random(PacketBuilder& builder) const auto& certificate_option = verify_chain_and_get_matching_certificate(m_context.SNI); // if the SNI is empty, we'll make a special case and match *a* leaf certificate. if (!certificate_option.has_value()) { - dbg() << "certificate verification failed :("; + dbgln("certificate verification failed :("); alert(AlertLevel::Critical, AlertDescription::BadCertificate); return; } auto& certificate = m_context.certificates[certificate_option.value()]; #ifdef TLS_DEBUG - dbg() << "PreMaster secret"; + dbgln("PreMaster secret"); print_buffer(m_context.premaster_key); #endif @@ -294,12 +294,12 @@ void TLSv12::build_random(PacketBuilder& builder) rsa.encrypt(m_context.premaster_key, outbuf); #ifdef TLS_DEBUG - dbg() << "Encrypted: "; + dbgln("Encrypted: "); print_buffer(outbuf); #endif if (!compute_master_secret(bytes)) { - dbg() << "oh noes we could not derive a master key :("; + dbgln("oh noes we could not derive a master key :("); return; } @@ -312,7 +312,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) { if (m_context.connection_status == ConnectionStatus::Established) { #ifdef TLS_DEBUG - dbg() << "Renegotiation attempt ignored"; + dbgln("Renegotiation attempt ignored"); #endif // FIXME: We should properly say "NoRenegotiation", but that causes a handshake failure // so we just roll with it and pretend that we _did_ renegotiate @@ -339,12 +339,12 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) switch (type) { case HelloRequest: if (m_context.handshake_messages[0] >= 1) { - dbg() << "unexpected hello request message"; + dbgln("unexpected hello request message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[0]; - dbg() << "hello request (renegotiation?)"; + dbgln("hello request (renegotiation?)"); if (m_context.connection_status == ConnectionStatus::Established) { // renegotiation payload_res = (i8)Error::NoRenegotiation; @@ -362,38 +362,38 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case ServerHello: if (m_context.handshake_messages[2] >= 1) { - dbg() << "unexpected server hello message"; + dbgln("unexpected server hello message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[2]; #ifdef TLS_DEBUG - dbg() << "server hello"; + dbgln("server hello"); #endif if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } else { payload_res = handle_hello(buffer.slice(1, payload_size), write_packets); } break; case HelloVerifyRequest: - dbg() << "unsupported: DTLS"; + dbgln("unsupported: DTLS"); payload_res = (i8)Error::UnexpectedMessage; break; case CertificateMessage: if (m_context.handshake_messages[4] >= 1) { - dbg() << "unexpected certificate message"; + dbgln("unexpected certificate message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[4]; #ifdef TLS_DEBUG - dbg() << "certificate"; + dbgln("certificate"); #endif if (m_context.connection_status == ConnectionStatus::Negotiating) { if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } payload_res = handle_certificate(buffer.slice(1, payload_size)); @@ -402,7 +402,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) if (it.is_end()) { // no valid certificates - dbg() << "No valid certificates found"; + dbgln("No valid certificates found"); payload_res = (i8)Error::BadCertificate; m_context.critical_error = payload_res; break; @@ -418,16 +418,16 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case ServerKeyExchange: if (m_context.handshake_messages[5] >= 1) { - dbg() << "unexpected server key exchange message"; + dbgln("unexpected server key exchange message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[5]; #ifdef TLS_DEBUG - dbg() << "server key exchange"; + dbgln("server key exchange"); #endif if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } else { payload_res = handle_server_key_exchange(buffer.slice(1, payload_size)); @@ -435,18 +435,18 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case CertificateRequest: if (m_context.handshake_messages[6] >= 1) { - dbg() << "unexpected certificate request message"; + dbgln("unexpected certificate request message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[6]; if (m_context.is_server) { - dbg() << "invalid request"; - dbg() << "unsupported: server mode"; + dbgln("invalid request"); + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } else { // we do not support "certificate request" - dbg() << "certificate request"; + dbgln("certificate request"); if (on_tls_certificate_request) on_tls_certificate_request(*this); m_context.client_verified = VerificationNeeded; @@ -454,16 +454,16 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case ServerHelloDone: if (m_context.handshake_messages[7] >= 1) { - dbg() << "unexpected server hello done message"; + dbgln("unexpected server hello done message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[7]; #ifdef TLS_DEBUG - dbg() << "server hello done"; + dbgln("server hello done"); #endif if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } else { payload_res = handle_server_hello_done(buffer.slice(1, payload_size)); @@ -473,13 +473,13 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case CertificateVerify: if (m_context.handshake_messages[8] >= 1) { - dbg() << "unexpected certificate verify message"; + dbgln("unexpected certificate verify message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[8]; #ifdef TLS_DEBUG - dbg() << "certificate verify"; + dbgln("certificate verify"); #endif if (m_context.connection_status == ConnectionStatus::KeyExchange) { payload_res = handle_verify(buffer.slice(1, payload_size)); @@ -489,16 +489,16 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case ClientKeyExchange: if (m_context.handshake_messages[9] >= 1) { - dbg() << "unexpected client key exchange message"; + dbgln("unexpected client key exchange message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[9]; #ifdef TLS_DEBUG - dbg() << "client key exchange"; + dbgln("client key exchange"); #endif if (m_context.is_server) { - dbg() << "unsupported: server mode"; + dbgln("unsupported: server mode"); ASSERT_NOT_REACHED(); } else { payload_res = (i8)Error::UnexpectedMessage; @@ -509,13 +509,13 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) m_context.cached_handshake.clear(); } if (m_context.handshake_messages[10] >= 1) { - dbg() << "unexpected finished message"; + dbgln("unexpected finished message"); payload_res = (i8)Error::UnexpectedMessage; break; } ++m_context.handshake_messages[10]; #ifdef TLS_DEBUG - dbg() << "finished"; + dbgln("finished"); #endif payload_res = handle_finished(buffer.slice(1, payload_size), write_packets); if (payload_res > 0) { @@ -602,7 +602,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) case WritePacketStage::ClientHandshake: if (m_context.client_verified == VerificationNeeded) { #ifdef TLS_DEBUG - dbg() << "> Client Certificate"; + dbgln("> Client Certificate"); #endif auto packet = build_certificate(); write_packet(packet); @@ -610,14 +610,14 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) } { #ifdef TLS_DEBUG - dbg() << "> Key exchange"; + dbgln("> Key exchange"); #endif auto packet = build_client_key_exchange(); write_packet(packet); } { #ifdef TLS_DEBUG - dbg() << "> change cipher spec"; + dbgln("> change cipher spec"); #endif auto packet = build_change_cipher_spec(); write_packet(packet); @@ -626,7 +626,7 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) m_context.local_sequence_number = 0; { #ifdef TLS_DEBUG - dbg() << "> client finished"; + dbgln("> client finished"); #endif auto packet = build_finished(); write_packet(packet); @@ -635,21 +635,21 @@ ssize_t TLSv12::handle_payload(ReadonlyBytes vbuffer) break; case WritePacketStage::ServerHandshake: // server handshake - dbg() << "UNSUPPORTED: Server mode"; + dbgln("UNSUPPORTED: Server mode"); ASSERT_NOT_REACHED(); break; case WritePacketStage::Finished: // finished { #ifdef TLS_DEBUG - dbg() << "> change cipher spec"; + dbgln("> change cipher spec"); #endif auto packet = build_change_cipher_spec(); write_packet(packet); } { #ifdef TLS_DEBUG - dbg() << "> client finished"; + dbgln("> client finished"); #endif auto packet = build_finished(); write_packet(packet); diff --git a/Libraries/LibTLS/Exchange.cpp b/Libraries/LibTLS/Exchange.cpp index 391f2d0abd..0765bc5e9d 100644 --- a/Libraries/LibTLS/Exchange.cpp +++ b/Libraries/LibTLS/Exchange.cpp @@ -38,7 +38,7 @@ bool TLSv12::expand_key() auto is_aead = this->is_aead(); if (m_context.master_key.size() == 0) { - dbg() << "expand_key() with empty master key"; + dbgln("expand_key() with empty master key"); return false; } @@ -73,18 +73,18 @@ bool TLSv12::expand_key() offset += iv_size; #ifdef TLS_DEBUG - dbg() << "client key"; + dbgln("client key"); print_buffer(client_key, key_size); - dbg() << "server key"; + dbgln("server key"); print_buffer(server_key, key_size); - dbg() << "client iv"; + dbgln("client iv"); print_buffer(client_iv, iv_size); - dbg() << "server iv"; + dbgln("server iv"); print_buffer(server_iv, iv_size); if (!is_aead) { - dbg() << "client mac key"; + dbgln("client mac key"); print_buffer(m_context.crypto.local_mac, mac_size); - dbg() << "server mac key"; + dbgln("server mac key"); print_buffer(m_context.crypto.remote_mac, mac_size); } #endif @@ -111,7 +111,7 @@ bool TLSv12::expand_key() void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* label, size_t label_length, ReadonlyBytes seed, ReadonlyBytes seed_b) { if (!secret.size()) { - dbg() << "null secret"; + dbgln("null secret"); return; } @@ -155,7 +155,7 @@ void TLSv12::pseudorandom_function(Bytes output, ReadonlyBytes secret, const u8* bool TLSv12::compute_master_secret(size_t length) { if (m_context.premaster_key.size() == 0 || length < 48) { - dbg() << "there's no way I can make a master secret like this"; + dbgln("there's no way I can make a master secret like this"); dbg() << "I'd like to talk to your manager about this length of " << length; return false; } @@ -172,7 +172,7 @@ bool TLSv12::compute_master_secret(size_t length) m_context.premaster_key.clear(); #ifdef TLS_DEBUG - dbg() << "master key:"; + dbgln("master key:"); print_buffer(m_context.master_key); #endif expand_key(); @@ -187,7 +187,7 @@ ByteBuffer TLSv12::build_certificate() Vector* local_certificates = nullptr; if (m_context.is_server) { - dbg() << "Unsupported: Server mode"; + dbgln("Unsupported: Server mode"); ASSERT_NOT_REACHED(); } else { local_certificates = &m_context.client_certificates; @@ -214,7 +214,7 @@ ByteBuffer TLSv12::build_certificate() if (!total_certificate_size) { #ifdef TLS_DEBUG - dbg() << "No certificates, sending empty certificate message"; + dbgln("No certificates, sending empty certificate message"); #endif builder.append_u24(certificate_vector_header_size); builder.append_u24(total_certificate_size); @@ -246,7 +246,7 @@ ByteBuffer TLSv12::build_change_cipher_spec() ByteBuffer TLSv12::build_server_key_exchange() { - dbg() << "FIXME: build_server_key_exchange"; + dbgln("FIXME: build_server_key_exchange"); return {}; } @@ -267,13 +267,13 @@ ByteBuffer TLSv12::build_client_key_exchange() ssize_t TLSv12::handle_server_key_exchange(ReadonlyBytes) { - dbg() << "FIXME: parse_server_key_exchange"; + dbgln("FIXME: parse_server_key_exchange"); return 0; } ssize_t TLSv12::handle_verify(ReadonlyBytes) { - dbg() << "FIXME: parse_verify"; + dbgln("FIXME: parse_verify"); return 0; } diff --git a/Libraries/LibTLS/Record.cpp b/Libraries/LibTLS/Record.cpp index 913b7ab81c..1f2e875926 100644 --- a/Libraries/LibTLS/Record.cpp +++ b/Libraries/LibTLS/Record.cpp @@ -205,12 +205,12 @@ ByteBuffer TLSv12::hmac_message(const ReadonlyBytes& buf, const Optional 4 || octets > size - position) { #ifdef TLS_DEBUG - dbg() << "could not read the certificate"; + dbgln("could not read the certificate"); #endif return position; } @@ -218,7 +218,7 @@ static ssize_t _parse_asn1(const Context& context, Certificate& cert, const u8* position += octets; if (size - position < length) { #ifdef TLS_DEBUG - dbg() << "not enough data for sequence"; + dbgln("not enough data for sequence"); #endif return (i8)Error::NeedMoreData; } @@ -420,7 +420,7 @@ static ssize_t _parse_asn1(const Context& context, Certificate& cert, const u8* cert.fingerprint.grow(fingerprint.data_length()); cert.fingerprint.overwrite(0, fingerprint.immutable_data(), fingerprint.data_length()); #ifdef TLS_DEBUG - dbg() << "Certificate fingerprint:"; + dbgln("Certificate fingerprint:"); print_buffer(cert.fingerprint); #endif } @@ -453,7 +453,7 @@ ssize_t TLSv12::handle_certificate(ReadonlyBytes buffer) if (buffer.size() < 3) { #ifdef TLS_DEBUG - dbg() << "not enough certificate header data"; + dbgln("not enough certificate header data"); #endif return (i8)Error::NeedMoreData; } @@ -471,7 +471,7 @@ ssize_t TLSv12::handle_certificate(ReadonlyBytes buffer) if (certificate_total_length > buffer.size() - res) { #ifdef TLS_DEBUG - dbg() << "not enough data for claimed total cert length"; + dbgln("not enough data for claimed total cert length"); #endif return (i8)Error::NeedMoreData; } @@ -484,7 +484,7 @@ ssize_t TLSv12::handle_certificate(ReadonlyBytes buffer) ++index; if (buffer.size() - res < 3) { #ifdef TLS_DEBUG - dbg() << "not enough data for certificate length"; + dbgln("not enough data for certificate length"); #endif return (i8)Error::NeedMoreData; } @@ -493,7 +493,7 @@ ssize_t TLSv12::handle_certificate(ReadonlyBytes buffer) if (buffer.size() - res < certificate_size) { #ifdef TLS_DEBUG - dbg() << "not enough data for certificate body"; + dbgln("not enough data for certificate body"); #endif return (i8)Error::NeedMoreData; } @@ -504,7 +504,7 @@ ssize_t TLSv12::handle_certificate(ReadonlyBytes buffer) do { if (remaining <= 3) { - dbg() << "Ran out of data"; + dbgln("Ran out of data"); break; } ++certificates_in_chain; @@ -603,7 +603,7 @@ void TLSv12::consume(ReadonlyBytes record) index += length; buffer_length -= length; if (m_context.critical_error) { - dbg() << "Broken connection"; + dbgln("Broken connection"); m_context.error_code = Error::BrokenConnection; break; } @@ -674,61 +674,61 @@ bool Certificate::is_valid() const void TLSv12::try_disambiguate_error() const { - dbg() << "Possible failure cause(s): "; + dbgln("Possible failure cause(s): "); switch ((AlertDescription)m_context.critical_error) { case AlertDescription::HandshakeFailure: if (!m_context.cipher_spec_set) { dbg() << "- No cipher suite in common with " << m_context.SNI; } else { - dbg() << "- Unknown internal issue"; + dbgln("- Unknown internal issue"); } break; case AlertDescription::InsufficientSecurity: dbg() << "- No cipher suite in common with " << m_context.SNI << " (the server is oh so secure)"; break; case AlertDescription::ProtocolVersion: - dbg() << "- The server refused to negotiate with TLS 1.2 :("; + dbgln("- The server refused to negotiate with TLS 1.2 :("); break; case AlertDescription::UnexpectedMessage: - dbg() << "- We sent an invalid message for the state we're in."; + dbgln("- We sent an invalid message for the state we're in."); break; case AlertDescription::BadRecordMAC: - dbg() << "- Bad MAC record from our side."; - dbg() << "- Ciphertext wasn't an even multiple of the block length."; - dbg() << "- Bad block cipher padding."; - dbg() << "- If both sides are compliant, the only cause is messages being corrupted in the network."; + dbgln("- Bad MAC record from our side."); + dbgln("- Ciphertext wasn't an even multiple of the block length."); + dbgln("- Bad block cipher padding."); + dbgln("- If both sides are compliant, the only cause is messages being corrupted in the network."); break; case AlertDescription::RecordOverflow: - dbg() << "- Sent a ciphertext record which has a length bigger than 18432 bytes."; - dbg() << "- Sent record decrypted to a compressed record that has a length bigger than 18432 bytes."; - dbg() << "- If both sides are compliant, the only cause is messages being corrupted in the network."; + dbgln("- Sent a ciphertext record which has a length bigger than 18432 bytes."); + dbgln("- Sent record decrypted to a compressed record that has a length bigger than 18432 bytes."); + dbgln("- If both sides are compliant, the only cause is messages being corrupted in the network."); break; case AlertDescription::DecompressionFailure: - dbg() << "- We sent invalid input for decompression (e.g. data that would expand to excessive length)"; + dbgln("- We sent invalid input for decompression (e.g. data that would expand to excessive length)"); break; case AlertDescription::IllegalParameter: - dbg() << "- We sent a parameter in the handshake that is out of range or inconsistent with the other parameters."; + dbgln("- We sent a parameter in the handshake that is out of range or inconsistent with the other parameters."); break; case AlertDescription::DecodeError: - dbg() << "- The message we sent cannot be decoded because a field was out of range or the length was incorrect."; - dbg() << "- If both sides are compliant, the only cause is messages being corrupted in the network."; + dbgln("- The message we sent cannot be decoded because a field was out of range or the length was incorrect."); + dbgln("- If both sides are compliant, the only cause is messages being corrupted in the network."); break; case AlertDescription::DecryptError: - dbg() << "- A handshake crypto operation failed. This includes signature verification and validating Finished."; + dbgln("- A handshake crypto operation failed. This includes signature verification and validating Finished."); break; case AlertDescription::AccessDenied: - dbg() << "- The certificate is valid, but once access control was applied, the sender decided to stop negotiation."; + dbgln("- The certificate is valid, but once access control was applied, the sender decided to stop negotiation."); break; case AlertDescription::InternalError: - dbg() << "- No one knows, but it isn't a protocol failure."; + dbgln("- No one knows, but it isn't a protocol failure."); break; case AlertDescription::DecryptionFailed: case AlertDescription::NoCertificate: case AlertDescription::ExportRestriction: - dbg() << "- No one knows, the server sent a non-compliant alert."; + dbgln("- No one knows, the server sent a non-compliant alert."); break; default: - dbg() << "- No one knows."; + dbgln("- No one knows."); break; } } @@ -736,7 +736,7 @@ void TLSv12::try_disambiguate_error() const void TLSv12::set_root_certificates(Vector certificates) { if (!m_context.root_ceritificates.is_empty()) - dbg() << "TLS warn: resetting root certificates!"; + dbgln("TLS warn: resetting root certificates!"); for (auto& cert : certificates) { if (!cert.is_valid()) @@ -750,7 +750,7 @@ bool Context::verify_chain() const { const Vector* local_chain = nullptr; if (is_server) { - dbg() << "Unsupported: Server mode"; + dbgln("Unsupported: Server mode"); TODO(); } else { local_chain = &certificates; @@ -853,13 +853,13 @@ bool TLSv12::add_client_key(ReadonlyBytes certificate_pem_buffer, ReadonlyBytes } auto decoded_certificate = Crypto::decode_pem(certificate_pem_buffer, 0); if (decoded_certificate.is_empty()) { - dbg() << "Certificate not PEM"; + dbgln("Certificate not PEM"); return false; } auto maybe_certificate = parse_asn1(decoded_certificate); if (!maybe_certificate.has_value()) { - dbg() << "Invalid certificate"; + dbgln("Invalid certificate"); return false; } diff --git a/Libraries/LibTTF/Font.cpp b/Libraries/LibTTF/Font.cpp index 0e514b7be1..de3ef7a1bf 100644 --- a/Libraries/LibTTF/Font.cpp +++ b/Libraries/LibTTF/Font.cpp @@ -204,7 +204,7 @@ RefPtr Font::load_from_file(const StringView& path, unsigned index) } auto file = file_or_error.value(); if (!file->open(Core::IODevice::ReadOnly)) { - dbg() << "Could not open file"; + dbgln("Could not open file"); return nullptr; } auto buffer = file->read_all(); @@ -214,25 +214,25 @@ RefPtr Font::load_from_file(const StringView& path, unsigned index) RefPtr Font::load_from_memory(ByteBuffer& buffer, unsigned index) { if (buffer.size() < 4) { - dbg() << "Font file too small"; + dbgln("Font file too small"); return nullptr; } u32 tag = be_u32(buffer.data()); if (tag == tag_from_str("ttcf")) { // It's a font collection if (buffer.size() < (u32)Sizes::TTCHeaderV1 + sizeof(u32) * (index + 1)) { - dbg() << "Font file too small"; + dbgln("Font file too small"); return nullptr; } u32 offset = be_u32(buffer.offset_pointer((u32)Sizes::TTCHeaderV1 + sizeof(u32) * index)); return load_from_offset(move(buffer), offset); } if (tag == tag_from_str("OTTO")) { - dbg() << "CFF fonts not supported yet"; + dbgln("CFF fonts not supported yet"); return nullptr; } if (tag != 0x00010000) { - dbg() << "Not a valid font"; + dbgln("Not a valid font"); return nullptr; } return load_from_offset(move(buffer), 0); @@ -242,7 +242,7 @@ RefPtr Font::load_from_memory(ByteBuffer& buffer, unsigned index) RefPtr Font::load_from_offset(ByteBuffer&& buffer, u32 offset) { if (buffer.size() < offset + (u32)Sizes::OffsetTable) { - dbg() << "Font file too small"; + dbgln("Font file too small"); return nullptr; } @@ -263,7 +263,7 @@ RefPtr Font::load_from_offset(ByteBuffer&& buffer, u32 offset) auto num_tables = be_u16(buffer.offset_pointer(offset + (u32)Offsets::NumTables)); if (buffer.size() < offset + (u32)Sizes::OffsetTable + num_tables * (u32)Sizes::TableRecord) { - dbg() << "Font file too small"; + dbgln("Font file too small"); return nullptr; } @@ -279,7 +279,7 @@ RefPtr Font::load_from_offset(ByteBuffer&& buffer, u32 offset) } if (buffer.size() < table_offset + table_length) { - dbg() << "Font file too small"; + dbgln("Font file too small"); return nullptr; } auto buffer_here = ReadonlyBytes(buffer.offset_pointer(table_offset), table_length); @@ -303,43 +303,43 @@ RefPtr Font::load_from_offset(ByteBuffer&& buffer, u32 offset) } if (!opt_head_slice.has_value() || !(opt_head = Head::from_slice(opt_head_slice.value())).has_value()) { - dbg() << "Could not load Head"; + dbgln("Could not load Head"); return nullptr; } auto head = opt_head.value(); if (!opt_hhea_slice.has_value() || !(opt_hhea = Hhea::from_slice(opt_hhea_slice.value())).has_value()) { - dbg() << "Could not load Hhea"; + dbgln("Could not load Hhea"); return nullptr; } auto hhea = opt_hhea.value(); if (!opt_maxp_slice.has_value() || !(opt_maxp = Maxp::from_slice(opt_maxp_slice.value())).has_value()) { - dbg() << "Could not load Maxp"; + dbgln("Could not load Maxp"); return nullptr; } auto maxp = opt_maxp.value(); if (!opt_hmtx_slice.has_value() || !(opt_hmtx = Hmtx::from_slice(opt_hmtx_slice.value(), maxp.num_glyphs(), hhea.number_of_h_metrics())).has_value()) { - dbg() << "Could not load Hmtx"; + dbgln("Could not load Hmtx"); return nullptr; } auto hmtx = opt_hmtx.value(); if (!opt_cmap_slice.has_value() || !(opt_cmap = Cmap::from_slice(opt_cmap_slice.value())).has_value()) { - dbg() << "Could not load Cmap"; + dbgln("Could not load Cmap"); return nullptr; } auto cmap = opt_cmap.value(); if (!opt_loca_slice.has_value() || !(opt_loca = Loca::from_slice(opt_loca_slice.value(), maxp.num_glyphs(), head.index_to_loc_format())).has_value()) { - dbg() << "Could not load Loca"; + dbgln("Could not load Loca"); return nullptr; } auto loca = opt_loca.value(); if (!opt_glyf_slice.has_value()) { - dbg() << "Could not load Glyf"; + dbgln("Could not load Glyf"); return nullptr; } auto glyf = Glyf(opt_glyf_slice.value()); diff --git a/Libraries/LibVT/Terminal.cpp b/Libraries/LibVT/Terminal.cpp index 75263f26b6..ce0ec61d6a 100644 --- a/Libraries/LibVT/Terminal.cpp +++ b/Libraries/LibVT/Terminal.cpp @@ -565,7 +565,7 @@ void Terminal::execute_xterm_command() m_final = '@'; if (numeric_params.is_empty()) { - dbg() << "Empty Xterm params?"; + dbgln("Empty Xterm params?"); return; } @@ -820,7 +820,7 @@ void Terminal::DSR(const ParamVector& params) // Cursor position query emit_string(String::format("\033[%d;%dR", m_cursor_row + 1, m_cursor_column + 1)); } else { - dbg() << "Unknown DSR"; + dbgln("Unknown DSR"); } } diff --git a/Libraries/LibWeb/CSS/Parser/CSSParser.cpp b/Libraries/LibWeb/CSS/Parser/CSSParser.cpp index d615f0abc9..62bee3b733 100644 --- a/Libraries/LibWeb/CSS/Parser/CSSParser.cpp +++ b/Libraries/LibWeb/CSS/Parser/CSSParser.cpp @@ -41,9 +41,9 @@ ASSERT_NOT_REACHED(); \ } -#define PARSE_ERROR() \ - do { \ - dbg() << "CSS parse error"; \ +#define PARSE_ERROR() \ + do { \ + dbgln("CSS parse error"); \ } while (0) namespace Web { diff --git a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp index 45e05776a6..dbedd118b5 100644 --- a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp +++ b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp @@ -356,14 +356,14 @@ int main(int argc, char** argv) } #if 0 - dbg() << "Attributes:"; + dbgln("Attributes:"); for (auto& attribute : interface->attributes) { dbg() << " " << (attribute.readonly ? "Readonly " : "") << attribute.type.name << (attribute.type.nullable ? "?" : "") << " " << attribute.name; } - dbg() << "Functions:"; + dbgln("Functions:"); for (auto& function : interface->functions) { dbg() << " " << function.return_type.name << (function.return_type.nullable ? "?" : "") << " " << function.name; diff --git a/Libraries/LibWeb/DOM/Node.cpp b/Libraries/LibWeb/DOM/Node.cpp index f5dcc872ce..6890e4fda5 100644 --- a/Libraries/LibWeb/DOM/Node.cpp +++ b/Libraries/LibWeb/DOM/Node.cpp @@ -190,7 +190,7 @@ RefPtr Node::insert_before(NonnullRefPtr node, RefPtr child, b if (!child) return append_child(move(node), notify); if (child->parent_node() != this) { - dbg() << "FIXME: Trying to insert_before() a bogus child"; + dbgln("FIXME: Trying to insert_before() a bogus child"); return nullptr; } if (&node->document() != &document()) diff --git a/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp index 729e78ec57..a043527f5b 100644 --- a/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp +++ b/Libraries/LibWeb/HTML/CanvasRenderingContext2D.cpp @@ -207,7 +207,7 @@ void CanvasRenderingContext2D::fill(const String& fill_rule) RefPtr CanvasRenderingContext2D::create_image_data(int width, int height) const { if (!wrapper()) { - dbg() << "Hmm! Attempted to create ImageData for wrapper-less CRC2D."; + dbgln("Hmm! Attempted to create ImageData for wrapper-less CRC2D."); return nullptr; } return ImageData::create_with_size(wrapper()->global_object(), width, height); diff --git a/Libraries/LibWeb/Loader/Resource.cpp b/Libraries/LibWeb/Loader/Resource.cpp index b063cd11ac..2cb6ebc52d 100644 --- a/Libraries/LibWeb/Loader/Resource.cpp +++ b/Libraries/LibWeb/Loader/Resource.cpp @@ -106,7 +106,7 @@ void Resource::did_load(Badge, ReadonlyBytes data, const HashMap m_mime_type = url().data_mime_type(); } else { #ifdef RESOURCE_DEBUG - dbg() << "No Content-Type header to go on! Guessing based on filename..."; + dbgln("No Content-Type header to go on! Guessing based on filename..."); #endif m_encoding = "utf-8"; // FIXME: This doesn't seem nice. m_mime_type = Core::guess_mime_type_based_on_filename(url().path()); diff --git a/Libraries/LibWeb/SVG/SVGPathElement.cpp b/Libraries/LibWeb/SVG/SVGPathElement.cpp index b9fec926f4..5a3c01fc4c 100644 --- a/Libraries/LibWeb/SVG/SVGPathElement.cpp +++ b/Libraries/LibWeb/SVG/SVGPathElement.cpp @@ -92,7 +92,7 @@ static void print_instruction(const PathInstruction& instruction) dbg() << " (rx=" << data[i] << ", ry=" << data[i + 1] << ") x-axis-rotation=" << data[i + 2] << ", large-arc-flag=" << data[i + 3] << ", sweep-flag=" << data[i + 4] << ", (x=" << data[i + 5] << ", y=" << data[i + 6] << ")"; break; case PathInstructionType::Invalid: - dbg() << "Invalid"; + dbgln("Invalid"); break; } } diff --git a/Libraries/LibWeb/WebContentClient.cpp b/Libraries/LibWeb/WebContentClient.cpp index 0c09cb92af..870b691d3b 100644 --- a/Libraries/LibWeb/WebContentClient.cpp +++ b/Libraries/LibWeb/WebContentClient.cpp @@ -70,7 +70,7 @@ void WebContentClient::handle(const Messages::WebContentClient::DidInvalidateCon void WebContentClient::handle(const Messages::WebContentClient::DidChangeSelection&) { #ifdef DEBUG_SPAM - dbg() << "handle: WebContentClient::DidChangeSelection!"; + dbgln("handle: WebContentClient::DidChangeSelection!"); #endif m_view.notify_server_did_change_selection({}); } @@ -110,7 +110,7 @@ void WebContentClient::handle(const Messages::WebContentClient::DidHoverLink& me void WebContentClient::handle(const Messages::WebContentClient::DidUnhoverLink&) { #ifdef DEBUG_SPAM - dbg() << "handle: WebContentClient::DidUnhoverLink!"; + dbgln("handle: WebContentClient::DidUnhoverLink!"); #endif m_view.notify_server_did_unhover_link({}); } diff --git a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp index 3afb898ce3..74f8a894f9 100644 --- a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp +++ b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp @@ -178,7 +178,7 @@ JS_DEFINE_NATIVE_FUNCTION(TestRunnerGlobalObject::fuzzilli) } else if (operation == "FUZZILLI_PRINT") { static FILE* fzliout = fdopen(REPRL_DWFD, "w"); if (!fzliout) { - dbg() << "Fuzzer output not available"; + dbgln("Fuzzer output not available"); fzliout = stdout; } diff --git a/Meta/Lagom/TestApp.cpp b/Meta/Lagom/TestApp.cpp index b212ecf7e3..a4d0c7c975 100644 --- a/Meta/Lagom/TestApp.cpp +++ b/Meta/Lagom/TestApp.cpp @@ -33,7 +33,7 @@ int main(int, char**) Core::EventLoop event_loop; auto timer = Core::Timer::construct(100, [&] { - dbg() << "Timer fired, good-bye! :^)"; + dbgln("Timer fired, good-bye! :^)"); event_loop.quit(0); }); diff --git a/Services/AudioServer/main.cpp b/Services/AudioServer/main.cpp index ea489e2a13..9eca20bfd3 100644 --- a/Services/AudioServer/main.cpp +++ b/Services/AudioServer/main.cpp @@ -44,7 +44,7 @@ int main(int, char**) server->on_ready_to_accept = [&] { auto client_socket = server->accept(); if (!client_socket) { - dbg() << "AudioServer: accept failed."; + dbgln("AudioServer: accept failed."); return; } static int s_next_client_id = 0; diff --git a/Services/Clipboard/main.cpp b/Services/Clipboard/main.cpp index 2b84888c2f..b6cae095ee 100644 --- a/Services/Clipboard/main.cpp +++ b/Services/Clipboard/main.cpp @@ -58,7 +58,7 @@ int main(int, char**) server->on_ready_to_accept = [&] { auto client_socket = server->accept(); if (!client_socket) { - dbg() << "Clipboard: accept failed."; + dbgln("Clipboard: accept failed."); return; } static int s_next_client_id = 0; diff --git a/Services/DHCPClient/DHCPv4Client.cpp b/Services/DHCPClient/DHCPv4Client.cpp index 855fe6846e..7a759ed427 100644 --- a/Services/DHCPClient/DHCPv4Client.cpp +++ b/Services/DHCPClient/DHCPv4Client.cpp @@ -74,7 +74,7 @@ static void set_params(const InterfaceDescriptor& iface, const IPv4Address& ipv4 bool fits = iface.m_ifname.copy_characters_to_buffer(ifr.ifr_name, IFNAMSIZ); if (!fits) { - dbg() << "Interface name doesn't fit into IFNAMSIZ!"; + dbgln("Interface name doesn't fit into IFNAMSIZ!"); return; } @@ -123,7 +123,7 @@ DHCPv4Client::DHCPv4Client(Vector ifnames) }; if (!m_server->bind({}, 68)) { - dbg() << "The server we just created somehow came already bound, refusing to continue"; + dbgln("The server we just created somehow came already bound, refusing to continue"); ASSERT_NOT_REACHED(); } diff --git a/Services/ImageDecoder/ClientConnection.cpp b/Services/ImageDecoder/ClientConnection.cpp index 0a64b399b8..bf9d122194 100644 --- a/Services/ImageDecoder/ClientConnection.cpp +++ b/Services/ImageDecoder/ClientConnection.cpp @@ -63,14 +63,14 @@ OwnPtr ClientConnection::hand auto encoded_buffer = SharedBuffer::create_from_shbuf_id(message.encoded_shbuf_id()); if (!encoded_buffer) { #ifdef IMAGE_DECODER_DEBUG - dbg() << "Could not map encoded data buffer"; + dbgln("Could not map encoded data buffer"); #endif return nullptr; } if (message.encoded_size() > (size_t)encoded_buffer->size()) { #ifdef IMAGE_DECODER_DEBUG - dbg() << "Encoded buffer is smaller than encoded size"; + dbgln("Encoded buffer is smaller than encoded size"); #endif return nullptr; } @@ -84,7 +84,7 @@ OwnPtr ClientConnection::hand if (!bitmap) { #ifdef IMAGE_DECODER_DEBUG - dbg() << "Could not decode image from encoded data"; + dbgln("Could not decode image from encoded data"); #endif return make(-1, Gfx::IntSize(), (i32)Gfx::BitmapFormat::Invalid, Vector()); } diff --git a/Services/LaunchServer/main.cpp b/Services/LaunchServer/main.cpp index b88a49fe8b..2535d1e8bb 100644 --- a/Services/LaunchServer/main.cpp +++ b/Services/LaunchServer/main.cpp @@ -52,12 +52,12 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv) server->on_ready_to_accept = [&] { auto client_socket = server->accept(); if (!client_socket) { - dbg() << "LaunchServer: accept failed."; + dbgln("LaunchServer: accept failed."); return; } static int s_next_client_id = 0; int client_id = ++s_next_client_id; - dbg() << "Received connection"; + dbgln("Received connection"); IPC::new_client_connection(client_socket.release_nonnull(), client_id); }; diff --git a/Services/NotificationServer/main.cpp b/Services/NotificationServer/main.cpp index bc74083489..91cd06e0d7 100644 --- a/Services/NotificationServer/main.cpp +++ b/Services/NotificationServer/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char** argv) server->on_ready_to_accept = [&] { auto client_socket = server->accept(); if (!client_socket) { - dbg() << "NotificationServer: accept failed."; + dbgln("NotificationServer: accept failed."); return; } static int s_next_client_id = 0; diff --git a/Services/SystemServer/Service.cpp b/Services/SystemServer/Service.cpp index eb2ac45a92..d5bd06eba4 100644 --- a/Services/SystemServer/Service.cpp +++ b/Services/SystemServer/Service.cpp @@ -255,10 +255,10 @@ void Service::did_exit(int exit_code) if (!exited_successfully && run_time_in_msec < 1000) { switch (m_restart_attempts) { case 0: - dbg() << "Trying again"; + dbgln("Trying again"); break; case 1: - dbg() << "Third time's a charm?"; + dbgln("Third time's a charm?"); break; default: dbg() << "Giving up on " << name() << ". Good luck!"; diff --git a/Services/SystemServer/main.cpp b/Services/SystemServer/main.cpp index 26b7abef96..56179e86b5 100644 --- a/Services/SystemServer/main.cpp +++ b/Services/SystemServer/main.cpp @@ -165,7 +165,7 @@ static void prepare_devfs() static void mount_all_filesystems() { - dbg() << "Spawning mount -a to mount all filesystems."; + dbgln("Spawning mount -a to mount all filesystems."); pid_t pid = fork(); if (pid < 0) { diff --git a/Services/WebContent/ClientConnection.cpp b/Services/WebContent/ClientConnection.cpp index d7a3b53a1d..46b38f440b 100644 --- a/Services/WebContent/ClientConnection.cpp +++ b/Services/WebContent/ClientConnection.cpp @@ -75,7 +75,7 @@ void ClientConnection::handle(const Messages::WebContentServer::UpdateSystemThem { auto shared_buffer = SharedBuffer::create_from_shbuf_id(message.shbuf_id()); if (!shared_buffer) { - dbg() << "WebContentServer::UpdateSystemTheme: SharedBuffer already gone! Ignoring :^)"; + dbgln("WebContentServer::UpdateSystemTheme: SharedBuffer already gone! Ignoring :^)"); return; } Gfx::set_system_theme(*shared_buffer); @@ -123,7 +123,7 @@ void ClientConnection::handle(const Messages::WebContentServer::Paint& message) auto shared_buffer = SharedBuffer::create_from_shbuf_id(message.shbuf_id()); if (!shared_buffer) { #ifdef DEBUG_SPAM - dbg() << "WebContentServer::Paint: SharedBuffer already gone! Ignoring :^)"; + dbgln("WebContentServer::Paint: SharedBuffer already gone! Ignoring :^)"); #endif return; } diff --git a/Services/WindowServer/ClientConnection.cpp b/Services/WindowServer/ClientConnection.cpp index 29fee3c7ed..2ddae4135b 100644 --- a/Services/WindowServer/ClientConnection.cpp +++ b/Services/WindowServer/ClientConnection.cpp @@ -404,7 +404,7 @@ OwnPtr ClientConnection::handle(c } auto& window = *(*it).value; if (window.is_fullscreen()) { - dbg() << "ClientConnection: Ignoring SetWindowRect request for fullscreen window"; + dbgln("ClientConnection: Ignoring SetWindowRect request for fullscreen window"); return nullptr; } diff --git a/Services/WindowServer/Compositor.cpp b/Services/WindowServer/Compositor.cpp index e977e883f7..470a8e53a7 100644 --- a/Services/WindowServer/Compositor.cpp +++ b/Services/WindowServer/Compositor.cpp @@ -874,7 +874,7 @@ void Compositor::recompute_occlusions() }); #ifdef OCCLUSIONS_DEBUG - dbg() << "OCCLUSIONS:"; + dbgln("OCCLUSIONS:"); #endif auto screen_rect = Screen::the().rect(); diff --git a/Services/WindowServer/Cursor.cpp b/Services/WindowServer/Cursor.cpp index 23d34fe8ae..db18aa4281 100644 --- a/Services/WindowServer/Cursor.cpp +++ b/Services/WindowServer/Cursor.cpp @@ -34,7 +34,7 @@ CursorParams CursorParams::parse_from_file_name(const StringView& cursor_path, c { LexicalPath path(cursor_path); if (!path.is_valid()) { - dbg() << "Cannot parse invalid cursor path, use default cursor params"; + dbgln("Cannot parse invalid cursor path, use default cursor params"); return { default_hotspot }; } auto file_title = path.title(); @@ -86,7 +86,7 @@ CursorParams CursorParams::parse_from_file_name(const StringView& cursor_path, c if (value.value() >= 100 && value.value() <= 1000) params.m_frame_ms = value.value(); else - dbg() << "Cursor frame rate outside of valid range (100-1000ms)"; + dbgln("Cursor frame rate outside of valid range (100-1000ms)"); break; default: dbg() << "Ignore unknown property '" << property << "' with value " << value.value() << " parsed from cursor path: " << cursor_path; diff --git a/Services/WindowServer/EventLoop.cpp b/Services/WindowServer/EventLoop.cpp index 0f300935a1..1a38e89b6f 100644 --- a/Services/WindowServer/EventLoop.cpp +++ b/Services/WindowServer/EventLoop.cpp @@ -58,7 +58,7 @@ EventLoop::EventLoop() m_server->on_ready_to_accept = [this] { auto client_socket = m_server->accept(); if (!client_socket) { - dbg() << "WindowServer: accept failed."; + dbgln("WindowServer: accept failed."); return; } static int s_next_client_id = 0; diff --git a/Services/WindowServer/Menu.cpp b/Services/WindowServer/Menu.cpp index 72168bc51f..4d204406c2 100644 --- a/Services/WindowServer/Menu.cpp +++ b/Services/WindowServer/Menu.cpp @@ -525,7 +525,7 @@ void Menu::popup(const Gfx::IntPoint& position) void Menu::do_popup(const Gfx::IntPoint& position, bool make_input) { if (is_empty()) { - dbg() << "Menu: Empty menu popup"; + dbgln("Menu: Empty menu popup"); return; } diff --git a/Services/WindowServer/MenuManager.cpp b/Services/WindowServer/MenuManager.cpp index 71a1934dd5..28639db98f 100644 --- a/Services/WindowServer/MenuManager.cpp +++ b/Services/WindowServer/MenuManager.cpp @@ -217,7 +217,7 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event) ASSERT(topmost_menu); auto* window = topmost_menu->menu_window(); if (!window) { - dbg() << "MenuManager::handle_mouse_event: No menu window"; + dbgln("MenuManager::handle_mouse_event: No menu window"); return; } ASSERT(window->is_visible()); diff --git a/Services/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp index 26404bc15f..aa072fb0b6 100644 --- a/Services/WindowServer/WindowManager.cpp +++ b/Services/WindowServer/WindowManager.cpp @@ -515,7 +515,7 @@ bool WindowManager::process_ongoing_window_move(MouseEvent& event, Window*& hove process_event_for_doubleclick(*m_move_window, event); if (event.type() == Event::MouseDoubleClick) { #if defined(DOUBLECLICK_DEBUG) - dbg() << "[WM] Click up became doubleclick!"; + dbgln("[WM] Click up became doubleclick!"); #endif m_move_window->set_maximized(!m_move_window->is_maximized()); } @@ -528,7 +528,7 @@ bool WindowManager::process_ongoing_window_move(MouseEvent& event, Window*& hove #ifdef MOVE_DEBUG dbg() << "[WM] Moving, origin: " << m_move_origin << ", now: " << event.position(); if (m_move_window->is_maximized()) { - dbg() << " [!] The window is still maximized. Not moving yet."; + dbgln(" [!] The window is still maximized. Not moving yet."); } #endif @@ -540,7 +540,7 @@ bool WindowManager::process_ongoing_window_move(MouseEvent& event, Window*& hove auto pixels_moved_from_start = event.position().pixels_moved(m_move_origin); // dbg() << "[WM] " << pixels_moved_from_start << " moved since start of window move"; if (pixels_moved_from_start > 5) { - // dbg() << "[WM] de-maximizing window"; + // dbgln("[WM] de-maximizing window"); m_move_origin = event.position(); if (m_move_origin.y() <= secondary_deadzone) return true; diff --git a/Services/WindowServer/main.cpp b/Services/WindowServer/main.cpp index d063be9665..ca8d997f0d 100644 --- a/Services/WindowServer/main.cpp +++ b/Services/WindowServer/main.cpp @@ -113,7 +113,7 @@ int main(int, char**) return 1; } - dbg() << "Entering WindowServer main loop"; + dbgln("Entering WindowServer main loop"); loop.exec(); ASSERT_NOT_REACHED(); } diff --git a/Userland/DynamicLoader/misc.cpp b/Userland/DynamicLoader/misc.cpp index 5eda0fe535..f8f172a7c6 100644 --- a/Userland/DynamicLoader/misc.cpp +++ b/Userland/DynamicLoader/misc.cpp @@ -30,7 +30,7 @@ extern "C" { const char* __cxa_demangle(const char*, void*, void*, int*) { - dbg() << "WARNING: __cxa_demangle not supported"; + dbgln("WARNING: __cxa_demangle not supported"); return ""; } diff --git a/Userland/Tests/Kernel/kill-pidtid-confusion.cpp b/Userland/Tests/Kernel/kill-pidtid-confusion.cpp index 6192d4b823..7c9a03d4ba 100644 --- a/Userland/Tests/Kernel/kill-pidtid-confusion.cpp +++ b/Userland/Tests/Kernel/kill-pidtid-confusion.cpp @@ -68,7 +68,7 @@ static void fork_into(void(fn)()) return; } fn(); - dbg() << "child finished (?)"; + dbgln("child finished (?)"); exit(1); } @@ -108,12 +108,12 @@ int main(int, char**) // This entire function is the entirety of process PX. // Time 0: PX forks into PZ (mnemonic: Zombie) - dbg() << "PX forks into PZ"; + dbgln("PX forks into PZ"); fork_into(run_pz); sleep_steps(4); // Time 4: - dbg() << "Let's hope everything went fine!"; + dbgln("Let's hope everything went fine!"); pid_t guessed_pid = getpid() + 1; pid_t guessed_tid = guessed_pid + 1; printf("About to kill PID %d, TID %d.\n", guessed_pid, guessed_tid); @@ -136,12 +136,12 @@ static void run_pz() sleep_steps(1); // Time 1: PZ's main thread T1 creates a new thread T2 - dbg() << "PZ calls pthread_create"; + dbgln("PZ calls pthread_create"); thread_into(run_pz_t2_wrap); sleep_steps(2); // Time 3: T1 calls thread_exit() - dbg() << "PZ(T1) calls thread_exit"; + dbgln("PZ(T1) calls thread_exit"); pthread_exit(nullptr); ASSERT_NOT_REACHED(); } @@ -160,7 +160,7 @@ static void run_pz_t2() // Time 2: Nothing // FIXME: For some reason, both printf() and dbg() crash. // This also prevents us from using a pipe to communicate to PX both process and thread ID - // dbg() << "T2: I'm alive and well."; + // dbgln("T2: I'm alive and well."); sleep_steps(18); // Time 20: Cleanup diff --git a/Userland/mount.cpp b/Userland/mount.cpp index a284dee66c..9e313d7a19 100644 --- a/Userland/mount.cpp +++ b/Userland/mount.cpp @@ -113,7 +113,7 @@ static bool mount_all() int flags = parts.size() >= 4 ? parse_options(parts[3]) : 0; if (strcmp(mountpoint, "/") == 0) { - dbg() << "Skipping mounting root"; + dbgln("Skipping mounting root"); continue; } diff --git a/Userland/test-crypto.cpp b/Userland/test-crypto.cpp index 324e50b152..55d9c69611 100644 --- a/Userland/test-crypto.cpp +++ b/Userland/test-crypto.cpp @@ -1994,7 +1994,7 @@ nrDlBQpuxz7bwSyQO7UCIHrYMnDohgNbwtA5ZpW3H1cKKQQvueWm6sxW9P5sUrZ3 static void rsa_test_encrypt_decrypt() { I_TEST((RSA | Encrypt)); - dbg() << " creating rsa object"; + dbgln(" creating rsa object"); Crypto::PK::RSA rsa( "9527497237087650398000977129550904920919162360737979403539302312977329868395261515707123424679295515888026193056908173564681660256268221509339074678416049"_bigint, "39542231845947188736992321577701849924317746648774438832456325878966594812143638244746284968851807975097653255909707366086606867657273809465195392910913"_bigint, diff --git a/Userland/test-web.cpp b/Userland/test-web.cpp index dd02c695e1..e4172ddd03 100644 --- a/Userland/test-web.cpp +++ b/Userland/test-web.cpp @@ -177,7 +177,7 @@ static void cleanup_and_exit() #if 0 static void handle_sigabrt(int) { - dbg() << "test-web: SIGABRT received, cleaning up."; + dbgln("test-web: SIGABRT received, cleaning up."); cleanup_and_exit(); } #endif