diff options
Diffstat (limited to 'ctl-lib/ctl-config.h')
| -rw-r--r-- | ctl-lib/ctl-config.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/ctl-lib/ctl-config.h b/ctl-lib/ctl-config.h index b2f1e2f..3497d5a 100644 --- a/ctl-lib/ctl-config.h +++ b/ctl-lib/ctl-config.h @@ -90,38 +90,41 @@ typedef enum { } SectionEnumT; // ctl-action.c -extern CtlActionT *ActionConfig(AFB_ApiT apiHandle, json_object *actionsJ, int exportApi); +extern CtlActionT *ActionConfig_V3(AFB_ApiT apiHandle, json_object *actionsJ, int exportApi); extern void ActionExecUID(AFB_ReqT request, CtlConfigT *ctlConfig, const char *uid, json_object *queryJ); extern int ActionExecOne( CtlSourceT *source, CtlActionT* action, json_object *queryJ); -extern int ActionLoadOne(AFB_ApiT apiHandle, CtlActionT *action, json_object *, int exportApi); +extern int ActionLoadOne_V3(AFB_ApiT apiHandle, CtlActionT *action, json_object *, int exportApi); extern int ActionLabelToIndex(CtlActionT* actions, const char* actionLabel); // ctl-config.c extern int CtlConfigMagicNew(); extern json_object* CtlConfigScan(const char *dirList, const char *prefix) ; -extern char* ConfigSearch(AFB_ApiT apiHandle, json_object *responseJ); -extern char* CtlConfigSearch(AFB_ApiT apiHandle, const char *dirList, const char *prefix) ; -extern void DispatchRequireApi(AFB_ApiT apiHandle, json_object * requireJ); -extern int CtlConfigExec(AFB_ApiT apiHandle, CtlConfigT *ctlConfig) ; -extern CtlConfigT *CtlLoadMetaDataJson(AFB_ApiT apiHandle,json_object *ctlConfigJ, const char *prefix) ; -extern CtlConfigT *CtlLoadMetaDataUsingPrefix(AFB_ApiT apiHandle,const char* filepath, const char *prefix) ; -extern int CtlLoadSections(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, CtlSectionT *sections); +extern char* ConfigSearch_V3(AFB_ApiT apiHandle, json_object *responseJ); +extern char* CtlConfigSearch_V3(AFB_ApiT apiHandle, const char *dirList, const char *prefix) ; +extern void DispatchRequireApi_V3(AFB_ApiT apiHandle, json_object * requireJ); +extern int CtlConfigExec_V3(AFB_ApiT apiHandle, CtlConfigT *ctlConfig) ; +extern CtlConfigT *CtlLoadMetaDataJson_V3(AFB_ApiT apiHandle,json_object *ctlConfigJ, const char *prefix) ; +extern CtlConfigT *CtlLoadMetaDataUsingPrefix_V3(AFB_ApiT apiHandle,const char* filepath, const char *prefix) ; +extern int CtlLoadSections_V3(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, CtlSectionT *sections); #define CtlLoadMetaData(api, filepath) CtlLoadMetaDataUsingPrefix(api, filepath, NULL) // ctl-event.c -extern int EventConfig(AFB_ApiT apihandle, CtlSectionT *section, json_object *actionsJ); -extern void CtrlDispatchApiEvent (AFB_ApiT apiHandle, const char *evtLabel, struct json_object *eventJ); +extern int EventConfig_V3(AFB_ApiT apihandle, CtlSectionT *section, json_object *actionsJ); +extern void CtrlDispatchApiEvent(AFB_ApiT apiHandle, const char *evtLabel, struct json_object *eventJ); extern void CtrlDispatchV2Event(const char *evtLabel, json_object *eventJ); // ctl-control.c -extern int ControlConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ); +extern int ControlConfig_V3(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ); // ctl-onload.c -extern int OnloadConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ); +extern int OnloadConfig_V3(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ); // ctl-plugin.c -extern int PluginConfig(AFB_ApiT UNUSED_ARG(apiHandle), CtlSectionT *section, json_object *pluginsJ); -extern int PluginGetCB (AFB_ApiT apiHandle, CtlActionT *action , json_object *callbackJ); +extern int PluginConfig_V3(AFB_ApiT apiHandle, CtlSectionT *section, json_object *pluginsJ); +extern int PluginGetCB_V3(AFB_ApiT apiHandle, CtlActionT *action , json_object *callbackJ); + +#include "ctl-config_v2.h" +#include "ctl-config_v3.h" #ifdef __cplusplus } |