mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: static allocation of formatter units (#2559)

This commit is contained in:
Charles Kerr 2022-01-31 23:59:43 -06:00 committed by GitHub
parent 8b9483f7fb
commit fdff2893b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libtransmission/utils.cc
View File

@ -1196,17 +1196,11 @@ uint64_t tr_ntohll(uint64_t x)
struct formatter_unit
{
char* name;
std::array<char, 16> name;
uint64_t value;
};
using formatter_units = std::array<formatter_unit, 4>;
/*
struct formatter_units
{
struct formatter_unit units[4];
};
*/
enum
{
@ -1225,19 +1219,19 @@ static void formatter_init(
char const* tb)
{
uint64_t value = kilo;
units[TR_FMT_KB].name = tr_strdup(kb);
tr_strlcpy(std::data(units[TR_FMT_KB].name), kb, std::size(units[TR_FMT_KB].name));
units[TR_FMT_KB].value = value;
value *= kilo;
units[TR_FMT_MB].name = tr_strdup(mb);
tr_strlcpy(std::data(units[TR_FMT_MB].name), mb, std::size(units[TR_FMT_MB].name));
units[TR_FMT_MB].value = value;
value *= kilo;
units[TR_FMT_GB].name = tr_strdup(gb);
tr_strlcpy(std::data(units[TR_FMT_GB].name), gb, std::size(units[TR_FMT_GB].name));
units[TR_FMT_GB].value = value;
value *= kilo;
units[TR_FMT_TB].name = tr_strdup(tb);
tr_strlcpy(std::data(units[TR_FMT_TB].name), tb, std::size(units[TR_FMT_TB].name));
units[TR_FMT_TB].value = value;
}
@ -1262,8 +1256,8 @@ static char* formatter_get_size_str(formatter_units const& u, char* buf, uint64_
unit = &u[3];
}
double value = (double)bytes / unit->value;
char const* units = unit->name;
double value = double(bytes) / unit->value;
auto const* const units = std::data(unit->name);
auto precision = int{};
if (unit->value == 1)
@ -1312,7 +1306,7 @@ std::string tr_formatter_speed_KBps(double KBps)
if (auto speed = KBps; speed <= 999.95) /* 0.0 KB to 999.9 KB */
{
tr_snprintf(std::data(buf), std::size(buf), "%d %s", (int)speed, speed_units[TR_FMT_KB].name);
tr_snprintf(std::data(buf), std::size(buf), "%d %s", int(speed), std::data(speed_units[TR_FMT_KB].name));
}
else
{
@ -1322,15 +1316,15 @@ std::string tr_formatter_speed_KBps(double KBps)
if (speed <= 99.995) /* 0.98 MB to 99.99 MB */
{
tr_snprintf(std::data(buf), std::size(buf), "%.2f %s", speed, speed_units[TR_FMT_MB].name);
tr_snprintf(std::data(buf), std::size(buf), "%.2f %s", speed, std::data(speed_units[TR_FMT_MB].name));
}
else if (speed <= 999.95) /* 100.0 MB to 999.9 MB */
{
tr_snprintf(std::data(buf), std::size(buf), "%.1f %s", speed, speed_units[TR_FMT_MB].name);
tr_snprintf(std::data(buf), std::size(buf), "%.1f %s", speed, std::data(speed_units[TR_FMT_MB].name));
}
else
{
tr_snprintf(std::data(buf), std::size(buf), "%.1f %s", speed / K, speed_units[TR_FMT_GB].name);
tr_snprintf(std::data(buf), std::size(buf), "%.1f %s", speed / K, std::data(speed_units[TR_FMT_GB].name));
}
}
@ -1363,21 +1357,21 @@ void tr_formatter_get_units(void* vdict)
tr_variant* l = tr_variantDictAddList(dict, TR_KEY_memory_units, std::size(mem_units));
for (auto const& unit : mem_units)
{
tr_variantListAddStr(l, unit.name);
tr_variantListAddStr(l, std::data(unit.name));
}
tr_variantDictAddInt(dict, TR_KEY_size_bytes, size_units[TR_FMT_KB].value);
l = tr_variantDictAddList(dict, TR_KEY_size_units, std::size(size_units));
for (auto const& unit : size_units)
{
tr_variantListAddStr(l, unit.name);
tr_variantListAddStr(l, std::data(unit.name));
}
tr_variantDictAddInt(dict, TR_KEY_speed_bytes, speed_units[TR_FMT_KB].value);
l = tr_variantDictAddList(dict, TR_KEY_speed_units, std::size(speed_units));
for (auto const& unit : speed_units)
{
tr_variantListAddStr(l, unit.name);
tr_variantListAddStr(l, std::data(unit.name));
}
}