From 2eb13cbf4fe3e2f0e03b2bc54aec11dbcbaa4367 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 11 Jun 2018 22:48:10 +0200 Subject: Fixed hidden bound variable (apiHandle) Change-Id: Id4c3e0eb9f770c78b38d8650e6a89577851984f9 Signed-off-by: Sebastien Douheret --- ctl-lib/ctl-config.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c index cfa0963..8ef9a85 100644 --- a/ctl-lib/ctl-config.c +++ b/ctl-lib/ctl-config.c @@ -104,25 +104,25 @@ char* CtlConfigSearch(AFB_ApiT apiHandle, const char *dirList, const char *prefi return NULL; } +static void DispatchRequireOneApi(AFB_ApiT apiHandle, json_object * bindindJ) { + const char* requireBinding = json_object_get_string(bindindJ); + int err = AFB_RequireApi(apiHandle, requireBinding, 1); + if (err) { + AFB_ApiWarning(apiHandle, "CTL-LOAD-CONFIG:REQUIRE Fail to get=%s", requireBinding); + } +} + int CtlConfigExec(AFB_ApiT apiHandle, CtlConfigT *ctlConfig) { // best effort to initialise everything before starting if (ctlConfig->requireJ) { - void DispatchRequireOneApi(json_object * bindindJ) { - const char* requireBinding = json_object_get_string(bindindJ); - int err = AFB_RequireApi(apiHandle, requireBinding, 1); - if (err) { - AFB_ApiWarning(apiHandle, "CTL-LOAD-CONFIG:REQUIRE Fail to get=%s", requireBinding); - } - } - if (json_object_get_type(ctlConfig->requireJ) == json_type_array) { for (int idx = 0; idx < json_object_array_length(ctlConfig->requireJ); idx++) { - DispatchRequireOneApi(json_object_array_get_idx(ctlConfig->requireJ, idx)); + DispatchRequireOneApi(apiHandle, json_object_array_get_idx(ctlConfig->requireJ, idx)); } } else { - DispatchRequireOneApi(ctlConfig->requireJ); + DispatchRequireOneApi(apiHandle, ctlConfig->requireJ); } } -- cgit 1.2.3-korg