Move from controller functions to afb functions

Move from controller 'afb-definitions.h' functions to
application framework 'afb/afb-binding.h' functions.

Change-Id: I4cd62af881ef8ac949b082ede9dfcc4736d1e12c
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

1 files changed, 38 insertions, 37 deletions

diff --git a/4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.c b/4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.c
index 40581ef..bf88571 100644
--- a/4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.c
+++ b/4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.c
@@ -20,13 +20,15 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <afb/afb-binding.h>
+
 #include "4a-hal-utilities-appfw-responses-handler.h"
 
 /*******************************************************************************
  *		Handle application framework response function		       *
  ******************************************************************************/
 
-enum CallError HalUtlHandleAppFwCallError(AFB_ApiT apiHandle, char *apiCalled, char *verbCalled, json_object *callReturnJ, char **returnedStatus, char **returnedInfo)
+enum CallError HalUtlHandleAppFwCallError(afb_api_t apiHandle, char *apiCalled, char *verbCalled, json_object *callReturnJ, char **returnedStatus, char **returnedInfo)
 {
 	json_object *returnedRequestJ, *returnedStatusJ, *returnedInfoJ;
 
@@ -34,73 +36,72 @@ enum CallError HalUtlHandleAppFwCallError(AFB_ApiT apiHandle, char *apiCalled, c
 		return CALL_ERROR_INVALID_ARGS;
 
 	if(! json_object_object_get_ex(callReturnJ, "request", &returnedRequestJ)) {
-		AFB_ApiWarning(apiHandle, "Couldn't get response request object");
+		AFB_API_WARNING(apiHandle, "Couldn't get response request object");
 		return CALL_ERROR_REQUEST_UNAVAILABLE;
 	}
 
 	if(! json_object_is_type(returnedRequestJ, json_type_object)) {
-		AFB_ApiWarning(apiHandle, "Response request object is not valid");
+		AFB_API_WARNING(apiHandle, "Response request object is not valid");
 		return CALL_ERROR_REQUEST_NOT_VALID;
 	}
 
 	if(! json_object_object_get_ex(returnedRequestJ, "status", &returnedStatusJ)) {
-		AFB_ApiWarning(apiHandle, "Couldn't get response status object");
+		AFB_API_WARNING(apiHandle, "Couldn't get response status object");
 		return CALL_ERROR_REQUEST_STATUS_UNAVAILABLE;
 	}
 
 	if(! json_object_is_type(returnedStatusJ, json_type_string)) {
-		AFB_ApiWarning(apiHandle, "Response status object is not valid");
+		AFB_API_WARNING(apiHandle, "Response status object is not valid");
 		return CALL_ERROR_REQUEST_STATUS_NOT_VALID;
 	}
 
 	*returnedStatus = (char *) json_object_get_string(returnedStatusJ);
 
 	if(! strcmp(*returnedStatus, "unknown-api")) {
-		AFB_ApiWarning(apiHandle, "Api %s not found", apiCalled);
+		AFB_API_WARNING(apiHandle, "Api %s not found", apiCalled);
 		return CALL_ERROR_API_UNAVAILABLE;
 	}
 
 	if(! strcmp(*returnedStatus, "unknown-verb")) {
-		AFB_ApiWarning(apiHandle, "Verb %s of api %s not found", verbCalled, apiCalled);
+		AFB_API_WARNING(apiHandle, "Verb %s of api %s not found", verbCalled, apiCalled);
 		return CALL_ERROR_VERB_UNAVAILABLE;
 	}
 
 	if(! json_object_object_get_ex(returnedRequestJ, "info", &returnedInfoJ)) {
-		AFB_ApiWarning(apiHandle, "Couldn't get response info object");
+		AFB_API_WARNING(apiHandle, "Couldn't get response info object");
 		return CALL_ERROR_REQUEST_INFO_UNAVAILABLE;
 	}
 
 	if(! json_object_is_type(returnedInfoJ, json_type_string)) {
-		AFB_ApiWarning(apiHandle, "Response info object is not valid");
+		AFB_API_WARNING(apiHandle, "Response info object is not valid");
 		return CALL_ERROR_REQUEST_INFO_NOT_VALID;
 	}
 
 	*returnedInfo = (char *) json_object_get_string(returnedInfoJ);
 
-	AFB_ApiWarning(apiHandle,
-		       "Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'",
-		       apiCalled,
-		       verbCalled,
-		       *returnedStatus,
-		       *returnedInfo);
+	AFB_API_WARNING(apiHandle,
+			"Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'",
+			apiCalled,
+			verbCalled,
+			*returnedStatus,
+			*returnedInfo);
 
 	return CALL_ERROR_RETURNED;
 }
 
-void HalUtlHandleAppFwCallErrorInRequest(AFB_ReqT request, char *apiCalled, char *verbCalled, json_object *callReturnJ, char *errorStatusToSend)
+void HalUtlHandleAppFwCallErrorInRequest(afb_req_t request, char *apiCalled, char *verbCalled, json_object *callReturnJ, char *errorStatusToSend)
 {
 	char *returnedStatus = NULL, *returnedInfo = NULL;
 
-	AFB_ApiT apiHandle;
+	afb_api_t apiHandle;
 
 	if(! request || ! apiCalled || ! verbCalled || ! callReturnJ) {
-		AFB_ReqFailF(request, "invalid_args", "Invalid arguments");
+		afb_req_fail_f(request, "invalid_args", "Invalid arguments");
 		return;
 	}
 
-	apiHandle = (AFB_ApiT) AFB_ReqGetApi(request);
-	if(! apiHandle) {
-		AFB_ReqFailF(request, "api_handle", "Can't get hal manager api handle");
+	if(! (apiHandle = afb_req_get_api(request))) {
+		afb_req_fail_f(request, "api_handle", "Can't get hal manager api handle");
 		return;
 	}
 
@@ -111,37 +112,37 @@ void HalUtlHandleAppFwCallErrorInRequest(AFB_ReqT request, char *apiCalled, char
 		case CALL_ERROR_REQUEST_STATUS_NOT_VALID:
 		case CALL_ERROR_REQUEST_INFO_UNAVAILABLE:
 		case CALL_ERROR_REQUEST_INFO_NOT_VALID:
-			AFB_ReqFail(request, errorStatusToSend, "Error with response object");
+			afb_req_fail(request, errorStatusToSend, "Error with response object");
 			return;
 
 		case CALL_ERROR_API_UNAVAILABLE:
-			AFB_ReqFailF(request, errorStatusToSend, "Api %s not found", apiCalled);
+			afb_req_fail_f(request, errorStatusToSend, "Api %s not found", apiCalled);
 			return;
 
 		case CALL_ERROR_VERB_UNAVAILABLE:
-			AFB_ReqFailF(request, errorStatusToSend, "Verb %s of api %s not found", verbCalled, apiCalled);
+			afb_req_fail_f(request, errorStatusToSend, "Verb %s of api %s not found", verbCalled, apiCalled);
 			return;
 
 		case CALL_ERROR_RETURNED:
-			AFB_ReqFailF(request,
-				     errorStatusToSend,
-				     "Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'",
-				     apiCalled,
-				     verbCalled,
-				     returnedStatus ? returnedStatus : "not returned",
-				     returnedInfo ? returnedInfo : "not returned");
+			afb_req_fail_f(request,
+				       errorStatusToSend,
+				       "Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'",
+				       apiCalled,
+				       verbCalled,
+				       returnedStatus ? returnedStatus : "not returned",
+				      returnedInfo ? returnedInfo : "not returned");
 			return;
 
 		case CALL_ERROR_INVALID_ARGS:
-			AFB_ReqFailF(request,
-				     errorStatusToSend,
-				     "Api %s and verb %s found, but the arguments are invalid",
-				     apiCalled,
-				     verbCalled);
+			afb_req_fail_f(request,
+				       errorStatusToSend,
+				       "Api %s and verb %s found, but the arguments are invalid",
+				       apiCalled,
+				       verbCalled);
 			return;
 
 		default:
-			AFB_ReqFailF(request, errorStatusToSend, "Unknown error happened during call to verb %s of api %s", verbCalled, apiCalled);
+			afb_req_fail_f(request, errorStatusToSend, "Unknown error happened during call to verb %s of api %s", verbCalled, apiCalled);
 			return;
 	}
 }
\ No newline at end of file