diff options
Diffstat (limited to 'src/4a-hal-manager/4a-hal-manager.c')
| -rw-r--r-- | src/4a-hal-manager/4a-hal-manager.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/4a-hal-manager/4a-hal-manager.c b/src/4a-hal-manager/4a-hal-manager.c index 4d2fbf1..20103cb 100644 --- a/src/4a-hal-manager/4a-hal-manager.c +++ b/src/4a-hal-manager/4a-hal-manager.c @@ -54,7 +54,7 @@ afb_verb_t HalManagerApiStaticVerbs[] = }; /******************************************************************************* - * HAL Manager get 'HalData' linked list * + * HAL Manager get 'HalData' linked list * from HAL list function * ******************************************************************************/ @@ -87,7 +87,6 @@ static int HalMgrInitApi(afb_api_t apiHandle) return -3; currentHalData = halMgrData->halDataList; - while(currentHalData) { if(! currentHalData->apiName) return -4; @@ -115,7 +114,7 @@ static int HalMgrLoadApi(void *cbdata, afb_api_t apiHandle) // Add static controls verbs if(HalUtlLoadVerbs(apiHandle, HalManagerApiStaticVerbs)) { AFB_API_ERROR(apiHandle, "Load section : fail to register static verbs"); - return 1; + return -2; } // Declare an event manager for Hal Manager @@ -144,7 +143,6 @@ int HalMgrCreateApi(afb_api_t apiHandle, struct HalMgrData *halMgrData) int afbBindingEntry(afb_api_t apiHandle) { - int status = 0, rc; if(! apiHandle) return -1; @@ -155,14 +153,12 @@ int afbBindingEntry(afb_api_t apiHandle) AFB_API_NOTICE(apiHandle, "Binding start"); // Load Hal-Manager using Api v3 - rc = HalMgrCreateApi(apiHandle, &localHalMgrGlobalData); - if(rc < 0) - status--; + if(HalMgrCreateApi(apiHandle, &localHalMgrGlobalData)) + return -3; // Load internals Hal using Api v3 - rc = InternalHalCreateAllApi(apiHandle, &localHalMgrGlobalData); - if(rc < 0) - status -= rc; + if(InternalHalCreateAllApi(apiHandle, &localHalMgrGlobalData)) + return -4; - return status; + return 0; }
\ No newline at end of file |