From eb4967fcc8278bcd994eb2ce16bf0042b4d8598c Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Sun, 3 Jun 2018 18:58:56 +0200 Subject: Handle app fw call errors in a dedicated function Two functions has been added in a new file in 4a-hal-utilities : - A function that handle application framework call errors by returning a specific error. - A function that handle application framework call errors from a request. Change-Id: I657773586111adc609cbbaead7db589a82e133b0 Signed-off-by: Jonathan Aillet --- .../4a-hal-controllers-mixer-handler.c | 68 +--------------------- 1 file changed, 1 insertion(+), 67 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c index 64910b5..77bc4b6 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c @@ -27,75 +27,9 @@ #include "4a-hal-controllers-cb.h" /******************************************************************************* - * HAL controllers hanlde mixer responses functions * + * HAL controllers handle mixer response function * ******************************************************************************/ -void HalCtlsHandleMixerCallError(AFB_ReqT request, char *apiCalled, char *verbCalled, json_object *callReturnJ, char *errorStatus) -{ - char *returnedStatus, *returnedInfo; - - json_object *returnedRequestJ, *returnedStatusJ, *returnedInfoJ; - - if(! json_object_object_get_ex(callReturnJ, "request", &returnedRequestJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response request object"); - return; - } - - if(! json_object_is_type(returnedRequestJ, json_type_object)) { - AFB_ReqFail(request, errorStatus, "Response request object is not valid"); - return; - } - - if(! json_object_object_get_ex(returnedRequestJ, "status", &returnedStatusJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response status object"); - return; - } - - if(! json_object_is_type(returnedStatusJ, json_type_string)) { - AFB_ReqFail(request, errorStatus, "Response status object is not valid"); - return; - } - - returnedStatus = (char *) json_object_get_string(returnedStatusJ); - - if(! strcmp(returnedStatus, "unknown-api")) { - AFB_ReqFailF(request, - errorStatus, - "Api %s not found", - apiCalled); - return; - } - - if(! strcmp(returnedStatus, "unknown-verb")) { - AFB_ReqFailF(request, - errorStatus, - "Verb %s of api %s not found", - verbCalled, - apiCalled); - return; - } - - if(! json_object_object_get_ex(returnedRequestJ, "info", &returnedInfoJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response info object"); - return; - } - - if(! json_object_is_type(returnedInfoJ, json_type_string)) { - AFB_ReqFail(request, errorStatus, "Response info object is not valid"); - return; - } - - returnedInfo = (char *) json_object_get_string(returnedInfoJ); - - AFB_ReqFailF(request, - errorStatus, - "Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'", - apiCalled, - verbCalled, - returnedStatus, - returnedInfo); -} - int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *mixerResponseJ) { int err = 0; -- cgit 1.2.3-korg