mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-22 15:54:57 +00:00
Code Issues Releases Wiki Activity

refactor: fix uninit var warnings in blocklist.cc (#2087)

Browse source
This commit is contained in:
Charles Kerr 2021-11-02 22:55:43 -05:00 committed by GitHub
parent 002b45a95c
commit fa2ef23bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libtransmission/.clang-tidy
View file

@ -2,6 +2,7 @@
# Many of these checks are disabled only because the code hasn't been # Many of these checks are disabled only because the code hasn't been
# cleaned up yet. Pull requests welcomed. # cleaned up yet. Pull requests welcomed.
Checks: > Checks: >
cppcoreguidelines-init-variables,
misc-static-assert, misc-static-assert,
modernize-deprecated-headers, modernize-deprecated-headers,
modernize-loop-convert, modernize-loop-convert,

37
libtransmission/blocklist.cc
View file

@ -55,29 +55,24 @@ static void blocklistClose(tr_blocklistFile* b)
static void blocklistLoad(tr_blocklistFile* b) static void blocklistLoad(tr_blocklistFile* b)
{ {
tr_sys_file_t fd;
uint64_t byteCount;
tr_sys_path_info info;
char* base;
tr_error* error = nullptr; tr_error* error = nullptr;
char const* err_fmt = _("Couldn't read \"%1$s\": %2$s"); char const* err_fmt = _("Couldn't read \"%1$s\": %2$s");
blocklistClose(b); blocklistClose(b);
auto info = tr_sys_path_info{};
if (!tr_sys_path_get_info(b->filename, 0, &info, nullptr)) if (!tr_sys_path_get_info(b->filename, 0, &info, nullptr))
{ {
return; return;
} }
byteCount = info.size; auto const byteCount = info.size;
if (byteCount == 0) if (byteCount == 0)
{ {
return; return;
} }
fd = tr_sys_file_open(b->filename, TR_SYS_FILE_READ, 0, &error); auto const fd = tr_sys_file_open(b->filename, TR_SYS_FILE_READ, 0, &error);
if (fd == TR_BAD_SYS_FILE) if (fd == TR_BAD_SYS_FILE)
{ {
tr_logAddError(err_fmt, b->filename, error->message); tr_logAddError(err_fmt, b->filename, error->message);
@ -86,7 +81,6 @@ static void blocklistLoad(tr_blocklistFile* b)
} }
b->rules = static_cast<struct tr_ipv4_range*>(tr_sys_file_map_for_reading(fd, 0, byteCount, &error)); b->rules = static_cast<struct tr_ipv4_range*>(tr_sys_file_map_for_reading(fd, 0, byteCount, &error));
if (b->rules == nullptr) if (b->rules == nullptr)
{ {
tr_logAddError(err_fmt, b->filename, error->message); tr_logAddError(err_fmt, b->filename, error->message);
@ -99,7 +93,7 @@ static void blocklistLoad(tr_blocklistFile* b)
b->byteCount = byteCount; b->byteCount = byteCount;
b->ruleCount = byteCount / sizeof(struct tr_ipv4_range); b->ruleCount = byteCount / sizeof(struct tr_ipv4_range);
base = tr_sys_path_basename(b->filename, nullptr); char* const base = tr_sys_path_basename(b->filename, nullptr);
tr_logAddInfo(_("Blocklist \"%s\" contains %zu entries"), base, b->ruleCount); tr_logAddInfo(_("Blocklist \"%s\" contains %zu entries"), base, b->ruleCount);
tr_free(base); tr_free(base);
} }
@ -142,9 +136,7 @@ static void blocklistDelete(tr_blocklistFile* b)
tr_blocklistFile* tr_blocklistFileNew(char const* filename, bool isEnabled) tr_blocklistFile* tr_blocklistFileNew(char const* filename, bool isEnabled)
{ {
tr_blocklistFile* b; auto* const b = tr_new0(tr_blocklistFile, 1);
b = tr_new0(tr_blocklistFile, 1);
b->fd = TR_BAD_SYS_FILE; b->fd = TR_BAD_SYS_FILE;
b->filename = tr_strdup(filename); b->filename = tr_strdup(filename);
b->isEnabled = isEnabled; b->isEnabled = isEnabled;
@ -192,8 +184,6 @@ bool tr_blocklistFileHasAddress(tr_blocklistFile* b, tr_address const* addr)
{ {
TR_ASSERT(tr_address_is_valid(addr)); TR_ASSERT(tr_address_is_valid(addr));
uint32_t needle;
if (!b->isEnabled || addr->type == TR_AF_INET6) if (!b->isEnabled || addr->type == TR_AF_INET6)
{ {
return false; return false;
@ -206,7 +196,7 @@ bool tr_blocklistFileHasAddress(tr_blocklistFile* b, tr_address const* addr)
return false; return false;
} }
needle = ntohl(addr->addr.addr4.s_addr); auto const needle = ntohl(addr->addr.addr4.s_addr);
auto const* range = static_cast<struct tr_ipv4_range const*>( auto const* range = static_cast<struct tr_ipv4_range const*>(
bsearch(&needle, b->rules, b->ruleCount, sizeof(struct tr_ipv4_range), compareAddressToRange)); bsearch(&needle, b->rules, b->ruleCount, sizeof(struct tr_ipv4_range), compareAddressToRange));
@ -271,7 +261,7 @@ static bool parseLine1(char const* line, struct tr_ipv4_range* range)
*/ */
static bool parseLine2(char const* line, struct tr_ipv4_range* range) static bool parseLine2(char const* line, struct tr_ipv4_range* range)
{ {
int unk; int unk = 0;
int a[4]; int a[4];
int b[4]; int b[4];
char str[32]; char str[32];
@ -315,8 +305,8 @@ static bool parseLine2(char const* line, struct tr_ipv4_range* range)
static bool parseLine3(char const* line, struct tr_ipv4_range* range) static bool parseLine3(char const* line, struct tr_ipv4_range* range)
{ {
unsigned int ip[4]; unsigned int ip[4];
unsigned int pflen; unsigned int pflen = 0;
uint32_t ip_u; uint32_t ip_u = 0;
uint32_t mask = 0xffffffff; uint32_t mask = 0xffffffff;
if (sscanf(line, "%u.%u.%u.%u/%u", TR_ARG_TUPLE(&ip[0], &ip[1], &ip[2], &ip[3]), &pflen) != 5) if (sscanf(line, "%u.%u.%u.%u/%u", TR_ARG_TUPLE(&ip[0], &ip[1], &ip[2], &ip[3]), &pflen) != 5)
@ -360,11 +350,10 @@ static int compareAddressRangesByFirstAddress(void const* va, void const* vb)
int tr_blocklistFileSetContent(tr_blocklistFile* b, char const* filename) int tr_blocklistFileSetContent(tr_blocklistFile* b, char const* filename)
{ {
tr_sys_file_t in;
tr_sys_file_t out;
int inCount = 0; int inCount = 0;
char line[2048]; char line[2048];
char const* err_fmt = _("Couldn't read \"%1$s\": %2$s"); char const* err_fmt = _("Couldn't read \"%1$s\": %2$s");
// TODO: should be a vector
struct tr_ipv4_range* ranges = nullptr; struct tr_ipv4_range* ranges = nullptr;
size_t ranges_alloc = 0; size_t ranges_alloc = 0;
size_t ranges_count = 0; size_t ranges_count = 0;
@ -376,8 +365,7 @@ int tr_blocklistFileSetContent(tr_blocklistFile* b, char const* filename)
return 0; return 0;
} }
in = tr_sys_file_open(filename, TR_SYS_FILE_READ, 0, &error); auto const in = tr_sys_file_open(filename, TR_SYS_FILE_READ, 0, &error);
if (in == TR_BAD_SYS_FILE) if (in == TR_BAD_SYS_FILE)
{ {
tr_logAddError(err_fmt, filename, error->message); tr_logAddError(err_fmt, filename, error->message);
@ -387,8 +375,7 @@ int tr_blocklistFileSetContent(tr_blocklistFile* b, char const* filename)
blocklistClose(b); blocklistClose(b);
out = tr_sys_file_open(b->filename, TR_SYS_FILE_WRITE | TR_SYS_FILE_CREATE | TR_SYS_FILE_TRUNCATE, 0666, &error); auto const out = tr_sys_file_open(b->filename, TR_SYS_FILE_WRITE | TR_SYS_FILE_CREATE | TR_SYS_FILE_TRUNCATE, 0666, &error);
if (out == TR_BAD_SYS_FILE) if (out == TR_BAD_SYS_FILE)
{ {
tr_logAddError(err_fmt, b->filename, error->message); tr_logAddError(err_fmt, b->filename, error->message);