szaszm commented on a change in pull request #1028:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1028#discussion_r596134706
##########
File path: libminifi/src/io/InputStream.cpp
##########
@@ -30,42 +30,43 @@ namespace nifi {
namespace minifi {
namespace io {
-int InputStream::read(std::vector<uint8_t>& buffer, int len) {
- if (buffer.size() < gsl::narrow<size_t>(len)) {
+size_t InputStream::read(std::vector<uint8_t>& buffer, size_t len) {
+ if (buffer.size() < len) {
buffer.resize(len);
}
- int ret = read(buffer.data(), len);
- buffer.resize((std::max)(ret, 0));
+ const auto ret = read(buffer.data(), len);
+ if (ret == static_cast<size_t>(-1)) return ret;
+ buffer.resize((std::max)(ret, size_t{0}));
return ret;
}
-int InputStream::read(bool &value) {
+size_t InputStream::read(bool &value) {
uint8_t buf = 0;
if (read(&buf, 1) != 1) {
- return -1;
+ return static_cast<size_t>(-1);
}
value = buf;
return 1;
}
-int InputStream::read(utils::Identifier &value) {
+size_t InputStream::read(utils::Identifier &value) {
std::string uuidStr;
- int ret = read(uuidStr);
+ const auto ret = read(uuidStr);
if (ret < 0) {
return ret;
}
auto optional_uuid = utils::Identifier::parse(uuidStr);
if (!optional_uuid) {
- return -1;
+ return static_cast<size_t>(-1);
}
value = optional_uuid.value();
return ret;
}
-int InputStream::read(std::string &str, bool widen) {
+size_t InputStream::read(std::string &str, bool widen) {
uint32_t len = 0;
- int ret = 0;
+ size_t ret = 0;
if (!widen) {
uint16_t shortLength = 0;
ret = read(shortLength);
Review comment:
fixed in 0c23d4e
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
