Skip to content

Commit

Permalink
SmallString: fmt -> format, format -> sprintf
Browse files Browse the repository at this point in the history
  • Loading branch information
@stenzek
stenzek committed Dec 13, 2023
1 parent ad6e499 commit 79c226e
Show file tree
Hide file tree
Showing 30 changed files with 224 additions and 224 deletions.
18 changes: 9 additions & 9 deletions src/common/progress_callback.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void ProgressCallback::SetFormattedStatusText(const char* Format, ...)
va_list ap;

va_start(ap, Format);
str.format_va(Format, ap);
str.vsprintf(Format, ap);
va_end(ap);

SetStatusText(str);
Expand All @@ -30,7 +30,7 @@ void ProgressCallback::DisplayFormattedError(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

DisplayError(str);
Expand All @@ -42,7 +42,7 @@ void ProgressCallback::DisplayFormattedWarning(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

DisplayWarning(str);
Expand All @@ -54,7 +54,7 @@ void ProgressCallback::DisplayFormattedInformation(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

DisplayInformation(str);
Expand All @@ -66,7 +66,7 @@ void ProgressCallback::DisplayFormattedDebugMessage(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

DisplayDebugMessage(str);
Expand All @@ -78,7 +78,7 @@ void ProgressCallback::DisplayFormattedModalError(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

ModalError(str);
Expand All @@ -90,7 +90,7 @@ bool ProgressCallback::DisplayFormattedModalConfirmation(const char* format, ...
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

return ModalConfirmation(str);
Expand All @@ -102,7 +102,7 @@ void ProgressCallback::DisplayFormattedModalInformation(const char* format, ...)
va_list ap;

va_start(ap, format);
str.format_va(format, ap);
str.vsprintf(format, ap);
va_end(ap);

ModalInformation(str);
Expand Down Expand Up @@ -341,7 +341,7 @@ void ConsoleProgressCallback::Redraw(bool update_value_only)

SmallString message;
message.append(m_status_text);
message.append_fmt(" [{:.2f}%]", percent_complete);
message.append_format(" [{:.2f}%]", percent_complete);

if (max_bar_length > 0)
{
Expand Down
24 changes: 12 additions & 12 deletions src/common/small_string.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ void SmallStringBase::append_hex(const void* data, size_t len)

make_room_for(static_cast<u32>(len) * 4);
const u8* bytes = static_cast<const u8*>(data);
append_fmt("{:02X}", bytes[0]);
append_format("{:02X}", bytes[0]);
for (size_t i = 1; i < len; i++)
append_fmt(", {:02X}", bytes[i]);
append_format(", {:02X}", bytes[i]);
}

void SmallStringBase::prepend(const char* str, u32 length)
Expand Down Expand Up @@ -224,15 +224,15 @@ void SmallStringBase::append(const std::string_view& str)
append(str.data(), static_cast<u32>(str.length()));
}

void SmallStringBase::append_format(const char* format, ...)
void SmallStringBase::append_sprintf(const char* format, ...)
{
std::va_list ap;
va_start(ap, format);
append_format_va(format, ap);
append_vsprintf(format, ap);
va_end(ap);
}

void SmallStringBase::append_format_va(const char* format, va_list ap)
void SmallStringBase::append_vsprintf(const char* format, va_list ap)
{
// We have a 1KB byte buffer on the stack here. If this is too little, we'll grow it via the heap,
// but 1KB should be enough for most strings.
Expand Down Expand Up @@ -290,15 +290,15 @@ void SmallStringBase::prepend(const std::string_view& str)
prepend(str.data(), static_cast<u32>(str.length()));
}

void SmallStringBase::prepend_format(const char* format, ...)
void SmallStringBase::prepend_sprintf(const char* format, ...)
{
va_list ap;
va_start(ap, format);
prepend_format_va(format, ap);
prepend_vsprintf(format, ap);
va_end(ap);
}

void SmallStringBase::prepend_format_va(const char* format, va_list ArgPtr)
void SmallStringBase::prepend_vsprintf(const char* format, va_list ArgPtr)
{
// We have a 1KB byte buffer on the stack here. If this is too little, we'll grow it via the heap,
// but 1KB should be enough for most strings.
Expand Down Expand Up @@ -376,18 +376,18 @@ void SmallStringBase::insert(s32 offset, const std::string_view& str)
insert(offset, str.data(), static_cast<u32>(str.size()));
}

void SmallStringBase::format(const char* format, ...)
void SmallStringBase::sprintf(const char* format, ...)
{
va_list ap;
va_start(ap, format);
format_va(format, ap);
vsprintf(format, ap);
va_end(ap);
}

void SmallStringBase::format_va(const char* format, va_list ap)
void SmallStringBase::vsprintf(const char* format, va_list ap)
{
clear();
append_format_va(format, ap);
append_vsprintf(format, ap);
}

void SmallStringBase::assign(const SmallStringBase& copy)
Expand Down
34 changes: 17 additions & 17 deletions src/common/small_string.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ class SmallStringBase
void append(const SmallStringBase& str);

// append formatted string to this string
void append_format(const char* format, ...) printflike(2, 3);
void append_format_va(const char* format, va_list ap);
void append_sprintf(const char* format, ...) printflike(2, 3);
void append_vsprintf(const char* format, va_list ap);

template<typename... T>
void append_fmt(fmt::format_string<T...> fmt, T&&... args);
void append_format(fmt::format_string<T...> fmt, T&&... args);

// append hex string
void append_hex(const void* data, size_t len);
Expand All @@ -78,11 +78,11 @@ class SmallStringBase
void prepend(const SmallStringBase& str);

// append formatted string to this string
void prepend_format(const char* format, ...) printflike(2, 3);
void prepend_format_va(const char* format, va_list ap);
void prepend_sprintf(const char* format, ...) printflike(2, 3);
void prepend_vsprintf(const char* format, va_list ap);

template<typename... T>
void prepend_fmt(fmt::format_string<T...> fmt, T&&... args);
void prepend_format(fmt::format_string<T...> fmt, T&&... args);

// insert a string at the specified offset
void insert(s32 offset, const char* str);
Expand All @@ -92,11 +92,11 @@ class SmallStringBase
void insert(s32 offset, const SmallStringBase& str);

// set to formatted string
void format(const char* format, ...) printflike(2, 3);
void format_va(const char* format, va_list ap);
void sprintf(const char* format, ...) printflike(2, 3);
void vsprintf(const char* format, va_list ap);

template<typename... T>
void fmt(fmt::format_string<T...> fmt, T&&... args);
void format(fmt::format_string<T...> fmt, T&&... args);

// compare one string to another
bool equals(const char* str) const;
Expand Down Expand Up @@ -298,10 +298,10 @@ class SmallStackString : public SmallStringBase
}

// Override the fromstring method
static SmallStackString from_format(const char* format, ...) printflike(1, 2);
static SmallStackString from_sprintf(const char* format, ...) printflike(1, 2);

template<typename... T>
static SmallStackString from_fmt(fmt::format_string<T...> fmt, T&&... args);
static SmallStackString from_format(fmt::format_string<T...> fmt, T&&... args);

private:
char m_stack_buffer[L + 1];
Expand All @@ -325,13 +325,13 @@ class SmallStackString : public SmallStringBase
#endif

template<u32 L>
ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_format(const char* format, ...)
ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_sprintf(const char* format, ...)
{
std::va_list ap;
va_start(ap, format);

SmallStackString ret;
ret.format_va(format, ap);
ret.vsprintf(format, ap);

va_end(ap);

Expand All @@ -340,7 +340,7 @@ ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_format(const char* f

template<u32 L>
template<typename... T>
ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_fmt(fmt::format_string<T...> fmt, T&&... args)
ALWAYS_INLINE SmallStackString<L> SmallStackString<L>::from_format(fmt::format_string<T...> fmt, T&&... args)
{
SmallStackString<L> ret;
fmt::vformat_to(std::back_inserter(ret), fmt, fmt::make_format_args(args...));
Expand All @@ -353,21 +353,21 @@ using SmallString = SmallStackString<256>;
using LargeString = SmallStackString<512>;

template<typename... T>
ALWAYS_INLINE void SmallStringBase::append_fmt(fmt::format_string<T...> fmt, T&&... args)
ALWAYS_INLINE void SmallStringBase::append_format(fmt::format_string<T...> fmt, T&&... args)
{
fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...));
}

template<typename... T>
ALWAYS_INLINE void SmallStringBase::prepend_fmt(fmt::format_string<T...> fmt, T&&... args)
ALWAYS_INLINE void SmallStringBase::prepend_format(fmt::format_string<T...> fmt, T&&... args)
{
TinyString str;
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
prepend(str);
}

template<typename... T>
ALWAYS_INLINE void SmallStringBase::fmt(fmt::format_string<T...> fmt, T&&... args)
ALWAYS_INLINE void SmallStringBase::format(fmt::format_string<T...> fmt, T&&... args)
{
clear();
fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...));
Expand Down
24 changes: 12 additions & 12 deletions src/core/achievements.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ void Achievements::ReportRCError(int err, fmt::format_string<T...> fmt, T&&... a
{
TinyString str;
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
str.append_fmt("{} ({})", rc_error_str(err), err);
str.append_format("{} ({})", rc_error_str(err), err);
ReportError(str);
}

Expand Down Expand Up @@ -1542,7 +1542,7 @@ std::string Achievements::GetAchievementBadgePath(const rc_client_achievement_t*
if (achievement->badge_name[0] == 0)
return path;

path = Path::Combine(s_image_directory, TinyString::from_fmt("achievement_{}_{}_{}.png", s_game_id, achievement->id,
path = Path::Combine(s_image_directory, TinyString::from_format("achievement_{}_{}_{}.png", s_game_id, achievement->id,
s_achievement_state_strings[state]));

if (download_if_missing && !FileSystem::FileExists(path.c_str()))
Expand All @@ -1564,7 +1564,7 @@ std::string Achievements::GetUserBadgePath(const std::string_view& username)
std::string path;
const std::string clean_username = Path::SanitizeFileName(username);
if (!clean_username.empty())
path = Path::Combine(s_image_directory, TinyString::from_fmt("user_{}.png", clean_username));
path = Path::Combine(s_image_directory, TinyString::from_format("user_{}.png", clean_username));
return path;
}

Expand Down Expand Up @@ -2186,12 +2186,12 @@ void Achievements::DrawAchievementsWindow()
{
if (s_game_summary.num_unlocked_achievements == s_game_summary.num_core_achievements)
{
text.fmt(TRANSLATE_FS("Achievements", "You have unlocked all achievements and earned {} points!"),
text.format(TRANSLATE_FS("Achievements", "You have unlocked all achievements and earned {} points!"),
s_game_summary.points_unlocked);
}
else
{
text.fmt(TRANSLATE_FS("Achievements",
text.format(TRANSLATE_FS("Achievements",
"You have unlocked {0} of {1} achievements, earning {2} of {3} possible points."),
s_game_summary.num_unlocked_achievements, s_game_summary.num_core_achievements,
s_game_summary.points_unlocked, s_game_summary.points_core);
Expand Down Expand Up @@ -2220,7 +2220,7 @@ void Achievements::DrawAchievementsWindow()
ImVec2(progress_bb.Min.x + fraction * progress_bb.GetWidth(), progress_bb.Max.y),
ImGui::GetColorU32(ImGuiFullscreen::UISecondaryColor));

text.fmt("{}%", static_cast<int>(std::round(fraction * 100.0f)));
text.format("{}%", static_cast<int>(std::round(fraction * 100.0f)));
text_size = ImGui::CalcTextSize(text.c_str(), text.end_ptr());
const ImVec2 text_pos(
progress_bb.Min.x + ((progress_bb.Max.x - progress_bb.Min.x) / 2.0f) - (text_size.x / 2.0f),
Expand Down Expand Up @@ -2299,7 +2299,7 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)

ImRect bb;
bool visible, hovered;
ImGuiFullscreen::MenuButtonFrame(TinyString::from_fmt("chv_{}", cheevo->id), true,
ImGuiFullscreen::MenuButtonFrame(TinyString::from_format("chv_{}", cheevo->id), true,
!is_measured ? ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT + unlock_size :
ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT +
progress_height_unscaled + progress_spacing_unscaled,
Expand Down Expand Up @@ -2335,7 +2335,7 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)
SmallString text;

const float midpoint = bb.Min.y + g_large_font->FontSize + spacing;
text.fmt((cheevo->points != 1) ? TRANSLATE_FS("Achievements", "{} points") : TRANSLATE_FS("Achievements", "{} point"),
text.format((cheevo->points != 1) ? TRANSLATE_FS("Achievements", "{} points") : TRANSLATE_FS("Achievements", "{} point"),
cheevo->points);
const ImVec2 points_template_size(
g_medium_font->CalcTextSizeA(g_medium_font->FontSize, FLT_MAX, 0.0f, TRANSLATE("Achievements", "XXX points")));
Expand Down Expand Up @@ -2371,7 +2371,7 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)
{
TinyString date;
FullscreenUI::TimeToPrintableString(&date, cheevo->unlock_time);
text.fmt(TRANSLATE_FS("Achievements", "Unlocked: {}"), date);
text.format(TRANSLATE_FS("Achievements", "Unlocked: {}"), date);

const ImRect unlock_bb(summary_bb.Min.x, summary_bb.Max.y + spacing, summary_bb.Max.x, bb.Max.y);
ImGui::RenderTextClipped(unlock_bb.Min, unlock_bb.Max, text.c_str(), text.end_ptr(), nullptr, ImVec2(0.0f, 0.0f),
Expand Down Expand Up @@ -2543,7 +2543,7 @@ void Achievements::DrawLeaderboardsWindow()
u32 count = 0;
for (u32 i = 0; i < s_leaderboard_list->num_buckets; i++)
count += s_leaderboard_list->buckets[i].num_leaderboards;
text.fmt(TRANSLATE_FS("Achievements", "This game has {} leaderboards."), count);
text.format(TRANSLATE_FS("Achievements", "This game has {} leaderboards."), count);
}

const ImRect summary_bb(ImVec2(left, top), ImVec2(right, top + g_medium_font->FontSize));
Expand Down Expand Up @@ -2762,7 +2762,7 @@ void Achievements::DrawLeaderboardEntry(const rc_client_leaderboard_entry_t& ent
float text_start_x = bb.Min.x + LayoutScale(15.0f);
SmallString text;

text.fmt("{}", entry.rank);
text.format("{}", entry.rank);

ImGui::PushFont(g_large_font);

Expand Down Expand Up @@ -2832,7 +2832,7 @@ void Achievements::DrawLeaderboardListEntry(const rc_client_leaderboard_t* lboar
static constexpr float alpha = 0.8f;

TinyString id_str;
id_str.fmt("{}", lboard->id);
id_str.format("{}", lboard->id);

ImRect bb;
bool visible, hovered;
Expand Down
6 changes: 3 additions & 3 deletions src/core/cdrom.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ bool CDROM::PrecacheMedia()
TinyString CDROM::LBAToMSFString(CDImage::LBA lba)
{
const auto pos = CDImage::Position::FromLBA(lba);
return TinyString::from_fmt("{:02d}:{:02d}:{:02d}", pos.minute, pos.second, pos.frame);
return TinyString::from_format("{:02d}:{:02d}:{:02d}", pos.minute, pos.second, pos.frame);
}

void CDROM::SetReadaheadSectors(u32 readahead_sectors)
Expand Down Expand Up @@ -1425,7 +1425,7 @@ void CDROM::ExecuteCommand(void*, TickCount ticks, TickCount ticks_late)
{
SmallString params;
for (u32 i = 0; i < s_param_fifo.GetSize(); i++)
params.append_fmt("{}0x{:02X}", (i == 0) ? "" : ", ", s_param_fifo.Peek(i));
params.append_format("{}0x{:02X}", (i == 0) ? "" : ", ", s_param_fifo.Peek(i));
Log_DevFmt("CDROM executing command 0x{:02X} ({}), stat = 0x{:02X}, params = [{}]", static_cast<u8>(s_command),
ci.name, s_secondary_status.bits, params);
}
Expand Down Expand Up @@ -3410,7 +3410,7 @@ void CDROM::DrawDebugWindow()
// don't want to use locale...
TinyString ret;
TinyString temp;
temp.append_fmt("{}", val);
temp.append_format("{}", val);

u32 commas = 2u - (temp.length() % 3u);
for (const char* p = temp.c_str(); *p != 0u; p++)
Expand Down
Loading

0 comments on commit 79c226e

Please sign in to comment.