Skip to content

Commit 983890d

Browse files
committed
clang-tidy fixes
1 parent 4e554f2 commit 983890d

File tree

7 files changed

+22
-20
lines changed

7 files changed

+22
-20
lines changed

extensions/azure/storage/AzureDataLakeStorageClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ std::unique_ptr<io::InputStream> AzureDataLakeStorageClient::fetchFile(const Fet
8989
if (params.range_start || params.range_length) {
9090
Azure::Core::Http::HttpRange range;
9191
if (params.range_start) {
92-
range.Offset = *params.range_start;
92+
range.Offset = gsl::narrow<int64_t>(*params.range_start);
9393
}
9494

9595
if (params.range_length) {

extensions/libarchive/WriteArchiveStream.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ WriteArchiveStreamImpl::archive_ptr WriteArchiveStreamImpl::createWriteArchive()
3030
return nullptr;
3131
}
3232

33-
int result;
33+
int result = 0;
3434

3535
result = archive_write_set_format_ustar(arch.get());
3636
if (result != ARCHIVE_OK) {
@@ -94,7 +94,7 @@ bool WriteArchiveStreamImpl::newEntry(const EntryInfo& info) {
9494
return false;
9595
}
9696
archive_entry_set_pathname(arch_entry_.get(), info.filename.c_str());
97-
archive_entry_set_size(arch_entry_.get(), info.size);
97+
archive_entry_set_size(arch_entry_.get(), gsl::narrow<la_int64_t>(info.size));
9898
archive_entry_set_mode(arch_entry_.get(), S_IFREG | 0755);
9999

100100
int result = archive_write_header(arch_.get(), arch_entry_.get());

extensions/librdkafka/ConsumeKafka.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ std::string ConsumeKafka::resolve_duplicate_headers(const std::vector<std::strin
281281
std::vector<std::string> ConsumeKafka::get_matching_headers(const rd_kafka_message_t& message, const std::string& header_name) const {
282282
// Headers fetched this way are freed when rd_kafka_message_destroy is called
283283
// Detaching them using rd_kafka_message_detach_headers does not seem to work
284-
rd_kafka_headers_t* headers_raw;
284+
rd_kafka_headers_t* headers_raw = nullptr;
285285
const rd_kafka_resp_err_t get_header_response = rd_kafka_message_headers(&message, &headers_raw);
286286
if (RD_KAFKA_RESP_ERR__NOENT == get_header_response) {
287287
return {};
@@ -291,8 +291,8 @@ std::vector<std::string> ConsumeKafka::get_matching_headers(const rd_kafka_messa
291291
}
292292
std::vector<std::string> matching_headers;
293293
for (std::size_t header_idx = 0;; ++header_idx) {
294-
const char* value; // Not to be freed
295-
std::size_t size;
294+
const char* value = nullptr; // Not to be freed
295+
std::size_t size = 0;
296296
if (RD_KAFKA_RESP_ERR_NO_ERROR != rd_kafka_header_get(headers_raw, header_idx, header_name.c_str(), (const void**)(&value), &size)) {
297297
break;
298298
}

libminifi/src/utils/BaseHTTPClient.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ std::optional<std::string> parseProtocol(const std::string& url_input) {
4141

4242
std::optional<int> parsePortNumber(const std::string& port_string) {
4343
try {
44-
size_t pos;
44+
size_t pos = 0;
4545
int port = std::stoi(port_string, &pos);
4646
if (pos == port_string.size()) {
4747
return port;
@@ -94,7 +94,7 @@ URL::URL(const std::string& url_input) {
9494
std::string::const_iterator current_pos = url_input.begin();
9595
std::advance(current_pos, protocol_.size());
9696

97-
constexpr const char HOST_TERMINATORS[] = ":/?#";
97+
static constexpr std::string_view HOST_TERMINATORS = ":/?#";
9898
std::string::const_iterator end_of_host = std::find_first_of(current_pos, url_input.end(), std::begin(HOST_TERMINATORS), std::end(HOST_TERMINATORS));
9999
host_ = std::string{current_pos, end_of_host};
100100
if (host_.empty()) {
@@ -104,7 +104,7 @@ URL::URL(const std::string& url_input) {
104104
current_pos = end_of_host;
105105

106106
if (current_pos != url_input.end() && *current_pos == ':') {
107-
constexpr const char PORT_TERMINATORS[] = "/?#";
107+
static constexpr std::string_view PORT_TERMINATORS = "/?#";
108108
++current_pos;
109109
std::string::const_iterator end_of_port = std::find_first_of(current_pos, url_input.end(), std::begin(PORT_TERMINATORS), std::end(PORT_TERMINATORS));
110110
const auto port_number = parsePortNumber(std::string{current_pos, end_of_port});

libminifi/src/utils/Cron.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ weekday parse<weekday>(const std::string& weekday_str) {
142142
if (!stream.fail() && parsed_weekday.ok() && stream.peek() == EOF)
143143
return parsed_weekday;
144144
} else {
145-
unsigned weekday_num;
145+
unsigned weekday_num = 0;
146146
stream >> weekday_num;
147147
if (!stream.fail() && weekday_num < 7 && stream.peek() == EOF)
148148
return weekday(weekday_num-1);

libminifi/src/utils/crypto/ciphers/Aes256Ecb.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void Aes256EcbCipher::encrypt(std::span<unsigned char, BLOCK_SIZE> data) const {
6767
}
6868

6969
int ciphertext_len = 0;
70-
int len;
70+
int len = 0;
7171

7272
if (1 != EVP_EncryptUpdate(ctx.get(), data.data(), &len, data.data(), gsl::narrow<int>(data.size()))) {
7373
handleOpenSSLError("Could not update cipher content");
@@ -99,7 +99,7 @@ void Aes256EcbCipher::decrypt(std::span<unsigned char, BLOCK_SIZE> data) const {
9999
}
100100

101101
int plaintext_len = 0;
102-
int len;
102+
int len = 0;
103103

104104
if (1 != EVP_DecryptUpdate(ctx.get(), data.data(), &len, data.data(), gsl::narrow<int>(data.size()))) {
105105
handleOpenSSLError("Could not update cipher content");

libminifi/test/unit/StringUtilsTests.cpp

+10-8
Original file line numberDiff line numberDiff line change
@@ -453,18 +453,20 @@ TEST_CASE("test string::testBase64EncodeDecode", "[test base64 encode decode]")
453453

454454
TEST_CASE("test string::testJoinPack", "[test join_pack]") {
455455
std::string stdstr = "std::string";
456+
std::string_view strview = "std::string_view";
456457
const char* cstr = "c string";
457-
const char carr[] = "char array";
458-
REQUIRE(string::join_pack("rvalue c string, ", cstr, std::string{", rval std::string, "}, stdstr, ", ", carr)
459-
== "rvalue c string, c string, rval std::string, std::string, char array");
458+
const char carr[] = "char array"; // NOLINT(cppcoreguidelines-avoid-c-arrays): testing const char[] on purpose
459+
REQUIRE(string::join_pack("rvalue c string, ", cstr, std::string{", rval std::string, "}, stdstr, ", ", strview, ", ", carr)
460+
== "rvalue c string, c string, rval std::string, std::string, std::stringview, char array");
460461
}
461462

462463
TEST_CASE("test string::testJoinPackWstring", "[test join_pack wstring]") {
463464
std::wstring stdstr = L"std::string";
465+
std::wstring_view strview = L"std::stringview";
464466
const wchar_t* cstr = L"c string";
465-
const wchar_t carr[] = L"char array";
466-
REQUIRE(string::join_pack(L"rvalue c string, ", cstr, std::wstring{L", rval std::string, "}, stdstr, L", ", carr)
467-
== L"rvalue c string, c string, rval std::string, std::string, char array");
467+
const wchar_t carr[] = L"char array"; // NOLINT(cppcoreguidelines-avoid-c-arrays): testing const wchar_t[] on purpose
468+
REQUIRE(string::join_pack(L"rvalue c string, ", cstr, std::wstring{L", rval std::string, "}, stdstr, L", ", strview, L", ", carr)
469+
== L"rvalue c string, c string, rval std::string, std::string, std::stringview, char array");
468470
}
469471

470472
/* doesn't and shouldn't compile
@@ -529,7 +531,7 @@ TEST_CASE("string::removeFramingCharacters works correctly", "[removeFramingChar
529531

530532
// ignore terminating \0 character
531533
template<size_t N>
532-
std::span<const std::byte> from_cstring(const char (& str)[N]) {
534+
std::span<const std::byte> from_cstring(const char (& str)[N]) { // NOLINT(cppcoreguidelines-avoid-c-arrays)
533535
return as_bytes(std::span<const char>(str, N - 1));
534536
}
535537

@@ -558,7 +560,7 @@ TEST_CASE("string::toLower and toUpper tests") {
558560
}
559561

560562
TEST_CASE("string::splitToValueAndUnit tests") {
561-
int64_t value;
563+
int64_t value = 0;
562564
std::string unit_str;
563565
SECTION("Simple case") {
564566
CHECK(string::splitToValueAndUnit("1 horse", value, unit_str));

0 commit comments

Comments
 (0)