You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2021/05/26 12:46:18 UTC
[nifi-minifi-cpp] 10/17: various review feedback-related changes
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch MINIFICPP-1507
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 722180e71533b4f3aa15c00c51c81c1bc330b1b9
Author: Marton Szasz <sz...@gmail.com>
AuthorDate: Wed Mar 17 16:28:12 2021 +0100
various review feedback-related changes
---
extensions/standard-processors/processors/ExtractText.cpp | 2 +-
libminifi/src/c2/ControllerSocketProtocol.cpp | 6 +++---
libminifi/src/io/tls/SecureDescriptorStream.cpp | 3 ++-
libminifi/src/sitetosite/SiteToSiteClient.cpp | 2 +-
libminifi/test/rocksdb-tests/DBContentRepositoryTests.cpp | 8 ++++----
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/extensions/standard-processors/processors/ExtractText.cpp b/extensions/standard-processors/processors/ExtractText.cpp
index 9774cf8..0e2a458 100644
--- a/extensions/standard-processors/processors/ExtractText.cpp
+++ b/extensions/standard-processors/processors/ExtractText.cpp
@@ -125,7 +125,7 @@ int64_t ExtractText::ReadCallback::process(const std::shared_ptr<io::BaseStream>
if (sizeLimitStr.empty())
size_limit = DEFAULT_SIZE_LIMIT;
else if (sizeLimitStr != "0")
- size_limit = gsl::narrow_cast<size_t>(std::stoi(sizeLimitStr));
+ size_limit = static_cast<size_t>(std::stoi(sizeLimitStr));
std::ostringstream contentStream;
diff --git a/libminifi/src/c2/ControllerSocketProtocol.cpp b/libminifi/src/c2/ControllerSocketProtocol.cpp
index d441182..03e8306 100644
--- a/libminifi/src/c2/ControllerSocketProtocol.cpp
+++ b/libminifi/src/c2/ControllerSocketProtocol.cpp
@@ -252,11 +252,11 @@ void ControllerSocketProtocol::initialize(core::controller::ControllerServicePro
void ControllerSocketProtocol::parse_content(const std::vector<C2ContentResponse> &content) {
for (const auto &payload_content : content) {
if (payload_content.name == "Components") {
- for (const auto& content_ : payload_content.operation_arguments) {
+ for (const auto& operation_argument : payload_content.operation_arguments) {
bool is_enabled = false;
- minifi::utils::StringUtils::StringToBool(content_.second.to_string(), is_enabled);
+ minifi::utils::StringUtils::StringToBool(operation_argument.second.to_string(), is_enabled);
std::lock_guard<std::mutex> lock(controller_mutex_);
- component_map_[content_.first] = is_enabled;
+ component_map_[operation_argument.first] = is_enabled;
}
}
}
diff --git a/libminifi/src/io/tls/SecureDescriptorStream.cpp b/libminifi/src/io/tls/SecureDescriptorStream.cpp
index 66d23b5..5acf950 100644
--- a/libminifi/src/io/tls/SecureDescriptorStream.cpp
+++ b/libminifi/src/io/tls/SecureDescriptorStream.cpp
@@ -82,7 +82,8 @@ size_t SecureDescriptorStream::read(uint8_t * const buf, const size_t buflen) {
int status;
int sslStatus;
do {
- status = SSL_read(ssl_, writepos, gsl::narrow<int>(std::min(buflen - total_read, gsl::narrow<size_t>(std::numeric_limits<int>::max()))));
+ const auto ssl_read_size = gsl::narrow<int>(std::min(buflen - total_read, gsl::narrow<size_t>(std::numeric_limits<int>::max())));
+ status = SSL_read(ssl_, writepos, ssl_read_size);
sslStatus = SSL_get_error(ssl_, status);
} while (status < 0 && sslStatus == SSL_ERROR_WANT_READ);
diff --git a/libminifi/src/sitetosite/SiteToSiteClient.cpp b/libminifi/src/sitetosite/SiteToSiteClient.cpp
index c7cd919..60cef54 100644
--- a/libminifi/src/sitetosite/SiteToSiteClient.cpp
+++ b/libminifi/src/sitetosite/SiteToSiteClient.cpp
@@ -58,7 +58,7 @@ int SiteToSiteClient::readResponse(const std::shared_ptr<Transaction>& /*transac
}
if (resCode->hasDescription) {
const auto ret = peer_->read(message);
- if (ret == 0 || !io::isError(ret))
+ if (ret == 0 || io::isError(ret))
return -1;
}
return gsl::narrow<int>(3 + message.size());
diff --git a/libminifi/test/rocksdb-tests/DBContentRepositoryTests.cpp b/libminifi/test/rocksdb-tests/DBContentRepositoryTests.cpp
index 4d5e5a3..38b7690 100644
--- a/libminifi/test/rocksdb-tests/DBContentRepositoryTests.cpp
+++ b/libminifi/test/rocksdb-tests/DBContentRepositoryTests.cpp
@@ -103,7 +103,7 @@ TEST_CASE("Delete Claim", "[TestDBCR2]") {
std::string readstr;
- // error tell us we have an invalid stream
+ // error tells us we have an invalid stream
REQUIRE(minifi::io::isError(read_stream->read(readstr)));
}
@@ -139,7 +139,7 @@ TEST_CASE("Test Empty Claim", "[TestDBCR3]") {
std::string readstr;
- // -1 tell us we have an invalid stream
+ // error tells us we have an invalid stream
REQUIRE(minifi::io::isError(read_stream->read(readstr)));
}
@@ -179,7 +179,7 @@ TEST_CASE("Delete NonExistent Claim", "[TestDBCR4]") {
std::string readstr;
- // -1 tell us we have an invalid stream
+ // error tells us we have an invalid stream
read_stream->read(readstr);
REQUIRE(readstr == "well hello there");
@@ -227,7 +227,7 @@ TEST_CASE("Delete Remove Count Claim", "[TestDBCR5]") {
std::string readstr;
- // -1 tell us we have an invalid stream
+ // error tells us we have an invalid stream
read_stream->read(readstr);
REQUIRE(readstr == "well hello there");