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 54a48a9d5ead789a5685962684c7c8a3a4039f4b Author: Marton Szasz <[email protected]> AuthorDate: Thu Mar 18 17:41:22 2021 +0100 fix warnings that caused CI failures --- extensions/coap/protocols/CoapC2Protocol.h | 2 +- extensions/libarchive/CompressContent.h | 16 ++++++---------- extensions/standard-processors/processors/GetTCP.cpp | 4 ++-- libminifi/include/sitetosite/SiteToSiteClient.h | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/extensions/coap/protocols/CoapC2Protocol.h b/extensions/coap/protocols/CoapC2Protocol.h index 46aee45..dfee5a7 100644 --- a/extensions/coap/protocols/CoapC2Protocol.h +++ b/extensions/coap/protocols/CoapC2Protocol.h @@ -49,7 +49,7 @@ namespace coap { namespace c2 { #define REQUIRE_VALID(x) \ - if (-1 == x){ \ + if (io::isError(x)){ \ return minifi::c2::C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR); \ } diff --git a/extensions/libarchive/CompressContent.h b/extensions/libarchive/CompressContent.h index f5e44fa..8f456d8 100644 --- a/extensions/libarchive/CompressContent.h +++ b/extensions/libarchive/CompressContent.h @@ -189,16 +189,11 @@ public: return ret; } - static la_ssize_t archive_read(struct archive *arch, void *context, const void **buff) { - WriteCallback *callback = (WriteCallback *) context; + static la_ssize_t archive_read(struct archive*, void *context, const void **buff) { + auto *callback = (WriteCallback *) context; callback->session_->read(callback->flow_, &callback->readDecompressCb_); - if (callback->readDecompressCb_.read_size_ >= 0) { - *buff = callback->readDecompressCb_.buffer_; - return gsl::narrow<la_ssize_t>(callback->readDecompressCb_.read_size_); - } else { - archive_set_error(arch, EIO, "Error reading flowfile"); - return -1; - } + *buff = callback->readDecompressCb_.buffer_; + return gsl::narrow<la_ssize_t>(callback->readDecompressCb_.read_size_); } static la_int64_t archive_skip(struct archive* /*a*/, void* /*client_data*/, la_int64_t /*request*/) { @@ -388,7 +383,8 @@ public: } else if (ret == 0) { break; } else { - if (outputStream_->write(buffer.data(), ret) != ret) { + const auto writeret = outputStream_->write(buffer.data(), ret); + if (!io::isError(writeret) && gsl::narrow<size_t>(writeret) != ret) { return -1; } read_size += ret; diff --git a/extensions/standard-processors/processors/GetTCP.cpp b/extensions/standard-processors/processors/GetTCP.cpp index cbbe535..e215f898 100644 --- a/extensions/standard-processors/processors/GetTCP.cpp +++ b/extensions/standard-processors/processors/GetTCP.cpp @@ -168,8 +168,8 @@ void GetTCP::onSchedule(const std::shared_ptr<core::ProcessContext> &context, co if ( socket_ring_buffer_.try_dequeue(socket_ptr) ) { buffer.resize(receive_buffer_size_); const auto size_read = socket_ptr->read(buffer.data(), receive_buffer_size_, false); - if (size_read >= 0 && !io::isError(size_read)) { - if (size_read > 0 && !io::isError(size_read)) { + if (!io::isError(size_read)) { + if (size_read != 0) { // determine cut location size_t startLoc = 0; for (size_t i = 0; i < size_read; i++) { diff --git a/libminifi/include/sitetosite/SiteToSiteClient.h b/libminifi/include/sitetosite/SiteToSiteClient.h index b372ca3..d142bfa 100644 --- a/libminifi/include/sitetosite/SiteToSiteClient.h +++ b/libminifi/include/sitetosite/SiteToSiteClient.h @@ -308,7 +308,7 @@ class ReadCallback : public InputStreamCallback { if (readSize == 0) break; if (io::isError(readSize)) return -1; const auto ret = _packet->transaction_->getStream().write(buffer, readSize); - if (ret != readSize) { + if (ret < 0 || gsl::narrow<size_t>(ret) != readSize) { logging::LOG_INFO(_packet->logger_reference_) << "Site2Site Send Flow Size " << readSize << " Failed " << ret; return -1; }
