Add a closure argument to dynamic verbs

[src/app-framework-binder.git] / include / afb / afb-service-itf.h

diff --git a/include/afb/afb-service-itf.h b/include/afb/afb-service-itf.h
index e2e61dc..490d77e 100644 (file)
--- a/include/afb/afb-service-itf.h
+++ b/include/afb/afb-service-itf.h
@@ -17,60 +17,10 @@
 
 #pragma once
 
-/* avoid inclusion of <json-c/json.h> */
-struct json_object;
+#pragma GCC warning "\n\n\
+    This header file <afb/afb-service-itf.h> is OBSOLETE.\n\
+    It is provided for COMPATIBILITY ONLY.\n\n\
+    Please USE <afb/afb-binding.h> and ADAPT YOUR CODE to new names.\n"
 
-/*
- * Interface for internal of services
- * It records the functions to be called for the request.
- * Don't use this structure directly.
- * Use the helper functions documented below.
- */
-struct afb_service_itf
-{
-       /* CAUTION: respect the order, add at the end */
-
-       void (*call)(void *closure, const char *api, const char *verb, struct json_object *args,
-                    void (*callback)(void*, int, struct json_object*), void *callback_closure);
-};
-
-/*
- * Object that encapsulate accesses to service items
- */
-struct afb_service
-{
-       const struct afb_service_itf *itf;
-       void *closure;
-};
-
-/**
- * Calls the 'verb' of the 'api' with the arguments 'args' and 'verb' in the name of the binding.
- * The result of the call is delivered to the 'callback' function with the 'callback_closure'.
- *
- * The 'callback' receives 3 arguments:
- *  1. 'closure' the user defined closure pointer 'callback_closure',
- *  2. 'iserror' a boolean status being true (not null) when an error occured,
- *  2. 'result' the resulting data as a JSON object.
- *
- * @param service  The service as received during initialisation
- * @param api      The api name of the method to call
- * @param verb     The verb name of the method to call
- * @param args     The arguments to pass to the method
- * @param callback The to call on completion
- * @param callback_closure The closure to pass to the callback
- *
- * @returns 0 in case of success or -1 in case of error.
- *
- * @see also 'afb_req_subcall'
- */
-static inline void afb_service_call(
-       struct afb_service service,
-       const char *api,
-       const char *verb,
-       struct json_object *args,
-       void (*callback)(void*closure, int iserror, struct json_object *result),
-       void *callback_closure)
-{
-       service.itf->call(service.closure, api, verb, args, callback, callback_closure);
-}
+#include "afb-binding.h"