Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 726a1c6da -> d616effd3
MINIFICPP-350: fix PutFile and Expression compilation warnings This closes #221. Signed-off-by: Marc Parisi <phroc...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/d616effd Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/d616effd Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/d616effd Branch: refs/heads/master Commit: d616effd352fd7f0f34c4cc52fbfa3180a73f3ac Parents: 726a1c6 Author: Dustin Rodrigues <dust....@gmail.com> Authored: Fri Dec 15 21:41:34 2017 -0500 Committer: Marc Parisi <phroc...@apache.org> Committed: Mon Dec 18 09:36:37 2017 -0500 ---------------------------------------------------------------------- extensions/expression-language/Expression.cpp | 2 +- libminifi/include/processors/PutFile.h | 4 +--- libminifi/src/processors/PutFile.cpp | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d616effd/extensions/expression-language/Expression.cpp ---------------------------------------------------------------------- diff --git a/extensions/expression-language/Expression.cpp b/extensions/expression-language/Expression.cpp index 9151948..8c03422 100644 --- a/extensions/expression-language/Expression.cpp +++ b/extensions/expression-language/Expression.cpp @@ -142,7 +142,7 @@ Expression Expression::operator+(const Expression &other_expr) const { result.append(other_val_fn(params)); return result; }); - } else if (!isDynamic() && !other_expr.isDynamic()) { + } else { // !isDynamic() && !other_expr.isDynamic() std::string result(val_); result.append(other_expr.val_); return make_static(result); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d616effd/libminifi/include/processors/PutFile.h ---------------------------------------------------------------------- diff --git a/libminifi/include/processors/PutFile.h b/libminifi/include/processors/PutFile.h index c2f4d88..c84ee87 100644 --- a/libminifi/include/processors/PutFile.h +++ b/libminifi/include/processors/PutFile.h @@ -81,8 +81,7 @@ class PutFile : public core::Processor { class ReadCallback : public InputStreamCallback { public: ReadCallback(const std::string &tmp_file, - const std::string &dest_file, - bool try_mkdirs); + const std::string &dest_file); ~ReadCallback(); virtual int64_t process(std::shared_ptr<io::BaseStream> stream); bool commit(); @@ -93,7 +92,6 @@ class PutFile : public core::Processor { std::string tmp_file_; std::string dest_file_; std::string dest_dir_; - bool try_mkdirs_; }; /** http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/d616effd/libminifi/src/processors/PutFile.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/processors/PutFile.cpp b/libminifi/src/processors/PutFile.cpp index b0e4f15..9ffbbd7 100644 --- a/libminifi/src/processors/PutFile.cpp +++ b/libminifi/src/processors/PutFile.cpp @@ -238,7 +238,7 @@ bool PutFile::putFile(core::ProcessSession *session, } } - ReadCallback cb(tmpFile, destFile, try_mkdirs_); + ReadCallback cb(tmpFile, destFile); session->read(flowFile, &cb); logger_->log_info("Committing %s", destFile); @@ -252,11 +252,9 @@ bool PutFile::putFile(core::ProcessSession *session, } PutFile::ReadCallback::ReadCallback(const std::string &tmp_file, - const std::string &dest_file, - bool try_mkdirs) + const std::string &dest_file) : tmp_file_(tmp_file), dest_file_(dest_file), - try_mkdirs_(try_mkdirs), logger_(logging::LoggerFactory<PutFile::ReadCallback>::getLogger()) { }
