Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 2821d71d6 -> 625f1377a
MINIFCPP-509: resolve typo in port This closes #339. Approved by @achristianson Signed-off-by: Marc Parisi <[email protected]> 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/625f1377 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/625f1377 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/625f1377 Branch: refs/heads/master Commit: 625f1377aae488b9004d504ad22d5d3639ae30ae Parents: 2821d71 Author: Marc Parisi <[email protected]> Authored: Thu May 24 15:19:50 2018 -0400 Committer: Marc Parisi <[email protected]> Committed: Thu May 24 15:39:40 2018 -0400 ---------------------------------------------------------------------- LibExample/generate_flow.c | 2 +- LibExample/monitor_directory.c | 2 +- LibExample/transmit_flow.c | 2 +- libminifi/src/capi/api.cpp | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/625f1377/LibExample/generate_flow.c ---------------------------------------------------------------------- diff --git a/LibExample/generate_flow.c b/LibExample/generate_flow.c index 23ba979..62a8a8c 100644 --- a/LibExample/generate_flow.c +++ b/LibExample/generate_flow.c @@ -40,7 +40,7 @@ int main(int argc, char **argv) { nifi_port port; - port.pord_id = portStr; + port.port_id = portStr; nifi_instance *instance = create_instance(instance_str, &port); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/625f1377/LibExample/monitor_directory.c ---------------------------------------------------------------------- diff --git a/LibExample/monitor_directory.c b/LibExample/monitor_directory.c index 465106d..694fd4b 100644 --- a/LibExample/monitor_directory.c +++ b/LibExample/monitor_directory.c @@ -72,7 +72,7 @@ int main(int argc, char **argv) { nifi_port port; - port.pord_id = portStr; + port.port_id = portStr; C2_Server server; server.url = argv[4]; http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/625f1377/LibExample/transmit_flow.c ---------------------------------------------------------------------- diff --git a/LibExample/transmit_flow.c b/LibExample/transmit_flow.c index 7fdb3d8..7c6f6e7 100644 --- a/LibExample/transmit_flow.c +++ b/LibExample/transmit_flow.c @@ -80,7 +80,7 @@ int main(int argc, char **argv) { nifi_port port; - port.pord_id = portStr; + port.port_id = portStr; nifi_instance *instance = create_instance(instance_str, &port); http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/625f1377/libminifi/src/capi/api.cpp ---------------------------------------------------------------------- diff --git a/libminifi/src/capi/api.cpp b/libminifi/src/capi/api.cpp index cb0d726..17f7246 100644 --- a/libminifi/src/capi/api.cpp +++ b/libminifi/src/capi/api.cpp @@ -65,8 +65,8 @@ nifi_instance *create_instance(char *url, nifi_port *port) { nifi_instance *instance = new nifi_instance; - instance->instance_ptr = new minifi::Instance(url, port->pord_id); - instance->port.pord_id = port->pord_id; + instance->instance_ptr = new minifi::Instance(url, port->port_id); + instance->port.port_id = port->port_id; return instance; } @@ -76,7 +76,7 @@ nifi_instance *create_instance(char *url, nifi_port *port) { */ void initialize_instance(nifi_instance *instance) { auto minifi_instance_ref = static_cast<minifi::Instance*>(instance->instance_ptr); - minifi_instance_ref->setRemotePort(instance->port.pord_id); + minifi_instance_ref->setRemotePort(instance->port.port_id); } /* typedef int c2_update_callback(char *); @@ -220,7 +220,7 @@ void transmit_flowfile(flow_file_record *ff, nifi_instance *instance) { auto minifi_instance_ref = static_cast<minifi::Instance*>(instance->instance_ptr); // in the unlikely event the user forgot to initialize the instance, we shall do it for them. if (UNLIKELY(minifi_instance_ref->isRPGConfigured() == false)) { - minifi_instance_ref->setRemotePort(instance->port.pord_id); + minifi_instance_ref->setRemotePort(instance->port.port_id); } auto attribute_map = static_cast<std::map<std::string, std::string>*>(ff->attributes); @@ -237,7 +237,7 @@ void transmit_flowfile(flow_file_record *ff, nifi_instance *instance) { ffr->addAttribute("nanofi.version", API_VERSION); ffr->setSize(ff->size); - std::string port_uuid = instance->port.pord_id; + std::string port_uuid = instance->port.port_id; minifi_instance_ref->transfer(ffr); }
