Skip to content

Commit

Permalink
Revert "AK: Automatically copy all warn/warnln logs to debug console"
Browse files Browse the repository at this point in the history
This reverts commit d48c68c.

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.
  • Loading branch information
trflynn89 committed Jul 22, 2023
1 parent 2e9fcc1 commit 685c8c3
Showing 1 changed file with 4 additions and 22 deletions.
26 changes: 4 additions & 22 deletions AK/Format.h
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,6 @@ struct Formatter<nullptr_t> : Formatter<FlatPtr> {

ErrorOr<void> 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);

Expand Down Expand Up @@ -596,30 +593,13 @@ inline void outln() { outln(stdout); }
template<typename... Parameters>
void warn(CheckedFormatString<Parameters...>&& fmtstr, Parameters const&... parameters)
{
# ifdef AK_OS_SERENITY
VariadicFormatParams<AllowDebugOnlyFormatters::Yes, Parameters...> variadic_format_params { parameters... };
vdbg(fmtstr.view(), variadic_format_params, false);
# endif
out(stderr, move(fmtstr), parameters...);
}

template<typename... Parameters>
void warnln(CheckedFormatString<Parameters...>&& fmtstr, Parameters const&... parameters)
{
# ifdef AK_OS_SERENITY
VariadicFormatParams<AllowDebugOnlyFormatters::Yes, Parameters...> variadic_format_params { parameters... };
vdbg(fmtstr.view(), variadic_format_params, true);
# endif
outln(stderr, move(fmtstr), parameters...);
}
void warnln(CheckedFormatString<Parameters...>&& 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 { \
Expand All @@ -629,6 +609,8 @@ inline void warnln()

#endif

void vdbg(StringView fmtstr, TypeErasedFormatParams&, bool newline = false);

template<typename... Parameters>
void dbg(CheckedFormatString<Parameters...>&& fmtstr, Parameters const&... parameters)
{
Expand Down

0 comments on commit 685c8c3

Please sign in to comment.