X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-req-itf.h;h=bf044f1c01cdc03f1aa5b4071e4654585128b22f;hb=c6380108964e71f533d8c672bb9c217020a95e8d;hp=a8980ffcff8ac88e5483e8bab8f1d780a2e5b13d;hpb=06382af9092babedbf56aa1c00b3bd7cb0b86cda;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-req-itf.h b/include/afb/afb-req-itf.h
index a8980ffc..bf044f1c 100644
--- a/include/afb/afb-req-itf.h
+++ b/include/afb/afb-req-itf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,159 +17,10 @@
 
 #pragma once
 
-struct json_object;
+#pragma GCC warning "\n\n\
+    This header file <afb/afb-req-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"
 
-struct afb_arg {
-	const char *name;
-	const char *value;
-	const char *path;
-};
-
-struct afb_req_itf {
-	struct json_object *(*json)(void *closure);
-	struct afb_arg (*get)(void *closure, const char *name);
-
-	void (*success)(void *closure, struct json_object *obj, const char *info);
-	void (*fail)(void *closure, const char *status, const char *info);
-
-	const char *(*raw)(void *closure, size_t *size);
-	void (*send)(void *closure, const char *buffer, size_t size);
-
-	void *(*context_get)(void *closure);
-	void (*context_set)(void *closure, void *value, void (*free_value)(void*));
-
-	void (*addref)(void *closure);
-	void (*unref)(void *closure);
-};
-
-struct afb_req {
-	const struct afb_req_itf *itf;
-	void *closure;
-};
-
-static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
-{
-	return req.itf->get(req.closure, name);
-}
-
-static inline const char *afb_req_value(struct afb_req req, const char *name)
-{
-	return afb_req_get(req, name).value;
-}
-
-static inline const char *afb_req_path(struct afb_req req, const char *name)
-{
-	return afb_req_get(req, name).path;
-}
-
-static inline struct json_object *afb_req_json(struct afb_req req)
-{
-	return req.itf->json(req.closure);
-}
-
-static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
-{
-	req.itf->success(req.closure, obj, info);
-}
-
-static inline void afb_req_fail(struct afb_req req, const char *status, const char *info)
-{
-	req.itf->fail(req.closure, status, info);
-}
-
-static inline const char *afb_req_raw(struct afb_req req, size_t *size)
-{
-	return req.itf->raw(req.closure, size);
-}
-
-static inline void afb_req_send(struct afb_req req, const char *buffer, size_t size)
-{
-	req.itf->send(req.closure, buffer, size);
-}
-
-static inline void *afb_req_context_get(struct afb_req req)
-{
-	return req.itf->context_get(req.closure);
-}
-
-static inline void afb_req_context_set(struct afb_req req, void *value, void (*free_value)(void*))
-{
-	return req.itf->context_set(req.closure, value, free_value);
-}
-
-static inline void afb_req_context_clear(struct afb_req req)
-{
-	afb_req_context_set(req, NULL, NULL);
-}
-
-static inline void afb_req_addref(struct afb_req req)
-{
-	return req.itf->addref(req.closure);
-}
-
-static inline void afb_req_unref(struct afb_req req)
-{
-	return req.itf->unref(req.closure);
-}
-
-#include <stdlib.h>
-
-static inline struct afb_req *afb_req_store(struct afb_req req)
-{
-	struct afb_req *result = malloc(sizeof *result);
-	if (result != NULL) {
-		*result = req;
-		afb_req_addref(req);
-	}
-	return result;
-}
-
-static inline struct afb_req afb_req_unstore(struct afb_req *req)
-{
-	struct afb_req result = *req;
-	free(req);
-	afb_req_unref(result);
-	return result;
-}
-
-#if !defined(_GNU_SOURCE)
-# error "_GNU_SOURCE must be defined for using vasprintf"
-#endif
-
-#include <stdarg.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;
-	if (info == NULL || vasprintf(&message, info, args) < 0)
-		message = NULL;
-	afb_req_fail(req, status, message);
-	free(message);
-}
-
-static inline void afb_req_fail_f(struct afb_req req, const char *status, const char *info, ...)
-{
-	va_list args;
-	va_start(args, info);
-	afb_req_fail_v(req, status, info, args);
-	va_end(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)
-		message = NULL;
-	afb_req_success(req, obj, message);
-	free(message);
-}
-
-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);
-	afb_req_success_v(req, obj, info, args);
-	va_end(args);
-}
+#include "afb-binding.h"