From 06382af9092babedbf56aa1c00b3bd7cb0b86cda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Tue, 17 May 2016 15:12:11 +0200 Subject: [PATCH] provides developper files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I0e41a0db778c69b5f5ce71115d495b2bb8b4cffe Signed-off-by: José Bollo --- CMakeLists.txt | 1 + include/CMakeLists.txt | 1 + include/{ => afb}/afb-evmgr-itf.h | 0 include/{ => afb}/afb-plugin.h | 4 ++-- include/{ => afb}/afb-req-itf.h | 0 plugins/afm-main-plugin/afm-main-plugin.c | 2 +- plugins/audio/audio-api.c | 4 ++-- plugins/media/media-api.c | 4 ++-- plugins/radio/radio-api.c | 4 ++-- plugins/samples/ClientCtx.c | 2 +- plugins/samples/HelloWorld.c | 2 +- plugins/samples/SamplePost.c | 2 +- plugins/session/token-api.c | 2 +- src/afb-api-dbus.c | 4 ++-- src/afb-api-so.c | 6 +++--- src/afb-apis.c | 2 +- src/afb-hreq.c | 3 ++- src/afb-hsrv.c | 2 +- src/afb-hswitch.c | 2 +- src/afb-ws-json1.c | 2 +- src/main.c | 2 +- 21 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 include/CMakeLists.txt rename include/{ => afb}/afb-evmgr-itf.h (100%) rename include/{ => afb}/afb-plugin.h (97%) rename include/{ => afb}/afb-req-itf.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12e4be95..76000105 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,5 +121,6 @@ SET(plugin_install_dir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/afb) ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}") ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(plugins) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt new file mode 100644 index 00000000..07cbb04b --- /dev/null +++ b/include/CMakeLists.txt @@ -0,0 +1 @@ +INSTALL(DIRECTORY afb DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/include/afb-evmgr-itf.h b/include/afb/afb-evmgr-itf.h similarity index 100% rename from include/afb-evmgr-itf.h rename to include/afb/afb-evmgr-itf.h diff --git a/include/afb-plugin.h b/include/afb/afb-plugin.h similarity index 97% rename from include/afb-plugin.h rename to include/afb/afb-plugin.h index 40b26cfa..2cfe6289 100644 --- a/include/afb-plugin.h +++ b/include/afb/afb-plugin.h @@ -17,8 +17,8 @@ #pragma once -#include "afb-req-itf.h" -#include "afb-evmgr-itf.h" +#include +#include /* Plugin Type */ enum AFB_pluginE diff --git a/include/afb-req-itf.h b/include/afb/afb-req-itf.h similarity index 100% rename from include/afb-req-itf.h rename to include/afb/afb-req-itf.h diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c index 95767307..705efcb0 100644 --- a/plugins/afm-main-plugin/afm-main-plugin.c +++ b/plugins/afm-main-plugin/afm-main-plugin.c @@ -21,7 +21,7 @@ #include #include -#include "afb-plugin.h" +#include #include "utils-jbus.h" diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c index 00f81001..c486d1c1 100644 --- a/plugins/audio/audio-api.c +++ b/plugins/audio/audio-api.c @@ -25,8 +25,8 @@ #include "audio-pulse.h" #endif -#include "afb-plugin.h" -#include "afb-req-itf.h" +#include +#include /* ------ BACKEND FUNCTIONS ------- */ diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c index 7b4fa18f..91676d4c 100644 --- a/plugins/media/media-api.c +++ b/plugins/media/media-api.c @@ -24,8 +24,8 @@ #include "media-api.h" #include "media-rygel.h" -#include "afb-plugin.h" -#include "afb-req-itf.h" +#include +#include json_object* _rygel_list (mediaCtxHandleT *); diff --git a/plugins/radio/radio-api.c b/plugins/radio/radio-api.c index edeb9786..e4a89ba6 100644 --- a/plugins/radio/radio-api.c +++ b/plugins/radio/radio-api.c @@ -22,8 +22,8 @@ #include "radio-api.h" #include "radio-rtlsdr.h" -#include "afb-plugin.h" -#include "afb-req-itf.h" +#include +#include /* ******************************************************** diff --git a/plugins/samples/ClientCtx.c b/plugins/samples/ClientCtx.c index 4d8e7205..bf26937f 100644 --- a/plugins/samples/ClientCtx.c +++ b/plugins/samples/ClientCtx.c @@ -19,7 +19,7 @@ #include #include -#include "afb-plugin.h" +#include typedef struct { /* diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c index 6f9d01d8..4795dd36 100644 --- a/plugins/samples/HelloWorld.c +++ b/plugins/samples/HelloWorld.c @@ -19,7 +19,7 @@ #include #include -#include "afb-plugin.h" +#include const struct AFB_interface *interface; diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c index 25e73f93..1d3069e8 100644 --- a/plugins/samples/SamplePost.c +++ b/plugins/samples/SamplePost.c @@ -20,7 +20,7 @@ #include #include -#include "afb-plugin.h" +#include // Sample Generic Ping Debug API diff --git a/plugins/session/token-api.c b/plugins/session/token-api.c index 80289486..fd312608 100644 --- a/plugins/session/token-api.c +++ b/plugins/session/token-api.c @@ -19,7 +19,7 @@ #include #include -#include "afb-plugin.h" +#include // Dummy sample of Client Application Context typedef struct { diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c index 3a882a56..52d449f0 100644 --- a/src/afb-api-dbus.c +++ b/src/afb-api-dbus.c @@ -25,8 +25,8 @@ #include #include -#include "afb-plugin.h" -#include "afb-req-itf.h" +#include +#include #include "afb-common.h" diff --git a/src/afb-api-so.c b/src/afb-api-so.c index 6ac5070f..72599e5b 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -27,9 +27,9 @@ #include #include -#include "afb-plugin.h" -#include "afb-req-itf.h" -#include "afb-evmgr-itf.h" +#include +#include +#include #include "session.h" #include "afb-common.h" diff --git a/src/afb-apis.c b/src/afb-apis.c index 834850f2..5ebc96ff 100644 --- a/src/afb-apis.c +++ b/src/afb-apis.c @@ -26,7 +26,7 @@ #include "verbose.h" #include "afb-apis.h" #include "afb-context.h" -#include "afb-req-itf.h" +#include struct api_desc { struct afb_api api; diff --git a/src/afb-hreq.c b/src/afb-hreq.c index 0f2f0ffb..a1c750b4 100644 --- a/src/afb-hreq.c +++ b/src/afb-hreq.c @@ -33,7 +33,7 @@ #endif #include "afb-method.h" -#include "afb-req-itf.h" +#include #include "afb-msg-json.h" #include "afb-context.h" #include "afb-hreq.h" @@ -471,6 +471,7 @@ int afb_hreq_reply_file(struct afb_hreq *hreq, int dirfd, const char *filename) int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url) { + /* TODO: append the query part! */ afb_hreq_reply_static(hreq, MHD_HTTP_MOVED_PERMANENTLY, 0, NULL, MHD_HTTP_HEADER_LOCATION, url, NULL); DEBUG("redirect from [%s] to [%s]", hreq->url, url); diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c index 743315cb..46e61a01 100644 --- a/src/afb-hsrv.c +++ b/src/afb-hsrv.c @@ -33,7 +33,7 @@ #include "afb-context.h" #include "afb-hreq.h" #include "afb-hsrv.h" -#include "afb-req-itf.h" +#include #include "verbose.h" #include "afb-common.h" diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c index bdded7fb..8dee80b3 100644 --- a/src/afb-hswitch.c +++ b/src/afb-hswitch.c @@ -23,7 +23,7 @@ #include -#include "afb-req-itf.h" +#include #include "afb-context.h" #include "afb-hreq.h" #include "afb-apis.h" diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index fe7514d9..85dc0259 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -29,7 +29,7 @@ #include "afb-ws-json1.h" #include "afb-msg-json.h" #include "session.h" -#include "afb-req-itf.h" +#include #include "afb-apis.h" #include "afb-context.h" diff --git a/src/main.c b/src/main.c index fdea9079..dbfbac5d 100644 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,7 @@ #include "verbose.h" #include "afb-common.h" -#include "afb-plugin.h" +#include #if !defined(PLUGIN_INSTALL_DIR) #error "you should define PLUGIN_INSTALL_DIR" -- 2.16.6