From 0cec9e768094d96cf1be95d6358a7e1982250f23 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 26 Apr 2015 20:14:51 -0400 Subject: [PATCH] PackageInstaller: use string_for_size instead of a custom function. --- src/apps/packageinstaller/PackageView.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/apps/packageinstaller/PackageView.cpp b/src/apps/packageinstaller/PackageView.cpp index 09ec9fa183..f4c3bfb6c0 100644 --- a/src/apps/packageinstaller/PackageView.cpp +++ b/src/apps/packageinstaller/PackageView.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -47,24 +48,6 @@ const float kMaxDescHeight = 125.0f; const uint32 kSeparatorIndex = 3; -static void -convert_size(uint64 size, char *buffer, uint32 n) -{ - if (size < 1024) - snprintf(buffer, n, B_TRANSLATE("%llu bytes"), size); - else if (size < 1024 * 1024) - snprintf(buffer, n, B_TRANSLATE("%.1f KiB"), size / 1024.0f); - else if (size < 1024 * 1024 * 1024) - snprintf(buffer, n, B_TRANSLATE("%.1f MiB"), - size / (1024.0f * 1024.0f)); - else { - snprintf(buffer, n, B_TRANSLATE("%.1f GiB"), - size / (1024.0f * 1024.0f * 1024.0f)); - } -} - - - // #pragma mark - @@ -684,7 +667,7 @@ PackageView::_NamePlusSizeString(BString baseName, size_t size, const char* format) const { char sizeString[48]; - convert_size(size, sizeString, sizeof(sizeString)); + string_for_size(size, sizeString, sizeof(sizeString)); BString name(format); name.ReplaceAll("%name%", baseName);