From 4dc768d67031aa99e2b885a0df7e643fdd1fa80c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Wed, 31 May 2017 17:20:41 +0200 Subject: [PATCH] Add backward compatibility and remarks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ia261e2d9efce399b210f834c1acb679215021edd Signed-off-by: José Bollo --- bindings/intrinsics/afb-dbus-binding.c | 1 + bindings/samples/AuthLogin.c | 1 + bindings/samples/DemoContext.c | 1 + bindings/samples/DemoPost.c | 1 + bindings/samples/tic-tac-toe.c | 1 + include/afb/afb-binding.h | 27 +++++++++++++++++++++------ include/afb/afb-service-itf.h | 26 ++++++++++++++++++++++++++ src/afb-config.c | 2 +- src/afb-xreq.c | 3 ++- 9 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 include/afb/afb-service-itf.h diff --git a/bindings/intrinsics/afb-dbus-binding.c b/bindings/intrinsics/afb-dbus-binding.c index 4eab2eb2..7a1bec54 100644 --- a/bindings/intrinsics/afb-dbus-binding.c +++ b/bindings/intrinsics/afb-dbus-binding.c @@ -23,6 +23,7 @@ #include #include +#define AFB_BINDING_VERSION 1 #include /* diff --git a/bindings/samples/AuthLogin.c b/bindings/samples/AuthLogin.c index 62205176..298834f2 100644 --- a/bindings/samples/AuthLogin.c +++ b/bindings/samples/AuthLogin.c @@ -19,6 +19,7 @@ #include #include +#define AFB_BINDING_VERSION 1 #include // Dummy sample of Client Application Context diff --git a/bindings/samples/DemoContext.c b/bindings/samples/DemoContext.c index 26677949..a2fec750 100644 --- a/bindings/samples/DemoContext.c +++ b/bindings/samples/DemoContext.c @@ -19,6 +19,7 @@ #include #include +#define AFB_BINDING_VERSION 1 #include typedef struct { diff --git a/bindings/samples/DemoPost.c b/bindings/samples/DemoPost.c index bed5d444..c5d6ff7f 100644 --- a/bindings/samples/DemoPost.c +++ b/bindings/samples/DemoPost.c @@ -20,6 +20,7 @@ #include #include +#define AFB_BINDING_VERSION 1 #include diff --git a/bindings/samples/tic-tac-toe.c b/bindings/samples/tic-tac-toe.c index fb5eb926..ee76bca0 100644 --- a/bindings/samples/tic-tac-toe.c +++ b/bindings/samples/tic-tac-toe.c @@ -20,6 +20,7 @@ #include #include +#define AFB_BINDING_VERSION 1 #include /* diff --git a/include/afb/afb-binding.h b/include/afb/afb-binding.h index b1830184..82f702ec 100644 --- a/include/afb/afb-binding.h +++ b/include/afb/afb-binding.h @@ -26,18 +26,33 @@ * * Functions of bindings of afb-daemon are accessible by authorized clients * through the apis module of afb-daemon. - * - * A binding is a shared library. This shared library must have at least one - * exported symbol for being registered in afb-daemon. - * */ #define AFB_BINDING_LOWER_VERSION 1 #define AFB_BINDING_UPPER_VERSION 2 -#define AFB_BINDING_DEFAULT_VERSION 1 #ifndef AFB_BINDING_VERSION -#define AFB_BINDING_VERSION AFB_BINDING_DEFAULT_VERSION +#define AFB_BINDING_VERSION 1 +#pragma GCC warning "\ +\n\ +\n\ + AFB_BINDING_VERSION should be defined before including \n\ + AFB_BINDING_VERSION defines the version of binding that you use.\n\ + Currently, known versions are 1 or 2.\n\ + Setting now AFB_BINDING_VERSION to 1 (version 1 by default)\n\ + NOTE THAT VERSION 2 IS NOW RECOMMENDED!\n\ + Consider to add one of the following define before including :\n\ +\n\ + #define AFB_BINDING_VERSION 1\n\ + #define AFB_BINDING_VERSION 2\n\ +\n\ + Note that in some case it will enforce you to include \n\ +" +#include /* old version side effect */ +#else +# if AFB_BINDING_VERSION == 1 +# pragma GCC warning "Using binding version 1, consider to switch to version 2" +# endif #endif #if AFB_BINDING_VERSION != 0 diff --git a/include/afb/afb-service-itf.h b/include/afb/afb-service-itf.h new file mode 100644 index 00000000..490d77e7 --- /dev/null +++ b/include/afb/afb-service-itf.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2016, 2017 "IoT.bzh" + * Author: José Bollo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#pragma GCC warning "\n\n\ + This header file is OBSOLETE.\n\ + It is provided for COMPATIBILITY ONLY.\n\n\ + Please USE and ADAPT YOUR CODE to new names.\n" + +#include "afb-binding.h" + diff --git a/src/afb-config.c b/src/afb-config.c index ebacee99..dc3388e4 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -31,7 +31,7 @@ #include "afb-config.h" #include "afb-hook.h" -#include +#include #if !defined(BINDING_INSTALL_DIR) #error "you should define BINDING_INSTALL_DIR" diff --git a/src/afb-xreq.c b/src/afb-xreq.c index 61ba4fd9..ba533c90 100644 --- a/src/afb-xreq.c +++ b/src/afb-xreq.c @@ -24,7 +24,8 @@ #include #include -#include +#include +#include #include "afb-context.h" #include "afb-xreq.h" -- 2.16.6