You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2026/02/13 11:19:14 UTC
(nifi-minifi-cpp) 01/01: change controller api slightly
This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch apache-rusty
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 36b824e5f409d6137706187ed782f195aae79f19
Author: Martin Zink <ma...@apache.org>
AuthorDate: Fri Feb 13 12:11:31 2026 +0100
change controller api slightly
---
libminifi/src/minifi-c.cpp | 12 +++++-------
minifi-api/include/minifi-c/minifi-c.h | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/libminifi/src/minifi-c.cpp b/libminifi/src/minifi-c.cpp
index 783d6f727..55808d9dd 100644
--- a/libminifi/src/minifi-c.cpp
+++ b/libminifi/src/minifi-c.cpp
@@ -546,7 +546,7 @@ MinifiStatus MinifiControllerServiceContextGetProperty(MinifiControllerServiceCo
MinifiStatus MinifiProcessContextGetControllerService(
MinifiProcessContext* process_context,
const MinifiStringView controller_service_name,
- void(*cb)(
+ MinifiStatus(*cb)(
void* user_ctx,
void* service,
MinifiStringView type,
@@ -559,19 +559,17 @@ MinifiStatus MinifiProcessContextGetControllerService(
const auto name_str = std::string{toStringView(controller_service_name)};
const auto service_shared_ptr = context->getControllerService(name_str, context->getProcessorInfo().getUUID());
if (!service_shared_ptr) {
- return MINIFI_STATUS_UNKNOWN_ERROR;
+ return MINIFI_STATUS_VALIDATION_FAILED;
}
- const minifi::utils::CControllerService* c_controller_service = dynamic_cast<minifi::utils::CControllerService*>(&*service_shared_ptr);
- if (c_controller_service) {
+ if (const minifi::utils::CControllerService* c_controller_service = dynamic_cast<minifi::utils::CControllerService*>(&*service_shared_ptr)) {
const auto class_description = c_controller_service->getClassDescription();
- cb(user_ctx,
+ return cb(user_ctx,
c_controller_service->getImpl(),
minifiStringView(class_description.name),
minifiStringView(class_description.group_name),
minifiStringView(class_description.version));
- return MINIFI_STATUS_SUCCESS;
}
- return MINIFI_STATUS_UNKNOWN_ERROR; // TODO(mzink) better error handling
+ return MINIFI_STATUS_VALIDATION_FAILED;
}
diff --git a/minifi-api/include/minifi-c/minifi-c.h b/minifi-api/include/minifi-c/minifi-c.h
index 811bd73ec..b8fa46600 100644
--- a/minifi-api/include/minifi-c/minifi-c.h
+++ b/minifi-api/include/minifi-c/minifi-c.h
@@ -229,7 +229,7 @@ void MinifiProcessContextGetProcessorName(MinifiProcessContext* context, void(*c
MinifiBool MinifiProcessContextHasNonEmptyProperty(MinifiProcessContext* context, MinifiStringView property_name);
MinifiStatus MinifiProcessContextGetControllerService(MinifiProcessContext*, MinifiStringView controller_service_name,
- void(*cb)(void* user_ctx, void* service, MinifiStringView type, MinifiStringView group, MinifiStringView version), void* user_ctx);
+ MinifiStatus(*cb)(void* user_ctx, void* service, MinifiStringView type, MinifiStringView group, MinifiStringView version), void* user_ctx);
void MinifiLoggerSetMaxLogSize(MinifiLogger*, int32_t);
void MinifiLoggerLogString(MinifiLogger*, MinifiLogLevel, MinifiStringView);