diff --git a/AK/Format.cpp b/AK/Format.cpp index 3f0f725a2e..689a66899f 100644 --- a/AK/Format.cpp +++ b/AK/Format.cpp @@ -605,12 +605,7 @@ void vwarn(StringView fmtstr, TypeErasedFormatParams params, bool newline) } #endif -void raw_dbg(StringView string) -{ - const auto retval = dbgputstr(string.characters_without_null_termination(), string.length()); - ASSERT(retval == 0); -} -void vdbg(StringView fmtstr, TypeErasedFormatParams params, bool newline) +void vdbgln(StringView fmtstr, TypeErasedFormatParams params) { StringBuilder builder; @@ -639,11 +634,12 @@ void vdbg(StringView fmtstr, TypeErasedFormatParams params, bool newline) #endif vformat(builder, fmtstr, params); + builder.append('\n'); - if (newline && !builder.is_empty()) - builder.append('\n'); + const auto string = builder.build(); - raw_dbg(builder.to_string()); + const auto retval = dbgputstr(string.characters(), string.length()); + ASSERT(retval == 0); } template struct Formatter; diff --git a/AK/Format.h b/AK/Format.h index 2b800111f1..4bd3a4f4d9 100644 --- a/AK/Format.h +++ b/AK/Format.h @@ -332,17 +332,12 @@ void warnln(const char* fmtstr, const Parameters&... parameters) { warnln(String inline void warnln() { raw_out("\n"); } #endif -void vdbg(StringView fmtstr, TypeErasedFormatParams, bool newline = false); -void raw_dbg(StringView string); +void vdbgln(StringView fmtstr, TypeErasedFormatParams); -// FIXME: Rename this function to 'dbg' when that name becomes avaliable. template -void new_dbg(StringView fmtstr, const Parameters&... parameters) { vdbg(fmtstr, VariadicFormatParams { parameters... }); } -template -void dbgln(StringView fmtstr, const Parameters&... parameters) { vdbg(fmtstr, VariadicFormatParams { parameters... }, true); } +void dbgln(StringView fmtstr, const Parameters&... parameters) { vdbgln(fmtstr, VariadicFormatParams { parameters... }); } template void dbgln(const char* fmtstr, const Parameters&... parameters) { dbgln(StringView { fmtstr }, parameters...); } -inline void dbgln() { raw_dbg("\n"); } template struct HasFormatter : TrueType { @@ -395,7 +390,5 @@ using AK::warnln; #endif using AK::dbgln; -using AK::new_dbg; -using AK::raw_dbg; using AK::FormatIfSupported;