summaryrefslogtreecommitdiffstats
path: root/include/afb-req-itf.h
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-04-01 18:01:26 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-04-01 18:01:26 +0200
commit70558f02b1c030c4290a0146313e3052fc0ea715 (patch)
tree3212b6c0c4a7e89ebc780a0be4a5a9c6b151688d /include/afb-req-itf.h
parentdde70b62b09f49ad672c104a3f81714bf11047be (diff)
work in progress (tbf)
Change-Id: I1c4b48bc56a17b7351b57c3d4da53bd89465fff4 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'include/afb-req-itf.h')
-rw-r--r--include/afb-req-itf.h31
1 files changed, 19 insertions, 12 deletions
diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index eea78317..c593440b 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+struct json_object;
+
struct afb_arg {
const char *name;
const char *value;
@@ -26,12 +28,13 @@ struct afb_req_itf {
struct afb_arg (*get)(void *data, const char *name);
void (*iterate)(void *data, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
void (*fail)(void *data, const char *status, const char *info);
- void (*success)(void *data, json_object *obj, const char *info);
+ void (*success)(void *data, struct json_object *obj, const char *info);
};
struct afb_req {
const struct afb_req_itf *itf;
void *data;
+ void **context;
};
static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
@@ -54,15 +57,24 @@ static inline void afb_req_iterate(struct afb_req req, int (*iterator)(void *clo
req.itf->iterate(req.data, iterator, closure);
}
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-
static inline void afb_req_fail(struct afb_req req, const char *status, const char *info)
{
req.itf->fail(req.data, status, info);
}
+static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
+{
+ req.itf->success(req.data, obj, info);
+}
+
+#if !defined(_GNU_SOURCE)
+# error "_GNU_SOURCE must be defined for using vasprintf"
+#endif
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+
static inline void afb_req_fail_v(struct afb_req req, const char *status, const char *info, va_list args)
{
char *message;
@@ -80,12 +92,7 @@ static inline void afb_req_fail_f(struct afb_req req, const char *status, const
va_end(args);
}
-static inline void afb_req_success(struct afb_req req, json_object *obj, const char *info)
-{
- req.itf->success(req.data, obj, info);
-}
-
-static inline void afb_req_success_v(struct afb_req req, json_object *obj, const char *info, va_list args)
+static inline void afb_req_success_v(struct afb_req req, struct json_object *obj, const char *info, va_list args)
{
char *message;
if (info == NULL || vasprintf(&message, info, args) < 0)
@@ -94,7 +101,7 @@ static inline void afb_req_success_v(struct afb_req req, json_object *obj, const
free(message);
}
-static inline void afb_req_success_f(struct afb_req req, json_object *obj, const char *info, ...)
+static inline void afb_req_success_f(struct afb_req req, struct json_object *obj, const char *info, ...)
{
va_list args;
va_start(args, info);