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>

1 files changed, 4 insertions, 6 deletions

diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c
index e6a16b9..6b8b9be 100644
--- a/ctl-lib/ctl-config.c
+++ b/ctl-lib/ctl-config.c
@@ -173,7 +173,7 @@ int CtlConfigExec(afb_api_t apiHandle, CtlConfigT *ctlConfig) {
     return 0;
 }
 
-CtlConfigT *CtlLoadMetaDataJson(afb_api_t apiHandle, json_object *ctlConfigJ, const char *prefix) {
+CtlConfigT *CtlLoadMetaDataJson(afb_api_t apiHandle, json_object *ctlConfigJ) {
     json_object *metadataJ;
     CtlConfigT *ctlHandle=NULL;
 
@@ -193,13 +193,12 @@ CtlConfigT *CtlLoadMetaDataJson(afb_api_t apiHandle, json_object *ctlConfigJ, co
             return NULL;
         }
         ctlHandle->configJ = ctlConfigJ;
-        ctlHandle->prefix = prefix;
     }
 
     return ctlHandle;
 }
 
-CtlConfigT *CtlLoadMetaDataUsingPrefix(afb_api_t apiHandle,const char* filepath, const char *prefix) {
+CtlConfigT *CtlLoadMetaData(afb_api_t apiHandle,const char* filepath) {
     json_object *ctlConfigJ;
 
 
@@ -212,7 +211,7 @@ CtlConfigT *CtlLoadMetaDataUsingPrefix(afb_api_t apiHandle,const char* filepath,
 
     AFB_API_INFO(apiHandle, "CTL-LOAD-CONFIG: loading config filepath=%s", filepath);
 
-    return CtlLoadMetaDataJson(apiHandle, ctlConfigJ, prefix);
+    return CtlLoadMetaDataJson(apiHandle, ctlConfigJ);
 }
 
 void wrap_json_array_add(void* array, json_object *val) {
@@ -317,7 +316,7 @@ int CtlLoadSections(afb_api_t apiHandle, CtlConfigT *ctlHandle, CtlSectionT *sec
     int error;
 
 #ifdef CONTROL_SUPPORT_LUA
-    if (LuaConfigLoad(apiHandle, ctlHandle->prefix))
+    if (LuaConfigLoad(apiHandle))
         return -1;
 #endif
 
@@ -325,7 +324,6 @@ int CtlLoadSections(afb_api_t apiHandle, CtlConfigT *ctlHandle, CtlSectionT *sec
     for (int idx = 0; sections[idx].key != NULL; idx++) {
         json_object * sectionJ;
         if (json_object_object_get_ex(ctlHandle->configJ, sections[idx].key, &sectionJ)) {
-            sections[idx].prefix = ctlHandle->prefix;
             json_object* updatedSectionJ = LoadAdditionalsFiles(apiHandle, ctlHandle, sections[idx].key, sectionJ);
 
             if (!sections[idx].loadCB) {