Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-04-02 00:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use range-checked value_if to serialize/deserialize integer types (#8727)

Browse Source
This commit is contained in:
Yat Ho
2026-03-25 23:15:32 +08:00
committed by GitHub
parent 566d3d96ef
commit 51c3dc45b8
2 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
libtransmission/serializer.cc
View File

@@ -136,9 +136,11 @@ tr_variant from_double(double const& val)
// ---
bool to_int64(tr_variant const& src, int64_t* tgt)
template<std::integral T>
bool to_int(tr_variant const& src, T* tgt)
{
if (auto const val = src.value_if<int64_t>())
static_assert(!std::is_same_v<T, bool>);
if (auto const val = src.value_if<T>())
{
*tgt = *val;
return true;
@@ -147,8 +149,10 @@ bool to_int64(tr_variant const& src, int64_t* tgt)
return false;
}
tr_variant from_int64(int64_t const& val)
template<std::integral T>
tr_variant from_int(T const& val)
{
static_assert(!std::is_same_v<T, bool>);
return val;
}
@@ -341,42 +345,6 @@ tr_variant from_preferred_transport(small::max_size_vector<tr_preferred_transpor
// ---
bool to_size_t(tr_variant const& src, size_t* tgt)
{
if (auto const val = src.value_if<int64_t>())
{
*tgt = static_cast<size_t>(*val);
return true;
}
return false;
}
tr_variant from_size_t(size_t const& val)
{
return uint64_t{ val };
}
// ---
bool to_uint64(tr_variant const& src, uint64_t* tgt)
{
if (auto const val = src.value_if<int64_t>())
{
*tgt = static_cast<uint64_t>(*val);
return true;
}
return false;
}
tr_variant from_uint64(uint64_t const& val)
{
return val;
}
// ---
bool to_string(tr_variant const& src, std::string* tgt)
{
if (auto const val = src.value_if<std::string_view>())
@@ -573,7 +541,9 @@ void Converters::ensure_default_converters()
Converters::add(to_double, from_double);
Converters::add(to_encryption_mode, from_encryption_mode);
Converters::add(to_fs_path, from_fs_path);
Converters::add(to_int64, from_int64);
Converters::add(to_int<int64_t>, from_int<int64_t>);
Converters::add(to_int<size_t>, from_int<size_t>);
Converters::add(to_int<uint64_t>, from_int<uint64_t>);
Converters::add(to_log_level, from_log_level);
Converters::add(to_mode_t, from_mode_t);
Converters::add(to_msec, from_msec);
@@ -581,10 +551,8 @@ void Converters::ensure_default_converters()
Converters::add(to_port, from_port);
Converters::add(to_preallocation_mode, from_preallocation_mode);
Converters::add(to_preferred_transport, from_preferred_transport);
Converters::add(to_size_t, from_size_t);
Converters::add(to_string, from_string);
Converters::add(to_u8string, from_u8string);
Converters::add(to_uint64, from_uint64);
Converters::add(to_verify_added_mode, from_verify_added_mode);
});
}

14
tests/libtransmission/settings-test.cc
View File

@@ -272,12 +272,22 @@ TEST_F(SettingsTest, canLoadSizeT)
static auto constexpr Key = TR_KEY_queue_stalled_minutes;
auto settings = tr_session::Settings{};
auto const expected_value = settings.queue_stalled_minutes + 5U;
auto const default_value = settings.queue_stalled_minutes;
auto const expected_value = default_value + 5U;
EXPECT_NE(expected_value, default_value);
auto map = tr_variant::Map{ 1U };
map.try_emplace(Key, expected_value);
settings.load(tr_variant{ std::move(map) });
settings.load(std::move(map));
EXPECT_EQ(expected_value, settings.queue_stalled_minutes);
static auto constexpr NegValue = -1;
EXPECT_NE(default_value, NegValue);
settings = tr_session::Settings{};
map = tr_variant::Map{ 1U };
map.insert_or_assign(Key, NegValue);
settings.load(std::move(map));
EXPECT_EQ(default_value, settings.queue_stalled_minutes);
}
TEST_F(SettingsTest, canSaveSizeT)