From 9f3f619774f984350736e13d87f89253550465cb Mon Sep 17 00:00:00 2001 From: Eladash Date: Sun, 23 Oct 2022 13:45:15 +0300 Subject: [PATCH] Minor cleanup --- rpcs3/Emu/Cell/lv2/sys_net.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 2 +- rpcs3/Emu/NP/np_dnshook.cpp | 2 +- rpcs3/Emu/NP/signaling_handler.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index e021cca62c..424a83be27 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -325,7 +325,7 @@ void lv2_socket::save(utils::serial& ar, bool save_only_this_class) void sys_net_dump_data(std::string_view desc, const u8* data, s32 len) { - if (sys_net_dump.enabled == logs::level::trace) + if (sys_net_dump.trace) { auto data_dump = fmt::format("%s:\n", desc); const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index d05c67caae..3de3b6f43a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -935,7 +935,7 @@ error_code sys_usbd_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm:: sys_usbd.trace("sys_usbd_transfer_data(handle=0x%x, id_pipe=0x%x, buf=*0x%x, buf_length=0x%x, request=*0x%x, type=0x%x)", handle, id_pipe, buf, buf_size, request, type_transfer); - if (sys_usbd.enabled == logs::level::trace && request) + if (sys_usbd.trace && request) { sys_usbd.trace("RequestType:0x%x, Request:0x%x, wValue:0x%x, wIndex:0x%x, wLength:0x%x", request->bmRequestType, request->bRequest, request->wValue, request->wIndex, request->wLength); if ((request->bmRequestType & 0x80) == 0 && buf && buf_size != 0) diff --git a/rpcs3/Emu/NP/np_dnshook.cpp b/rpcs3/Emu/NP/np_dnshook.cpp index d148ebfed3..84a12bf45e 100644 --- a/rpcs3/Emu/NP/np_dnshook.cpp +++ b/rpcs3/Emu/NP/np_dnshook.cpp @@ -102,7 +102,7 @@ namespace np s32 dnshook::analyze_dns_packet(s32 s, const u8* buf, u32 len) { std::lock_guard lock(mutex); - if (dnshook_log.enabled == logs::level::trace) + if (dnshook_log.trace) { std::string datrace; const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; diff --git a/rpcs3/Emu/NP/signaling_handler.cpp b/rpcs3/Emu/NP/signaling_handler.cpp index c033c2af59..51cb18dc2f 100644 --- a/rpcs3/Emu/NP/signaling_handler.cpp +++ b/rpcs3/Emu/NP/signaling_handler.cpp @@ -192,7 +192,7 @@ void signaling_handler::process_incoming_messages() if (!validate_signaling_packet(sp)) continue; - if (sign_log.enabled == logs::level::trace) + if (sign_log.trace) { in_addr addr; addr.s_addr = op_addr;