RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:17:35 +00:00
Code Issues Activity Actions

Everywhere: Consolidate human_readable_size() implementations

Browse source 
Let's use the one in AK/NumberFormat.h everywhere.

It has slightly different behavior than some of the copies this
removes, but it's probably nice to have uniform human readable
size outputs across the system.
This commit is contained in:
Nico Weber 2020-08-15 14:05:46 -04:00 • committed by Andreas Kling
parent 430b265cd4
commit aa97166739
5 changed files with 10 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/ifconfig.cpp
View file

@ -26,6 +26,7 @@
#include <AK/JsonArray.h>
#include <AK/JsonObject.h>
#include <AK/NumberFormat.h>
#include <AK/String.h>
#include <AK/Types.h>
#include <LibCore/ArgsParser.h>
@ -38,17 +39,6 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
static String si_bytes(unsigned bytes)
{
if (bytes >= GiB)
return String::format("%fGiB", (double)bytes / (double)GiB);
if (bytes >= MiB)
return String::format("%fMiB", (double)bytes / (double)MiB);
if (bytes >= KiB)
return String::format("%fkiB", (double)bytes / (double)KiB);
return String::format("%dB", bytes);
}
int main(int argc, char** argv)
{
const char* value_ipv4 = nullptr;
@ -95,8 +85,8 @@ int main(int argc, char** argv)
printf("\tnetmask: %s\n", netmask.characters());
printf("\tgateway: %s\n", gateway.characters());
printf("\tclass: %s\n", class_name.characters());
printf("\tRX: %u packets %u bytes (%s)\n", packets_in, bytes_in, si_bytes(bytes_in).characters());
printf("\tTX: %u packets %u bytes (%s)\n", packets_out, bytes_out, si_bytes(bytes_out).characters());
printf("\tRX: %u packets %u bytes (%s)\n", packets_in, bytes_in, human_readable_size(bytes_in).characters());
printf("\tTX: %u packets %u bytes (%s)\n", packets_out, bytes_out, human_readable_size(bytes_out).characters());
printf("\tMTU: %u\n", mtu);
printf("\n");
});