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

fixup: new clang-tidy warnings (#3863)

This commit is contained in:
Charles Kerr 2022-10-02 17:56:58 -05:00 committed by GitHub
parent 0a0c15d17c
commit 3bb8f3c03f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libtransmission/blocklist.cc
View File

@ -559,30 +559,30 @@ void BlocklistFile::assertValidRules(std::vector<AddressRange> const& ranges)
}
}
auto ranges_IPv6 = std::vector<AddressRange>{};
auto ranges_IPv4 = std::vector<AddressRange>{};
auto ranges_ipv4 = std::vector<AddressRange>{};
auto ranges_ipv6 = std::vector<AddressRange>{};
for (size_t i = 0; i < std::size(ranges); i++)
{
if (ranges[i].begin_ == 0 && ranges[i].end_ == 0)
{
ranges_IPv6.push_back(ranges[i]);
ranges_ipv6.emplace_back(ranges[i]);
}
else
{
ranges_IPv4.push_back(ranges[i]);
ranges_ipv4.emplace_back(ranges[i]);
}
}
for (size_t i = 1; i < std::size(ranges_IPv4); ++i)
for (size_t i = 1; i < std::size(ranges_ipv4); ++i)
{
TR_ASSERT(ranges_IPv4[i - 1].end_ < ranges_IPv4[i].begin_);
TR_ASSERT(ranges_ipv4[i - 1].end_ < ranges_ipv4[i].begin_);
}
for (size_t i = 1; i < std::size(ranges_IPv6); ++i)
for (size_t i = 1; i < std::size(ranges_ipv6); ++i)
{
auto last_end_address = ranges_IPv6[i - 1].end6_.s6_addr;
auto start_address = ranges_IPv6[i].begin6_.s6_addr;
auto last_end_address = ranges_ipv6[i - 1].end6_.s6_addr;
auto start_address = ranges_ipv6[i].begin6_.s6_addr;
TR_ASSERT(memcmp(last_end_address, start_address, sizeof(&start_address)) > 0);
}

4
libtransmission/session.h
View File

@ -493,8 +493,8 @@ public:
~tr_udp_core();
void dhtUninit();
void dhtUpkeep();
static void dhtUninit();
static void dhtUpkeep();
void set_socket_buffers();

4
libtransmission/tr-dht.cc
View File

@ -167,7 +167,7 @@ static constexpr std::string_view printableStatus(Status status)
bool tr_dhtEnabled()
{
return impl.session != nullptr && (impl.udp4_socket != TR_BAD_SOCKET || impl.udp4_socket != TR_BAD_SOCKET);
return impl.session != nullptr && (impl.udp4_socket != TR_BAD_SOCKET || impl.udp6_socket != TR_BAD_SOCKET);
}
static constexpr auto getUdpSocket(int af)
@ -342,7 +342,7 @@ static void bootstrapFromFile(std::string_view config_dir)
}
}
static void bootstrapStart(std::string config_dir, std::vector<uint8_t> nodes4, std::vector<uint8_t> nodes6)
static void bootstrapStart(std::string_view config_dir, std::vector<uint8_t> nodes4, std::vector<uint8_t> nodes6)
{
TR_ASSERT(tr_dhtEnabled());