From 685c8c3d40bfee4e0867bec02dcf1e352d128d8f Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sat, 22 Jul 2023 08:59:08 -0400 Subject: [PATCH] Revert "AK: Automatically copy all warn/warnln logs to debug console" This reverts commit d48c68cf3f8f1467ae94fc2ef211347d81eca121. Unfortunately, this currently copies some warn() invocations that we do *not* want in the debug console, such as test-js's use of OSC command 9 to report progress. --- AK/Format.h | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/AK/Format.h b/AK/Format.h index cc93afad398..2d0768e3584 100644 --- a/AK/Format.h +++ b/AK/Format.h @@ -557,9 +557,6 @@ struct Formatter : Formatter { ErrorOr vformat(StringBuilder&, StringView fmtstr, TypeErasedFormatParams&); -void vdbg(StringView fmtstr, TypeErasedFormatParams&, bool newline = false); -void dbgln(); - #ifndef KERNEL void vout(FILE*, StringView fmtstr, TypeErasedFormatParams&, bool newline = false); @@ -596,30 +593,13 @@ inline void outln() { outln(stdout); } template void warn(CheckedFormatString&& fmtstr, Parameters const&... parameters) { -# ifdef AK_OS_SERENITY - VariadicFormatParams variadic_format_params { parameters... }; - vdbg(fmtstr.view(), variadic_format_params, false); -# endif out(stderr, move(fmtstr), parameters...); } template -void warnln(CheckedFormatString&& fmtstr, Parameters const&... parameters) -{ -# ifdef AK_OS_SERENITY - VariadicFormatParams variadic_format_params { parameters... }; - vdbg(fmtstr.view(), variadic_format_params, true); -# endif - outln(stderr, move(fmtstr), parameters...); -} +void warnln(CheckedFormatString&& fmtstr, Parameters const&... parameters) { outln(stderr, move(fmtstr), parameters...); } -inline void warnln() -{ -# ifdef AK_OS_SERENITY - dbgln(); -# endif - outln(stderr); -} +inline void warnln() { outln(stderr); } # define warnln_if(flag, fmt, ...) \ do { \ @@ -629,6 +609,8 @@ inline void warnln() #endif +void vdbg(StringView fmtstr, TypeErasedFormatParams&, bool newline = false); + template void dbg(CheckedFormatString&& fmtstr, Parameters const&... parameters) {