diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-12-03 19:15:51 +0100 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-12-04 15:09:24 +0100 |
| commit | 1bef31c8bbad27f4914484c5007b2e199fb073d4 (patch) | |
| tree | 16c8998139ad5a1988bfc934d8443121c2f509f8 /ctl-lib/ctl-config.h | |
| parent | 2a588b74822cf093198bdbc01fb0f2d57a3f3fec (diff) | |
Remove use of prefixneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.2jellyfish/9.99.1icefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.29.99.49.99.39.99.29.99.18.99.58.99.48.99.38.99.213.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0
As it is not used anymore (was only used to search for an environment
variable containing plugin search paths list), remove use of
prefix in libappcontroller.
BUG-AGL: SPEC3011
Change-Id: I7885462d56761ad39771360e1b6b1c2b10bbe8c9
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to 'ctl-lib/ctl-config.h')
| -rw-r--r-- | ctl-lib/ctl-config.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ctl-lib/ctl-config.h b/ctl-lib/ctl-config.h index 53a75f4..928c30f 100644 --- a/ctl-lib/ctl-config.h +++ b/ctl-lib/ctl-config.h @@ -59,7 +59,6 @@ typedef struct ConfigSectionS { const char *key; const char *uid; const char *info; - const char *prefix; int (*loadCB)(afb_api_t apihandle, struct ConfigSectionS *section, json_object *sectionJ); void *handle; CtlActionT *actions; @@ -72,7 +71,6 @@ typedef struct { const char *version; const char *author; const char *date; - const char *prefix; json_object *configJ; json_object *requireJ; CtlSectionT *sections; @@ -108,11 +106,11 @@ extern char* ConfigSearch(afb_api_t apiHandle, json_object *responseJ); extern char* CtlConfigSearch(afb_api_t apiHandle, const char *dirList, const char *prefix) ; extern void DispatchRequireApi(afb_api_t apiHandle, json_object * requireJ); extern int CtlConfigExec(afb_api_t apiHandle, CtlConfigT *ctlConfig) ; -extern CtlConfigT *CtlLoadMetaDataJson(afb_api_t apiHandle,json_object *ctlConfigJ, const char *prefix) ; -extern CtlConfigT *CtlLoadMetaDataUsingPrefix(afb_api_t apiHandle,const char* filepath, const char *prefix) ; +extern CtlConfigT *CtlLoadMetaDataJson(afb_api_t apiHandle,json_object *ctlConfigJ); +extern CtlConfigT *CtlLoadMetaData(afb_api_t apiHandle,const char* filepath); extern int CtlLoadSections(afb_api_t apiHandle, CtlConfigT *ctlHandle, CtlSectionT *sections); extern char *GetDefaultConfigSearchPath(afb_api_t apiHandle); -#define CtlLoadMetaData(api, filepath) CtlLoadMetaDataUsingPrefix(api, filepath, NULL) +#define CtlLoadMetaDataUsingPrefix(apiHandle, filepath, prefix) CtlLoadMetaData(apiHandle, filepath) // ctl-event.c extern int EventConfig(afb_api_t apihandle, CtlSectionT *section, json_object *actionsJ); |