diff --git a/examples/meson.build b/examples/meson.build deleted file mode 100644 index 036b954..0000000 --- a/examples/meson.build +++ /dev/null @@ -1,15 +0,0 @@ -project('webfuse-provider', version: '0.1.0', license: 'LGPL-3.0+') - - -webfuse_provider_dep = dependency('webfuse_provider', version: '>=0.3.0', - fallback: ['webfuse', 'webfuse_provider_dep'], default_options: ['without_adapter=true']) - -executable('webfuse-provider', - 'src/main.c', - dependencies: [webfuse_provider_dep]) - -executable('static-filesystem-provider', - 'src/static_filesystem/static_filesystem.c', - 'src/static_filesystem/path.c', - 'src/static_filesystem/main.c', - dependencies: [webfuse_provider_dep]) diff --git a/examples/src/main.c b/examples/provider/main.c similarity index 99% rename from examples/src/main.c rename to examples/provider/main.c index 261fb9b..e0dbd69 100644 --- a/examples/src/main.c +++ b/examples/provider/main.c @@ -9,7 +9,7 @@ #include #include -#include "webfuse_provider.h" +#include "webfuse_provider/webfuse_provider.h" struct config { diff --git a/examples/src/static_filesystem/main.c b/examples/static_filesystem/main.c similarity index 98% rename from examples/src/static_filesystem/main.c rename to examples/static_filesystem/main.c index 6596af4..297028d 100644 --- a/examples/src/static_filesystem/main.c +++ b/examples/static_filesystem/main.c @@ -4,7 +4,7 @@ #include #include -#include "webfuse_provider.h" +#include "webfuse_provider/webfuse_provider.h" #include "static_filesystem.h" struct args diff --git a/examples/src/static_filesystem/path.c b/examples/static_filesystem/path.c similarity index 100% rename from examples/src/static_filesystem/path.c rename to examples/static_filesystem/path.c diff --git a/examples/src/static_filesystem/path.h b/examples/static_filesystem/path.h similarity index 100% rename from examples/src/static_filesystem/path.h rename to examples/static_filesystem/path.h diff --git a/examples/src/static_filesystem/static_filesystem.c b/examples/static_filesystem/static_filesystem.c similarity index 98% rename from examples/src/static_filesystem/static_filesystem.c rename to examples/static_filesystem/static_filesystem.c index 142f515..5c9b999 100644 --- a/examples/src/static_filesystem/static_filesystem.c +++ b/examples/static_filesystem/static_filesystem.c @@ -1,8 +1,8 @@ #include "static_filesystem.h" -#include "webfuse/provider/client_config.h" -#include "webfuse/provider/dirbuffer.h" -#include "webfuse/provider/operation/error.h" +#include "webfuse_provider/client_config.h" +#include "webfuse_provider/dirbuffer.h" +#include "webfuse_provider/operation/error.h" #include "path.h" diff --git a/examples/src/static_filesystem/static_filesystem.h b/examples/static_filesystem/static_filesystem.h similarity index 100% rename from examples/src/static_filesystem/static_filesystem.h rename to examples/static_filesystem/static_filesystem.h diff --git a/include/webfuse_provider.h b/include/webfuse_provider.h deleted file mode 100644 index 19afad2..0000000 --- a/include/webfuse_provider.h +++ /dev/null @@ -1,27 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -/// \file webfuse_provider.h -/// \brief Convenience header to include all functionality of libfuse_provider. -//////////////////////////////////////////////////////////////////////////////// - -#ifndef WF_PROVIDER_H -#define WF_PROVIDER_H - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/webfuse/provider/api.h b/include/webfuse_provider/api.h similarity index 100% rename from include/webfuse/provider/api.h rename to include/webfuse_provider/api.h diff --git a/include/webfuse/provider/client.h b/include/webfuse_provider/client.h similarity index 99% rename from include/webfuse/provider/client.h rename to include/webfuse_provider/client.h index 1848717..0d27e49 100644 --- a/include/webfuse/provider/client.h +++ b/include/webfuse_provider/client.h @@ -6,7 +6,7 @@ #ifndef WF_PROVIDER_CLIENT_H #define WF_PROVIDER_CLIENT_H -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/client_config.h b/include/webfuse_provider/client_config.h similarity index 96% rename from include/webfuse/provider/client_config.h rename to include/webfuse_provider/client_config.h index 26654bc..ba3e7b0 100644 --- a/include/webfuse/provider/client_config.h +++ b/include/webfuse_provider/client_config.h @@ -6,15 +6,15 @@ #ifndef WF_PROVIDER_CLIENT_CONFIG_H #define WF_PROVIDER_CLIENT_CONFIG_H -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/client_protocol.h b/include/webfuse_provider/client_protocol.h similarity index 99% rename from include/webfuse/provider/client_protocol.h rename to include/webfuse_provider/client_protocol.h index 8108030..e9d5b55 100644 --- a/include/webfuse/provider/client_protocol.h +++ b/include/webfuse_provider/client_protocol.h @@ -11,7 +11,7 @@ #ifndef WF_PROVIDER_CLIENT_PROTOCOL_H #define WF_PROVIDER_CLIENT_PROTOCOL_H -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/credentials.h b/include/webfuse_provider/credentials.h similarity index 93% rename from include/webfuse/provider/credentials.h rename to include/webfuse_provider/credentials.h index a6b0806..0a49173 100644 --- a/include/webfuse/provider/credentials.h +++ b/include/webfuse_provider/credentials.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_CREDENTIALS_H #define WF_PROVIDER_CREDENTIALS_H -#include +#include #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/dirbuffer.h b/include/webfuse_provider/dirbuffer.h similarity index 98% rename from include/webfuse/provider/dirbuffer.h rename to include/webfuse_provider/dirbuffer.h index 2737ab4..9a6efb4 100644 --- a/include/webfuse/provider/dirbuffer.h +++ b/include/webfuse_provider/dirbuffer.h @@ -10,7 +10,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/close.h b/include/webfuse_provider/operation/close.h similarity index 96% rename from include/webfuse/provider/operation/close.h rename to include/webfuse_provider/operation/close.h index ae17a28..5aba355 100644 --- a/include/webfuse/provider/operation/close.h +++ b/include/webfuse_provider/operation/close.h @@ -16,7 +16,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/error.h b/include/webfuse_provider/operation/error.h similarity index 92% rename from include/webfuse/provider/operation/error.h rename to include/webfuse_provider/operation/error.h index 556a630..d90ec30 100644 --- a/include/webfuse/provider/operation/error.h +++ b/include/webfuse_provider/operation/error.h @@ -6,8 +6,8 @@ #ifndef WFP_OPERATION_ERROR_H #define WFP_OPERATION_ERROR_H -#include "webfuse/provider/api.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/api.h" +#include "webfuse_provider/status.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/getattr.h b/include/webfuse_provider/operation/getattr.h similarity index 97% rename from include/webfuse/provider/operation/getattr.h rename to include/webfuse_provider/operation/getattr.h index 4c9564f..4a3d86f 100644 --- a/include/webfuse/provider/operation/getattr.h +++ b/include/webfuse_provider/operation/getattr.h @@ -10,7 +10,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/lookup.h b/include/webfuse_provider/operation/lookup.h similarity index 97% rename from include/webfuse/provider/operation/lookup.h rename to include/webfuse_provider/operation/lookup.h index e8f9ca6..4b4c022 100644 --- a/include/webfuse/provider/operation/lookup.h +++ b/include/webfuse_provider/operation/lookup.h @@ -10,7 +10,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/open.h b/include/webfuse_provider/operation/open.h similarity index 97% rename from include/webfuse/provider/operation/open.h rename to include/webfuse_provider/operation/open.h index d5d9f9a..7e310d9 100644 --- a/include/webfuse/provider/operation/open.h +++ b/include/webfuse_provider/operation/open.h @@ -16,7 +16,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/read.h b/include/webfuse_provider/operation/read.h similarity index 98% rename from include/webfuse/provider/operation/read.h rename to include/webfuse_provider/operation/read.h index 64d0047..74c1678 100644 --- a/include/webfuse/provider/operation/read.h +++ b/include/webfuse_provider/operation/read.h @@ -19,7 +19,7 @@ using std::size_t; #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/provider/operation/readdir.h b/include/webfuse_provider/operation/readdir.h similarity index 98% rename from include/webfuse/provider/operation/readdir.h rename to include/webfuse_provider/operation/readdir.h index aef2f07..c42773b 100644 --- a/include/webfuse/provider/operation/readdir.h +++ b/include/webfuse_provider/operation/readdir.h @@ -10,7 +10,7 @@ #include #include -#include "webfuse/provider/api.h" +#include "webfuse_provider/api.h" #ifdef __cplusplus extern "C" diff --git a/include/webfuse/core/protocol_names.h b/include/webfuse_provider/protocol_names.h similarity index 100% rename from include/webfuse/core/protocol_names.h rename to include/webfuse_provider/protocol_names.h diff --git a/include/webfuse/core/status.h b/include/webfuse_provider/status.h similarity index 100% rename from include/webfuse/core/status.h rename to include/webfuse_provider/status.h diff --git a/include/webfuse_provider/webfuse_provider.h b/include/webfuse_provider/webfuse_provider.h new file mode 100644 index 0000000..cf48e91 --- /dev/null +++ b/include/webfuse_provider/webfuse_provider.h @@ -0,0 +1,27 @@ +//////////////////////////////////////////////////////////////////////////////// +/// \file webfuse_provider.h +/// \brief Convenience header to include all functionality of libfuse_provider. +//////////////////////////////////////////////////////////////////////////////// + +#ifndef WF_PROVIDER_H +#define WF_PROVIDER_H + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/lib/webfuse/provider/api.c b/lib/webfuse_provider/api.c similarity index 89% rename from lib/webfuse/provider/api.c rename to lib/webfuse_provider/api.c index ad288bd..060c1fa 100644 --- a/lib/webfuse/provider/api.c +++ b/lib/webfuse_provider/api.c @@ -1,19 +1,19 @@ -#include "webfuse_provider.h" - -#include "webfuse/provider/impl/request.h" -#include "webfuse/provider/impl/operation/getattr.h" -#include "webfuse/provider/impl/operation/lookup.h" -#include "webfuse/provider/impl/operation/readdir.h" -#include "webfuse/provider/impl/operation/open.h" -#include "webfuse/provider/impl/operation/close.h" -#include "webfuse/provider/impl/operation/read.h" -#include "webfuse/provider/impl/client_protocol.h" -#include "webfuse/provider/impl/client_config.h" -#include "webfuse/provider/impl/client.h" -#include "webfuse/provider/impl/dirbuffer.h" -#include "webfuse/provider/impl/credentials.h" - -#include "webfuse/core/util.h" +#include "webfuse_provider/webfuse_provider.h" + +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/operation/getattr.h" +#include "webfuse_provider/impl/operation/lookup.h" +#include "webfuse_provider/impl/operation/readdir.h" +#include "webfuse_provider/impl/operation/open.h" +#include "webfuse_provider/impl/operation/close.h" +#include "webfuse_provider/impl/operation/read.h" +#include "webfuse_provider/impl/client_protocol.h" +#include "webfuse_provider/impl/client_config.h" +#include "webfuse_provider/impl/client.h" +#include "webfuse_provider/impl/dirbuffer.h" +#include "webfuse_provider/impl/credentials.h" + +#include "webfuse_provider/impl/util.h" // respond diff --git a/lib/webfuse/core/base64.c b/lib/webfuse_provider/impl/base64.c similarity index 99% rename from lib/webfuse/core/base64.c rename to lib/webfuse_provider/impl/base64.c index 2b24688..e53aff5 100644 --- a/lib/webfuse/core/base64.c +++ b/lib/webfuse_provider/impl/base64.c @@ -1,4 +1,4 @@ -#include "webfuse/core/base64.h" +#include "webfuse_provider/impl/base64.h" static const uint8_t wf_base64_decode_table[256] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F diff --git a/lib/webfuse/core/base64.h b/lib/webfuse_provider/impl/base64.h similarity index 100% rename from lib/webfuse/core/base64.h rename to lib/webfuse_provider/impl/base64.h diff --git a/lib/webfuse/provider/impl/client.c b/lib/webfuse_provider/impl/client.c similarity index 91% rename from lib/webfuse/provider/impl/client.c rename to lib/webfuse_provider/impl/client.c index 2c584e9..0e64e18 100644 --- a/lib/webfuse/provider/impl/client.c +++ b/lib/webfuse_provider/impl/client.c @@ -1,4 +1,4 @@ -#include "webfuse/provider/impl/client.h" +#include "webfuse_provider/impl/client.h" #include #include @@ -6,10 +6,10 @@ #include -#include "webfuse/provider/impl/provider.h" -#include "webfuse/provider/impl/client_protocol.h" -#include "webfuse/provider/impl/client_config.h" -#include "webfuse/core/lws_log.h" +#include "webfuse_provider/impl/provider.h" +#include "webfuse_provider/impl/client_protocol.h" +#include "webfuse_provider/impl/client_config.h" +#include "webfuse_provider/impl/lws_log.h" #define WFP_CLIENT_PROTOCOL_COUNT 2 diff --git a/lib/webfuse/provider/impl/client.h b/lib/webfuse_provider/impl/client.h similarity index 100% rename from lib/webfuse/provider/impl/client.h rename to lib/webfuse_provider/impl/client.h diff --git a/lib/webfuse/provider/impl/client_config.c b/lib/webfuse_provider/impl/client_config.c similarity index 96% rename from lib/webfuse/provider/impl/client_config.c rename to lib/webfuse_provider/impl/client_config.c index cd7b015..26e0df5 100644 --- a/lib/webfuse/provider/impl/client_config.c +++ b/lib/webfuse_provider/impl/client_config.c @@ -1,5 +1,5 @@ -#include "webfuse/provider/impl/client_config.h" -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/client_config.h" +#include "webfuse_provider/impl/provider.h" #include #include diff --git a/lib/webfuse/provider/impl/client_config.h b/lib/webfuse_provider/impl/client_config.h similarity index 95% rename from lib/webfuse/provider/impl/client_config.h rename to lib/webfuse_provider/impl/client_config.h index 9e588b0..1fc1a55 100644 --- a/lib/webfuse/provider/impl/client_config.h +++ b/lib/webfuse_provider/impl/client_config.h @@ -1,8 +1,8 @@ #ifndef WF_PROVIDER_IMPL_CLIENT_CONFIG_H #define WF_PROVIDER_IMPL_CLIENT_CONFIG_H -#include "webfuse/provider/client_config.h" -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/client_config.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/client_protocol.c b/lib/webfuse_provider/impl/client_protocol.c similarity index 93% rename from lib/webfuse/provider/impl/client_protocol.c rename to lib/webfuse_provider/impl/client_protocol.c index 7ce8c2e..481f07d 100644 --- a/lib/webfuse/provider/impl/client_protocol.c +++ b/lib/webfuse_provider/impl/client_protocol.c @@ -1,4 +1,4 @@ -#include "webfuse/provider/impl/client_protocol.h" +#include "webfuse_provider/impl/client_protocol.h" #include #include @@ -6,21 +6,21 @@ #include #include -#include "webfuse/provider/impl/client_config.h" -#include "webfuse/provider/impl/provider.h" -#include "webfuse/provider/impl/credentials.h" -#include "webfuse/core/util.h" -#include "webfuse/core/message.h" -#include "webfuse/core/message_queue.h" -#include "webfuse/core/container_of.h" -#include "webfuse/core/url.h" -#include "webfuse/core/protocol_names.h" - -#include "webfuse/core/timer/manager.h" - -#include "webfuse/core/jsonrpc/response.h" -#include "webfuse/core/jsonrpc/request.h" -#include "webfuse/core/jsonrpc/proxy.h" +#include "webfuse_provider/impl/client_config.h" +#include "webfuse_provider/impl/provider.h" +#include "webfuse_provider/impl/credentials.h" +#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/message.h" +#include "webfuse_provider/impl/message_queue.h" +#include "webfuse_provider/impl/container_of.h" +#include "webfuse_provider/impl/url.h" +#include "webfuse_provider/protocol_names.h" + +#include "webfuse_provider/impl/timer/manager.h" + +#include "webfuse_provider/impl/jsonrpc/response.h" +#include "webfuse_provider/impl/jsonrpc/request.h" +#include "webfuse_provider/impl/jsonrpc/proxy.h" #define WF_DEFAULT_TIMEOUT (10 * 1000) diff --git a/lib/webfuse/provider/impl/client_protocol.h b/lib/webfuse_provider/impl/client_protocol.h similarity index 91% rename from lib/webfuse/provider/impl/client_protocol.h rename to lib/webfuse_provider/impl/client_protocol.h index d6dd8ab..39c3fa0 100644 --- a/lib/webfuse/provider/impl/client_protocol.h +++ b/lib/webfuse_provider/impl/client_protocol.h @@ -1,10 +1,10 @@ #ifndef WF_PROVIDER_IMPL_CLIENT_PROTOCOL_H #define WF_PROVIDER_IMPL_CLIENT_PROTOCOL_H -#include "webfuse/provider/impl/provider.h" -#include "webfuse/provider/impl/request.h" +#include "webfuse_provider/impl/provider.h" +#include "webfuse_provider/impl/request.h" -#include "webfuse/core/slist.h" +#include "webfuse_provider/impl/slist.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/container_of.h b/lib/webfuse_provider/impl/container_of.h similarity index 100% rename from lib/webfuse/core/container_of.h rename to lib/webfuse_provider/impl/container_of.h diff --git a/lib/webfuse/provider/impl/credentials.c b/lib/webfuse_provider/impl/credentials.c similarity index 95% rename from lib/webfuse/provider/impl/credentials.c rename to lib/webfuse_provider/impl/credentials.c index f2d254f..9c0a82c 100644 --- a/lib/webfuse/provider/impl/credentials.c +++ b/lib/webfuse_provider/impl/credentials.c @@ -1,4 +1,4 @@ -#include "webfuse/provider/impl/credentials.h" +#include "webfuse_provider/impl/credentials.h" #include #include diff --git a/lib/webfuse/provider/impl/credentials.h b/lib/webfuse_provider/impl/credentials.h similarity index 95% rename from lib/webfuse/provider/impl/credentials.h rename to lib/webfuse_provider/impl/credentials.h index 304b067..2ec8ae9 100644 --- a/lib/webfuse/provider/impl/credentials.h +++ b/lib/webfuse_provider/impl/credentials.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_CREDENTIALS_H #define WF_PROVIDER_IMPL_CREDENTIALS_H -#include "webfuse/provider/credentials.h" +#include "webfuse_provider/credentials.h" #include #ifdef __cplusplus diff --git a/lib/webfuse/provider/impl/dirbuffer.c b/lib/webfuse_provider/impl/dirbuffer.c similarity index 95% rename from lib/webfuse/provider/impl/dirbuffer.c rename to lib/webfuse_provider/impl/dirbuffer.c index 9bc5f22..0d4f51c 100644 --- a/lib/webfuse/provider/impl/dirbuffer.c +++ b/lib/webfuse_provider/impl/dirbuffer.c @@ -1,4 +1,4 @@ -#include "webfuse/provider/impl/dirbuffer.h" +#include "webfuse_provider/impl/dirbuffer.h" #include struct wfp_dirbuffer * wfp_impl_dirbuffer_create(void) diff --git a/lib/webfuse/provider/impl/dirbuffer.h b/lib/webfuse_provider/impl/dirbuffer.h similarity index 100% rename from lib/webfuse/provider/impl/dirbuffer.h rename to lib/webfuse_provider/impl/dirbuffer.h diff --git a/lib/webfuse/core/json_util.c b/lib/webfuse_provider/impl/json_util.c similarity index 91% rename from lib/webfuse/core/json_util.c rename to lib/webfuse_provider/impl/json_util.c index 535e07e..bbbbc4e 100644 --- a/lib/webfuse/core/json_util.c +++ b/lib/webfuse_provider/impl/json_util.c @@ -1,4 +1,4 @@ -#include "webfuse/core/json_util.h" +#include "webfuse_provider/impl/json_util.h" int wf_impl_json_get_int(json_t const * object, char const * key, int default_value) { diff --git a/lib/webfuse/core/json_util.h b/lib/webfuse_provider/impl/json_util.h similarity index 89% rename from lib/webfuse/core/json_util.h rename to lib/webfuse_provider/impl/json_util.h index db21ed1..61ec378 100644 --- a/lib/webfuse/core/json_util.h +++ b/lib/webfuse_provider/impl/json_util.h @@ -2,7 +2,7 @@ #define WF_JSON_UTIL_H #include -#include "webfuse/core/status.h" +#include "webfuse_provider/status.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/jsonrpc/error.c b/lib/webfuse_provider/impl/jsonrpc/error.c similarity index 91% rename from lib/webfuse/core/jsonrpc/error.c rename to lib/webfuse_provider/impl/jsonrpc/error.c index ad74a58..97ec33b 100644 --- a/lib/webfuse/core/jsonrpc/error.c +++ b/lib/webfuse_provider/impl/jsonrpc/error.c @@ -1,4 +1,4 @@ -#include "webfuse/core/jsonrpc/error.h" +#include "webfuse_provider/impl/jsonrpc/error.h" json_t * wf_jsonrpc_error( diff --git a/lib/webfuse/core/jsonrpc/error.h b/lib/webfuse_provider/impl/jsonrpc/error.h similarity index 86% rename from lib/webfuse/core/jsonrpc/error.h rename to lib/webfuse_provider/impl/jsonrpc/error.h index 2edfd92..4577589 100644 --- a/lib/webfuse/core/jsonrpc/error.h +++ b/lib/webfuse_provider/impl/jsonrpc/error.h @@ -2,7 +2,7 @@ #define WF_JSONRPC_ERROR_H #include -#include "webfuse/core/jsonrpc/proxy_finished_fn.h" +#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/jsonrpc/method.c b/lib/webfuse_provider/impl/jsonrpc/method.c similarity index 91% rename from lib/webfuse/core/jsonrpc/method.c rename to lib/webfuse_provider/impl/jsonrpc/method.c index a184dca..9d6ddd6 100644 --- a/lib/webfuse/core/jsonrpc/method.c +++ b/lib/webfuse_provider/impl/jsonrpc/method.c @@ -1,4 +1,4 @@ -#include "webfuse/core/jsonrpc/method.h" +#include "webfuse_provider/impl/jsonrpc/method.h" #include #include diff --git a/lib/webfuse/core/jsonrpc/method.h b/lib/webfuse_provider/impl/jsonrpc/method.h similarity index 89% rename from lib/webfuse/core/jsonrpc/method.h rename to lib/webfuse_provider/impl/jsonrpc/method.h index e196bff..00d9c53 100644 --- a/lib/webfuse/core/jsonrpc/method.h +++ b/lib/webfuse_provider/impl/jsonrpc/method.h @@ -1,7 +1,7 @@ #ifndef WF_JSONRPC_METHOD_H #define WF_JSONRPC_METHOD_H -#include "webfuse/core/jsonrpc/method_invoke_fn.h" +#include "webfuse_provider/impl/jsonrpc/method_invoke_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/jsonrpc/method_invoke_fn.h b/lib/webfuse_provider/impl/jsonrpc/method_invoke_fn.h similarity index 100% rename from lib/webfuse/core/jsonrpc/method_invoke_fn.h rename to lib/webfuse_provider/impl/jsonrpc/method_invoke_fn.h diff --git a/lib/webfuse/core/jsonrpc/proxy.c b/lib/webfuse_provider/impl/jsonrpc/proxy.c similarity index 95% rename from lib/webfuse/core/jsonrpc/proxy.c rename to lib/webfuse_provider/impl/jsonrpc/proxy.c index ee5fc0d..b45a5eb 100644 --- a/lib/webfuse/core/jsonrpc/proxy.c +++ b/lib/webfuse_provider/impl/jsonrpc/proxy.c @@ -1,9 +1,9 @@ -#include "webfuse/core/jsonrpc/proxy_intern.h" -#include "webfuse/core/jsonrpc/response_intern.h" -#include "webfuse/core/jsonrpc/error.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/jsonrpc/proxy_intern.h" +#include "webfuse_provider/impl/jsonrpc/response_intern.h" +#include "webfuse_provider/impl/jsonrpc/error.h" +#include "webfuse_provider/status.h" -#include "webfuse/core/timer/timer.h" +#include "webfuse_provider/impl/timer/timer.h" #include #include diff --git a/lib/webfuse/core/jsonrpc/proxy.h b/lib/webfuse_provider/impl/jsonrpc/proxy.h similarity index 93% rename from lib/webfuse/core/jsonrpc/proxy.h rename to lib/webfuse_provider/impl/jsonrpc/proxy.h index 8a69936..8cc8969 100644 --- a/lib/webfuse/core/jsonrpc/proxy.h +++ b/lib/webfuse_provider/impl/jsonrpc/proxy.h @@ -12,8 +12,8 @@ using std::size_t; #endif #include -#include "webfuse/core/jsonrpc/send_fn.h" -#include "webfuse/core/jsonrpc/proxy_finished_fn.h" +#include "webfuse_provider/impl/jsonrpc/send_fn.h" +#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h" #ifdef __cplusplus extern "C" { diff --git a/lib/webfuse/core/jsonrpc/proxy_finished_fn.h b/lib/webfuse_provider/impl/jsonrpc/proxy_finished_fn.h similarity index 100% rename from lib/webfuse/core/jsonrpc/proxy_finished_fn.h rename to lib/webfuse_provider/impl/jsonrpc/proxy_finished_fn.h diff --git a/lib/webfuse/core/jsonrpc/proxy_intern.h b/lib/webfuse_provider/impl/jsonrpc/proxy_intern.h similarity index 86% rename from lib/webfuse/core/jsonrpc/proxy_intern.h rename to lib/webfuse_provider/impl/jsonrpc/proxy_intern.h index fd284a0..4df73e5 100644 --- a/lib/webfuse/core/jsonrpc/proxy_intern.h +++ b/lib/webfuse_provider/impl/jsonrpc/proxy_intern.h @@ -1,9 +1,9 @@ #ifndef WF_JSONRPC_PROXY_INTERN_H #define WF_JSONRPC_PROXY_INTERN_H -#include "webfuse/core/jsonrpc/proxy.h" -#include "webfuse/core/jsonrpc/proxy_finished_fn.h" -#include "webfuse/core/jsonrpc/send_fn.h" +#include "webfuse_provider/impl/jsonrpc/proxy.h" +#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h" +#include "webfuse_provider/impl/jsonrpc/send_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/jsonrpc/proxy_variadic.c b/lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c similarity index 91% rename from lib/webfuse/core/jsonrpc/proxy_variadic.c rename to lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c index 2447511..b25bf6a 100644 --- a/lib/webfuse/core/jsonrpc/proxy_variadic.c +++ b/lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c @@ -1,4 +1,4 @@ -#include "webfuse/core/jsonrpc/proxy_intern.h" +#include "webfuse_provider/impl/jsonrpc/proxy_intern.h" void wf_jsonrpc_proxy_invoke( struct wf_jsonrpc_proxy * proxy, diff --git a/lib/webfuse/core/jsonrpc/request.c b/lib/webfuse_provider/impl/jsonrpc/request.c similarity index 94% rename from lib/webfuse/core/jsonrpc/request.c rename to lib/webfuse_provider/impl/jsonrpc/request.c index 30212bd..4f4c659 100644 --- a/lib/webfuse/core/jsonrpc/request.c +++ b/lib/webfuse_provider/impl/jsonrpc/request.c @@ -1,5 +1,5 @@ -#include "webfuse/core/jsonrpc/request.h" -#include "webfuse/core/jsonrpc/error.h" +#include "webfuse_provider/impl/jsonrpc/request.h" +#include "webfuse_provider/impl/jsonrpc/error.h" #include struct wf_jsonrpc_request diff --git a/lib/webfuse/core/jsonrpc/request.h b/lib/webfuse_provider/impl/jsonrpc/request.h similarity index 94% rename from lib/webfuse/core/jsonrpc/request.h rename to lib/webfuse_provider/impl/jsonrpc/request.h index 234ec62..66f1386 100644 --- a/lib/webfuse/core/jsonrpc/request.h +++ b/lib/webfuse_provider/impl/jsonrpc/request.h @@ -12,7 +12,7 @@ using std::size_t; #endif #include -#include "webfuse/core/jsonrpc/send_fn.h" +#include "webfuse_provider/impl/jsonrpc/send_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/jsonrpc/response.c b/lib/webfuse_provider/impl/jsonrpc/response.c similarity index 90% rename from lib/webfuse/core/jsonrpc/response.c rename to lib/webfuse_provider/impl/jsonrpc/response.c index 69f7033..355fe80 100644 --- a/lib/webfuse/core/jsonrpc/response.c +++ b/lib/webfuse_provider/impl/jsonrpc/response.c @@ -1,6 +1,6 @@ -#include "webfuse/core/jsonrpc/response_intern.h" -#include "webfuse/core/jsonrpc/error.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/jsonrpc/response_intern.h" +#include "webfuse_provider/impl/jsonrpc/error.h" +#include "webfuse_provider/status.h" bool wf_jsonrpc_is_response( diff --git a/lib/webfuse/core/jsonrpc/response.h b/lib/webfuse_provider/impl/jsonrpc/response.h similarity index 100% rename from lib/webfuse/core/jsonrpc/response.h rename to lib/webfuse_provider/impl/jsonrpc/response.h diff --git a/lib/webfuse/core/jsonrpc/response_intern.h b/lib/webfuse_provider/impl/jsonrpc/response_intern.h similarity index 90% rename from lib/webfuse/core/jsonrpc/response_intern.h rename to lib/webfuse_provider/impl/jsonrpc/response_intern.h index 137a615..de8044a 100644 --- a/lib/webfuse/core/jsonrpc/response_intern.h +++ b/lib/webfuse_provider/impl/jsonrpc/response_intern.h @@ -1,7 +1,7 @@ #ifndef WF_JSONRPC_RESPONSE_INTERN_H #define WF_JSONRPC_RESPONSE_INTERN_H -#include "webfuse/core/jsonrpc/response.h" +#include "webfuse_provider/impl/jsonrpc/response.h" #ifndef __cplusplus #include diff --git a/lib/webfuse/core/jsonrpc/send_fn.h b/lib/webfuse_provider/impl/jsonrpc/send_fn.h similarity index 100% rename from lib/webfuse/core/jsonrpc/send_fn.h rename to lib/webfuse_provider/impl/jsonrpc/send_fn.h diff --git a/lib/webfuse/core/jsonrpc/server.c b/lib/webfuse_provider/impl/jsonrpc/server.c similarity index 93% rename from lib/webfuse/core/jsonrpc/server.c rename to lib/webfuse_provider/impl/jsonrpc/server.c index 03e30ae..b93a303 100644 --- a/lib/webfuse/core/jsonrpc/server.c +++ b/lib/webfuse_provider/impl/jsonrpc/server.c @@ -1,8 +1,8 @@ -#include "webfuse/core/jsonrpc/server.h" -#include "webfuse/core/jsonrpc/method.h" -#include "webfuse/core/jsonrpc/request.h" -#include "webfuse/core/status.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/jsonrpc/server.h" +#include "webfuse_provider/impl/jsonrpc/method.h" +#include "webfuse_provider/impl/jsonrpc/request.h" +#include "webfuse_provider/status.h" +#include "webfuse_provider/impl/util.h" #include #include diff --git a/lib/webfuse/core/jsonrpc/server.h b/lib/webfuse_provider/impl/jsonrpc/server.h similarity index 87% rename from lib/webfuse/core/jsonrpc/server.h rename to lib/webfuse_provider/impl/jsonrpc/server.h index 143f121..17cfa09 100644 --- a/lib/webfuse/core/jsonrpc/server.h +++ b/lib/webfuse_provider/impl/jsonrpc/server.h @@ -9,8 +9,8 @@ #endif #include -#include "webfuse/core/jsonrpc/method_invoke_fn.h" -#include "webfuse/core/jsonrpc/send_fn.h" +#include "webfuse_provider/impl/jsonrpc/method_invoke_fn.h" +#include "webfuse_provider/impl/jsonrpc/send_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/lws_log.c b/lib/webfuse_provider/impl/lws_log.c similarity index 86% rename from lib/webfuse/core/lws_log.c rename to lib/webfuse_provider/impl/lws_log.c index 506e530..70a6499 100644 --- a/lib/webfuse/core/lws_log.c +++ b/lib/webfuse_provider/impl/lws_log.c @@ -1,4 +1,4 @@ -#include "webfuse/core/lws_log.h" +#include "webfuse_provider/impl/lws_log.h" #include #include diff --git a/lib/webfuse/core/lws_log.h b/lib/webfuse_provider/impl/lws_log.h similarity index 100% rename from lib/webfuse/core/lws_log.h rename to lib/webfuse_provider/impl/lws_log.h diff --git a/lib/webfuse/core/message.c b/lib/webfuse_provider/impl/message.c similarity index 93% rename from lib/webfuse/core/message.c rename to lib/webfuse_provider/impl/message.c index bfb0016..11fc67d 100644 --- a/lib/webfuse/core/message.c +++ b/lib/webfuse_provider/impl/message.c @@ -1,4 +1,4 @@ -#include "webfuse/core/message.h" +#include "webfuse_provider/impl/message.h" #include #include diff --git a/lib/webfuse/core/message.h b/lib/webfuse_provider/impl/message.h similarity index 91% rename from lib/webfuse/core/message.h rename to lib/webfuse_provider/impl/message.h index 7bd346b..4ee0304 100644 --- a/lib/webfuse/core/message.h +++ b/lib/webfuse_provider/impl/message.h @@ -9,7 +9,7 @@ using std::size_t; #endif #include -#include "webfuse/core/slist.h" +#include "webfuse_provider/impl/slist.h" struct wf_message { diff --git a/lib/webfuse/core/message_queue.c b/lib/webfuse_provider/impl/message_queue.c similarity index 73% rename from lib/webfuse/core/message_queue.c rename to lib/webfuse_provider/impl/message_queue.c index af641ff..5478e77 100644 --- a/lib/webfuse/core/message_queue.c +++ b/lib/webfuse_provider/impl/message_queue.c @@ -1,6 +1,6 @@ -#include "webfuse/core/message_queue.h" -#include "webfuse/core/message.h" -#include "webfuse/core/container_of.h" +#include "webfuse_provider/impl/message_queue.h" +#include "webfuse_provider/impl/message.h" +#include "webfuse_provider/impl/container_of.h" void wf_message_queue_cleanup( struct wf_slist * queue) diff --git a/lib/webfuse/core/message_queue.h b/lib/webfuse_provider/impl/message_queue.h similarity index 100% rename from lib/webfuse/core/message_queue.h rename to lib/webfuse_provider/impl/message_queue.h diff --git a/lib/webfuse/provider/impl/operation/close.c b/lib/webfuse_provider/impl/operation/close.c similarity index 92% rename from lib/webfuse/provider/impl/operation/close.c rename to lib/webfuse_provider/impl/operation/close.c index 3346fbc..c50c940 100644 --- a/lib/webfuse/provider/impl/operation/close.c +++ b/lib/webfuse_provider/impl/operation/close.c @@ -1,6 +1,6 @@ -#include "webfuse/provider/impl/operation/close.h" +#include "webfuse_provider/impl/operation/close.h" #include -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/util.h" void wfp_impl_close( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/operation/close.h b/lib/webfuse_provider/impl/operation/close.h similarity index 88% rename from lib/webfuse/provider/impl/operation/close.h rename to lib/webfuse_provider/impl/operation/close.h index da1548b..9928d8d 100644 --- a/lib/webfuse/provider/impl/operation/close.h +++ b/lib/webfuse_provider/impl/operation/close.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_CLOSE_H #define WF_PROVIDER_IMPL_OPERATION_CLOSE_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/error.h b/lib/webfuse_provider/impl/operation/error.h similarity index 79% rename from lib/webfuse/provider/impl/operation/error.h rename to lib/webfuse_provider/impl/operation/error.h index 5594ac1..d849ede 100644 --- a/lib/webfuse/provider/impl/operation/error.h +++ b/lib/webfuse_provider/impl/operation/error.h @@ -1,8 +1,8 @@ #ifndef WFP_OPERATION_IMPL_ERROR_H #define WFP_OPERATION_IMPL_ERROR_H -#include "webfuse/provider/api.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/api.h" +#include "webfuse_provider/status.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/getattr.c b/lib/webfuse_provider/impl/operation/getattr.c similarity index 90% rename from lib/webfuse/provider/impl/operation/getattr.c rename to lib/webfuse_provider/impl/operation/getattr.c index 467e99b..c9af90d 100644 --- a/lib/webfuse/provider/impl/operation/getattr.c +++ b/lib/webfuse_provider/impl/operation/getattr.c @@ -1,10 +1,10 @@ -#include "webfuse/provider/impl/operation/getattr.h" +#include "webfuse_provider/impl/operation/getattr.h" #include -#include "webfuse/provider/impl/operation/error.h" -#include "webfuse/provider/impl/request.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/operation/error.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/util.h" void wfp_impl_getattr( diff --git a/lib/webfuse/provider/impl/operation/getattr.h b/lib/webfuse_provider/impl/operation/getattr.h similarity index 90% rename from lib/webfuse/provider/impl/operation/getattr.h rename to lib/webfuse_provider/impl/operation/getattr.h index 40f3b1c..8d2616c 100644 --- a/lib/webfuse/provider/impl/operation/getattr.h +++ b/lib/webfuse_provider/impl/operation/getattr.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_GETATTR_H #define WF_PROVIDER_IMPL_OPERATION_GETATTR_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/lookup.c b/lib/webfuse_provider/impl/operation/lookup.c similarity index 91% rename from lib/webfuse/provider/impl/operation/lookup.c rename to lib/webfuse_provider/impl/operation/lookup.c index d2e89aa..43b7eb0 100644 --- a/lib/webfuse/provider/impl/operation/lookup.c +++ b/lib/webfuse_provider/impl/operation/lookup.c @@ -1,10 +1,10 @@ -#include "webfuse/provider/impl/operation/lookup.h" +#include "webfuse_provider/impl/operation/lookup.h" #include -#include "webfuse/provider/impl/operation/error.h" -#include "webfuse/provider/impl/request.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/operation/error.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/util.h" void wfp_impl_lookup( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/operation/lookup.h b/lib/webfuse_provider/impl/operation/lookup.h similarity index 91% rename from lib/webfuse/provider/impl/operation/lookup.h rename to lib/webfuse_provider/impl/operation/lookup.h index e0fca6f..db1c44a 100644 --- a/lib/webfuse/provider/impl/operation/lookup.h +++ b/lib/webfuse_provider/impl/operation/lookup.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_LOOKUP_H #define WF_PROVIDER_IMPL_OPERATION_LOOKUP_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/open.c b/lib/webfuse_provider/impl/operation/open.c similarity index 86% rename from lib/webfuse/provider/impl/operation/open.c rename to lib/webfuse_provider/impl/operation/open.c index a0ed9b1..1546b49 100644 --- a/lib/webfuse/provider/impl/operation/open.c +++ b/lib/webfuse_provider/impl/operation/open.c @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/operation/open.h" -#include "webfuse/provider/impl/operation/error.h" -#include "webfuse/provider/impl/request.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/operation/open.h" +#include "webfuse_provider/impl/operation/error.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/util.h" void wfp_impl_open( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/operation/open.h b/lib/webfuse_provider/impl/operation/open.h similarity index 90% rename from lib/webfuse/provider/impl/operation/open.h rename to lib/webfuse_provider/impl/operation/open.h index 22d74c8..3ccf243 100644 --- a/lib/webfuse/provider/impl/operation/open.h +++ b/lib/webfuse_provider/impl/operation/open.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_OPEN_H #define WF_PROVIDER_IMPL_OPERATION_OPEN_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/read.c b/lib/webfuse_provider/impl/operation/read.c similarity index 91% rename from lib/webfuse/provider/impl/operation/read.c rename to lib/webfuse_provider/impl/operation/read.c index 5c2b639..5b0487f 100644 --- a/lib/webfuse/provider/impl/operation/read.c +++ b/lib/webfuse_provider/impl/operation/read.c @@ -1,11 +1,11 @@ -#include "webfuse/provider/impl/operation/read.h" +#include "webfuse_provider/impl/operation/read.h" #include -#include "webfuse/provider/impl/operation/error.h" -#include "webfuse/provider/impl/request.h" -#include "webfuse/core/util.h" -#include "webfuse/core/base64.h" +#include "webfuse_provider/impl/operation/error.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/util.h" +#include "webfuse_provider/impl/base64.h" void wfp_impl_read( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/operation/read.h b/lib/webfuse_provider/impl/operation/read.h similarity index 91% rename from lib/webfuse/provider/impl/operation/read.h rename to lib/webfuse_provider/impl/operation/read.h index 5376ee6..7e29b75 100644 --- a/lib/webfuse/provider/impl/operation/read.h +++ b/lib/webfuse_provider/impl/operation/read.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_READ_H #define WF_PROVIDER_IMPL_OPERATION_READ_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/operation/readdir.c b/lib/webfuse_provider/impl/operation/readdir.c similarity index 80% rename from lib/webfuse/provider/impl/operation/readdir.c rename to lib/webfuse_provider/impl/operation/readdir.c index 63d59c1..92c169f 100644 --- a/lib/webfuse/provider/impl/operation/readdir.c +++ b/lib/webfuse_provider/impl/operation/readdir.c @@ -1,8 +1,8 @@ -#include "webfuse/provider/impl/operation/readdir.h" -#include "webfuse/provider/impl/operation/error.h" -#include "webfuse/provider/impl/dirbuffer.h" -#include "webfuse/provider/impl/request.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/impl/operation/readdir.h" +#include "webfuse_provider/impl/operation/error.h" +#include "webfuse_provider/impl/dirbuffer.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/util.h" void wfp_impl_readdir( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/operation/readdir.h b/lib/webfuse_provider/impl/operation/readdir.h similarity index 90% rename from lib/webfuse/provider/impl/operation/readdir.h rename to lib/webfuse_provider/impl/operation/readdir.h index 80e31af..62eadf0 100644 --- a/lib/webfuse/provider/impl/operation/readdir.h +++ b/lib/webfuse_provider/impl/operation/readdir.h @@ -1,7 +1,7 @@ #ifndef WF_PROVIDER_IMPL_OPERATION_READDIR_H #define WF_PROVIDER_IMPL_OPERATION_READDIR_H -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/provider/impl/provider.c b/lib/webfuse_provider/impl/provider.c similarity index 88% rename from lib/webfuse/provider/impl/provider.c rename to lib/webfuse_provider/impl/provider.c index 397a563..1042802 100644 --- a/lib/webfuse/provider/impl/provider.c +++ b/lib/webfuse_provider/impl/provider.c @@ -1,15 +1,15 @@ -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #include #include -#include "webfuse/provider/impl/request.h" -#include "webfuse/provider/impl/operation/lookup.h" -#include "webfuse/provider/impl/operation/getattr.h" -#include "webfuse/provider/impl/operation/readdir.h" -#include "webfuse/provider/impl/operation/open.h" -#include "webfuse/provider/impl/operation/close.h" -#include "webfuse/provider/impl/operation/read.h" +#include "webfuse_provider/impl/request.h" +#include "webfuse_provider/impl/operation/lookup.h" +#include "webfuse_provider/impl/operation/getattr.h" +#include "webfuse_provider/impl/operation/readdir.h" +#include "webfuse_provider/impl/operation/open.h" +#include "webfuse_provider/impl/operation/close.h" +#include "webfuse_provider/impl/operation/read.h" typedef void wfp_impl_invoke_fn( struct wfp_impl_invokation_context * context, diff --git a/lib/webfuse/provider/impl/provider.h b/lib/webfuse_provider/impl/provider.h similarity index 96% rename from lib/webfuse/provider/impl/provider.h rename to lib/webfuse_provider/impl/provider.h index aff4420..54f4020 100644 --- a/lib/webfuse/provider/impl/provider.h +++ b/lib/webfuse_provider/impl/provider.h @@ -6,7 +6,7 @@ #endif #include -#include "webfuse/provider/client_config.h" +#include "webfuse_provider/client_config.h" #ifdef __cplusplus diff --git a/lib/webfuse/provider/impl/request.c b/lib/webfuse_provider/impl/request.c similarity index 92% rename from lib/webfuse/provider/impl/request.c rename to lib/webfuse_provider/impl/request.c index 7f8b05f..95883df 100644 --- a/lib/webfuse/provider/impl/request.c +++ b/lib/webfuse_provider/impl/request.c @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/request.h" +#include "webfuse_provider/impl/request.h" #include -#include "webfuse/provider/impl/operation/error.h" +#include "webfuse_provider/impl/operation/error.h" struct wfp_request * wfp_impl_request_create( struct wfp_request * prototype, diff --git a/lib/webfuse/provider/impl/request.h b/lib/webfuse_provider/impl/request.h similarity index 90% rename from lib/webfuse/provider/impl/request.h rename to lib/webfuse_provider/impl/request.h index 8377a80..4feac3e 100644 --- a/lib/webfuse/provider/impl/request.h +++ b/lib/webfuse_provider/impl/request.h @@ -2,8 +2,8 @@ #define WF_PROVIDER_IMPL_REQUEST_H #include -#include "webfuse/provider/impl/provider.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/provider.h" +#include "webfuse_provider/status.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/slist.c b/lib/webfuse_provider/impl/slist.c similarity index 95% rename from lib/webfuse/core/slist.c rename to lib/webfuse_provider/impl/slist.c index c6896d7..a661984 100644 --- a/lib/webfuse/core/slist.c +++ b/lib/webfuse_provider/impl/slist.c @@ -1,4 +1,4 @@ -#include "webfuse/core/slist.h" +#include "webfuse_provider/impl/slist.h" #include void wf_slist_init( diff --git a/lib/webfuse/core/slist.h b/lib/webfuse_provider/impl/slist.h similarity index 100% rename from lib/webfuse/core/slist.h rename to lib/webfuse_provider/impl/slist.h diff --git a/lib/webfuse/core/status.c b/lib/webfuse_provider/impl/status.c similarity index 94% rename from lib/webfuse/core/status.c rename to lib/webfuse_provider/impl/status.c index d5bc7ba..2651306 100644 --- a/lib/webfuse/core/status.c +++ b/lib/webfuse_provider/impl/status.c @@ -1,4 +1,4 @@ -#include "webfuse/core/status_intern.h" +#include "webfuse_provider/impl/status_intern.h" #include diff --git a/lib/webfuse/core/status_intern.h b/lib/webfuse_provider/impl/status_intern.h similarity index 86% rename from lib/webfuse/core/status_intern.h rename to lib/webfuse_provider/impl/status_intern.h index fad0e0c..3972229 100644 --- a/lib/webfuse/core/status_intern.h +++ b/lib/webfuse_provider/impl/status_intern.h @@ -1,7 +1,7 @@ #ifndef WF_STATUS_INTERN_H #define WF_STATUS_INTERN_H -#include "webfuse/core/status.h" +#include "webfuse_provider/status.h" #ifdef __cplusplus extern "C" { diff --git a/lib/webfuse/core/timer/manager.c b/lib/webfuse_provider/impl/timer/manager.c similarity index 91% rename from lib/webfuse/core/timer/manager.c rename to lib/webfuse_provider/impl/timer/manager.c index 99540e9..28d93f4 100644 --- a/lib/webfuse/core/timer/manager.c +++ b/lib/webfuse_provider/impl/timer/manager.c @@ -1,6 +1,6 @@ -#include "webfuse/core/timer/manager_intern.h" -#include "webfuse/core/timer/timer_intern.h" -#include "webfuse/core/timer/timepoint.h" +#include "webfuse_provider/impl/timer/manager_intern.h" +#include "webfuse_provider/impl/timer/timer_intern.h" +#include "webfuse_provider/impl/timer/timepoint.h" #include #include diff --git a/lib/webfuse/core/timer/manager.h b/lib/webfuse_provider/impl/timer/manager.h similarity index 100% rename from lib/webfuse/core/timer/manager.h rename to lib/webfuse_provider/impl/timer/manager.h diff --git a/lib/webfuse/core/timer/manager_intern.h b/lib/webfuse_provider/impl/timer/manager_intern.h similarity index 88% rename from lib/webfuse/core/timer/manager_intern.h rename to lib/webfuse_provider/impl/timer/manager_intern.h index 473df2b..6675483 100644 --- a/lib/webfuse/core/timer/manager_intern.h +++ b/lib/webfuse_provider/impl/timer/manager_intern.h @@ -1,7 +1,7 @@ #ifndef WF_TIMER_MANAGER_INTERN_H #define WF_TIMER_MANAGER_INTERN_H -#include "webfuse/core/timer/manager.h" +#include "webfuse_provider/impl/timer/manager.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/timer/on_timer_fn.h b/lib/webfuse_provider/impl/timer/on_timer_fn.h similarity index 100% rename from lib/webfuse/core/timer/on_timer_fn.h rename to lib/webfuse_provider/impl/timer/on_timer_fn.h diff --git a/lib/webfuse/core/timer/timepoint.c b/lib/webfuse_provider/impl/timer/timepoint.c similarity index 94% rename from lib/webfuse/core/timer/timepoint.c rename to lib/webfuse_provider/impl/timer/timepoint.c index 09fc025..620cea1 100644 --- a/lib/webfuse/core/timer/timepoint.c +++ b/lib/webfuse_provider/impl/timer/timepoint.c @@ -1,4 +1,4 @@ -#include "webfuse/core/timer/timepoint.h" +#include "webfuse_provider/impl/timer/timepoint.h" #include diff --git a/lib/webfuse/core/timer/timepoint.h b/lib/webfuse_provider/impl/timer/timepoint.h similarity index 100% rename from lib/webfuse/core/timer/timepoint.h rename to lib/webfuse_provider/impl/timer/timepoint.h diff --git a/lib/webfuse/core/timer/timer.c b/lib/webfuse_provider/impl/timer/timer.c similarity index 87% rename from lib/webfuse/core/timer/timer.c rename to lib/webfuse_provider/impl/timer/timer.c index 1f4d650..fb454b1 100644 --- a/lib/webfuse/core/timer/timer.c +++ b/lib/webfuse_provider/impl/timer/timer.c @@ -1,6 +1,6 @@ -#include "webfuse/core/timer/timer_intern.h" -#include "webfuse/core/timer/manager_intern.h" -#include "webfuse/core/timer/timepoint.h" +#include "webfuse_provider/impl/timer/timer_intern.h" +#include "webfuse_provider/impl/timer/manager_intern.h" +#include "webfuse_provider/impl/timer/timepoint.h" #include #include diff --git a/lib/webfuse/core/timer/timer.h b/lib/webfuse_provider/impl/timer/timer.h similarity index 90% rename from lib/webfuse/core/timer/timer.h rename to lib/webfuse_provider/impl/timer/timer.h index 48149bd..c07d166 100644 --- a/lib/webfuse/core/timer/timer.h +++ b/lib/webfuse_provider/impl/timer/timer.h @@ -1,7 +1,7 @@ #ifndef WF_TIMER_TIMER_H #define WF_TIMER_TIMER_H -#include "webfuse/core/timer/on_timer_fn.h" +#include "webfuse_provider/impl/timer/on_timer_fn.h" #ifdef __cplusplus extern "C" diff --git a/lib/webfuse/core/timer/timer_intern.h b/lib/webfuse_provider/impl/timer/timer_intern.h similarity index 77% rename from lib/webfuse/core/timer/timer_intern.h rename to lib/webfuse_provider/impl/timer/timer_intern.h index c910a3b..c9d9b10 100644 --- a/lib/webfuse/core/timer/timer_intern.h +++ b/lib/webfuse_provider/impl/timer/timer_intern.h @@ -1,9 +1,9 @@ #ifndef WF_TIMER_TIMER_H #define WF_TIMER_TIMER_H -#include "webfuse/core/timer/timer.h" -#include "webfuse/core/timer/on_timer_fn.h" -#include "webfuse/core/timer/timepoint.h" +#include "webfuse_provider/impl/timer/timer.h" +#include "webfuse_provider/impl/timer/on_timer_fn.h" +#include "webfuse_provider/impl/timer/timepoint.h" #ifndef __cplusplus #include diff --git a/lib/webfuse/core/url.c b/lib/webfuse_provider/impl/url.c similarity index 98% rename from lib/webfuse/core/url.c rename to lib/webfuse_provider/impl/url.c index 6556362..98f8c8e 100644 --- a/lib/webfuse/core/url.c +++ b/lib/webfuse_provider/impl/url.c @@ -1,4 +1,4 @@ -#include "webfuse/core/url.h" +#include "webfuse_provider/impl/url.h" #include #include diff --git a/lib/webfuse/core/url.h b/lib/webfuse_provider/impl/url.h similarity index 100% rename from lib/webfuse/core/url.h rename to lib/webfuse_provider/impl/url.h diff --git a/lib/webfuse/core/util.h b/lib/webfuse_provider/impl/util.h similarity index 100% rename from lib/webfuse/core/util.h rename to lib/webfuse_provider/impl/util.h diff --git a/meson.build b/meson.build index a4d39e0..fe69b6d 100644 --- a/meson.build +++ b/meson.build @@ -14,82 +14,64 @@ jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'ja pkg_config = import('pkgconfig') -# Webfuse core - -inc_dir = include_directories('include') -private_inc_dir = include_directories('include', 'lib') - -webfuse_core = static_library('webfuse_core', - 'lib/webfuse/core/slist.c', - 'lib/webfuse/core/message.c', - 'lib/webfuse/core/message_queue.c', - 'lib/webfuse/core/status.c', - 'lib/webfuse/core/base64.c', - 'lib/webfuse/core/lws_log.c', - 'lib/webfuse/core/json_util.c', - 'lib/webfuse/core/url.c', - 'lib/webfuse/core/timer/manager.c', - 'lib/webfuse/core/timer/timepoint.c', - 'lib/webfuse/core/timer/timer.c', - 'lib/webfuse/core/jsonrpc/proxy.c', - 'lib/webfuse/core/jsonrpc/proxy_variadic.c', - 'lib/webfuse/core/jsonrpc/server.c', - 'lib/webfuse/core/jsonrpc/method.c', - 'lib/webfuse/core/jsonrpc/request.c', - 'lib/webfuse/core/jsonrpc/response.c', - 'lib/webfuse/core/jsonrpc/error.c', - c_args: ['-fvisibility=hidden'], - include_directories: private_inc_dir, - dependencies: [jansson_dep, libwebsockets_dep]) - -webfuse_core_dep = declare_dependency( - include_directories: inc_dir, - link_with: webfuse_core, - dependencies: [jansson_dep, libwebsockets_dep]) - -install_subdir('include/webfuse/core', install_dir: 'include/webfuse') - # Webfuse provider webfuse_provider_static = static_library('webfuse_provider', - 'lib/webfuse/provider/api.c', - 'lib/webfuse/provider/impl/client.c', - 'lib/webfuse/provider/impl/client_config.c', - 'lib/webfuse/provider/impl/client_protocol.c', - 'lib/webfuse/provider/impl/provider.c', - 'lib/webfuse/provider/impl/request.c', - 'lib/webfuse/provider/impl/dirbuffer.c', - 'lib/webfuse/provider/impl/credentials.c', - 'lib/webfuse/provider/impl/operation/lookup.c', - 'lib/webfuse/provider/impl/operation/getattr.c', - 'lib/webfuse/provider/impl/operation/readdir.c', - 'lib/webfuse/provider/impl/operation/open.c', - 'lib/webfuse/provider/impl/operation/close.c', - 'lib/webfuse/provider/impl/operation/read.c', + 'lib/webfuse_provider/impl/slist.c', + 'lib/webfuse_provider/impl/message.c', + 'lib/webfuse_provider/impl/message_queue.c', + 'lib/webfuse_provider/impl/status.c', + 'lib/webfuse_provider/impl/base64.c', + 'lib/webfuse_provider/impl/lws_log.c', + 'lib/webfuse_provider/impl/json_util.c', + 'lib/webfuse_provider/impl/url.c', + 'lib/webfuse_provider/impl/timer/manager.c', + 'lib/webfuse_provider/impl/timer/timepoint.c', + 'lib/webfuse_provider/impl/timer/timer.c', + 'lib/webfuse_provider/impl/jsonrpc/proxy.c', + 'lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c', + 'lib/webfuse_provider/impl/jsonrpc/server.c', + 'lib/webfuse_provider/impl/jsonrpc/method.c', + 'lib/webfuse_provider/impl/jsonrpc/request.c', + 'lib/webfuse_provider/impl/jsonrpc/response.c', + 'lib/webfuse_provider/impl/jsonrpc/error.c', + 'lib/webfuse_provider/api.c', + 'lib/webfuse_provider/impl/client.c', + 'lib/webfuse_provider/impl/client_config.c', + 'lib/webfuse_provider/impl/client_protocol.c', + 'lib/webfuse_provider/impl/provider.c', + 'lib/webfuse_provider/impl/request.c', + 'lib/webfuse_provider/impl/dirbuffer.c', + 'lib/webfuse_provider/impl/credentials.c', + 'lib/webfuse_provider/impl/operation/lookup.c', + 'lib/webfuse_provider/impl/operation/getattr.c', + 'lib/webfuse_provider/impl/operation/readdir.c', + 'lib/webfuse_provider/impl/operation/open.c', + 'lib/webfuse_provider/impl/operation/close.c', + 'lib/webfuse_provider/impl/operation/read.c', c_args: ['-fvisibility=hidden'], - include_directories: private_inc_dir, - dependencies: [webfuse_core_dep]) + include_directories: ['include', 'lib'], + dependencies: [libwebsockets_dep, jansson_dep]) webfuse_provider_static_dep = declare_dependency( - include_directories: inc_dir, + include_directories: ['include'], link_with: webfuse_provider_static, - dependencies: [webfuse_core_dep]) + dependencies: [libwebsockets_dep, jansson_dep]) webfuse_provider = shared_library('webfuse_provider', - 'lib/webfuse/provider/api.c', + 'lib/webfuse_provider/api.c', version: meson.project_version(), c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'], - include_directories: private_inc_dir, - dependencies: [webfuse_provider_static_dep], + include_directories: ['include', 'lib'], + dependencies: [webfuse_provider_static_dep, libwebsockets_dep, jansson_dep], install: true) webfuse_provider_dep = declare_dependency( - include_directories: inc_dir, + include_directories: ['include'], link_with: [webfuse_provider], dependencies: [libwebsockets_dep, jansson_dep]) -install_headers('include/webfuse_provider.h', subdir: 'webfuse') -install_subdir('include/webfuse/provider', install_dir: 'include/webfuse') +install_subdir('include/webfuse_provider', install_dir: 'include') pkg_config.generate( libraries: [webfuse_provider], @@ -109,7 +91,7 @@ gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_ gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_dep']) fscheck = executable('fs_check', - 'test/webfuse/tests/integration/fs_check.c') + 'test/webfuse_provider/tests/integration/fs_check.c') openssl = find_program('openssl') test_server_certs = custom_target('test_server_certs', @@ -123,46 +105,46 @@ test_certs_dep = declare_dependency( sources: [test_server_certs, test_client_certs]) alltests = executable('alltests', - 'test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc', - 'test/webfuse/tests/core/jsonrpc/mock_timer.cc', - 'test/webfuse/tests/core/jsonrpc/test_is_request.cc', - 'test/webfuse/tests/core/jsonrpc/test_request.cc', - 'test/webfuse/tests/core/jsonrpc/test_is_response.cc', - 'test/webfuse/tests/core/jsonrpc/test_response.cc', - 'test/webfuse/tests/core/jsonrpc/test_server.cc', - 'test/webfuse/tests/core/jsonrpc/test_proxy.cc', - 'test/webfuse/tests/core/jsonrpc/test_response_parser.cc', - 'test/webfuse/tests/core/timer/test_timepoint.cc', - 'test/webfuse/tests/core/timer/test_timer.cc', - 'test/webfuse/utils/tempdir.cc', - 'test/webfuse/utils/file_utils.cc', - 'test/webfuse/utils/timeout_watcher.cc', - 'test/webfuse/utils/path.c', - 'test/webfuse/utils/static_filesystem.c', - 'test/webfuse/utils/ws_server.cc', - 'test/webfuse/utils/ws_server2.cc', - 'test/webfuse/utils/jansson_test_environment.cc', - 'test/webfuse/mocks/fake_invokation_context.cc', - 'test/webfuse/mocks/mock_request.cc', - 'test/webfuse/mocks/mock_provider_client.cc', - 'test/webfuse/mocks/mock_provider.cc', - 'test/webfuse/mocks/mock_jsonrpc_proxy.cc', - 'test/webfuse//tests/core/test_util.cc', - 'test/webfuse/tests/core/test_container_of.cc', - 'test/webfuse/tests/core/test_slist.cc', - 'test/webfuse/tests/core/test_base64.cc', - 'test/webfuse/tests/core/test_status.cc', - 'test/webfuse/tests/core/test_message.cc', - 'test/webfuse/tests/core/test_message_queue.cc', - 'test/webfuse/tests/core/test_url.cc', - 'test/webfuse/tests/provider/test_client_protocol.cc', - 'test/webfuse/tests/provider/test_dirbuffer.cc', - 'test/webfuse/tests/provider/operation/test_close.cc', - 'test/webfuse/tests/provider/operation/test_getattr.cc', - 'test/webfuse/tests/provider/operation/test_lookup.cc', - 'test/webfuse/tests/provider/operation/test_open.cc', - 'test/webfuse/tests/provider/operation/test_read.cc', - 'test/webfuse/tests/provider/operation/test_readdir.cc', + 'test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc', + 'test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_request.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_response.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_server.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc', + 'test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc', + 'test/webfuse_provider/tests/core/timer/test_timepoint.cc', + 'test/webfuse_provider/tests/core/timer/test_timer.cc', + 'test/webfuse_provider/utils/tempdir.cc', + 'test/webfuse_provider/utils/file_utils.cc', + 'test/webfuse_provider/utils/timeout_watcher.cc', + 'test/webfuse_provider/utils/path.c', + 'test/webfuse_provider/utils/static_filesystem.c', + 'test/webfuse_provider/utils/ws_server.cc', + 'test/webfuse_provider/utils/ws_server2.cc', + 'test/webfuse_provider/utils/jansson_test_environment.cc', + 'test/webfuse_provider/mocks/fake_invokation_context.cc', + 'test/webfuse_provider/mocks/mock_request.cc', + 'test/webfuse_provider/mocks/mock_provider_client.cc', + 'test/webfuse_provider/mocks/mock_provider.cc', + 'test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc', + 'test/webfuse_provider//tests/core/test_util.cc', + 'test/webfuse_provider/tests/core/test_container_of.cc', + 'test/webfuse_provider/tests/core/test_slist.cc', + 'test/webfuse_provider/tests/core/test_base64.cc', + 'test/webfuse_provider/tests/core/test_status.cc', + 'test/webfuse_provider/tests/core/test_message.cc', + 'test/webfuse_provider/tests/core/test_message_queue.cc', + 'test/webfuse_provider/tests/core/test_url.cc', + 'test/webfuse_provider/tests/provider/test_client_protocol.cc', + 'test/webfuse_provider/tests/provider/test_dirbuffer.cc', + 'test/webfuse_provider/tests/provider/operation/test_close.cc', + 'test/webfuse_provider/tests/provider/operation/test_getattr.cc', + 'test/webfuse_provider/tests/provider/operation/test_lookup.cc', + 'test/webfuse_provider/tests/provider/operation/test_open.cc', + 'test/webfuse_provider/tests/provider/operation/test_read.cc', + 'test/webfuse_provider/tests/provider/operation/test_readdir.cc', link_args: [ '-Wl,--wrap=wf_timer_manager_create', '-Wl,--wrap=wf_timer_manager_dispose', @@ -175,10 +157,9 @@ alltests = executable('alltests', '-Wl,--wrap=wf_jsonrpc_proxy_vinvoke', '-Wl,--wrap=wf_jsonrpc_proxy_vnotify', ], - include_directories: [private_inc_dir, 'test'], + include_directories: ['include', 'lib', 'test'], dependencies: [ webfuse_provider_static_dep, - webfuse_core_dep, libwebsockets_dep, jansson_dep, gtest_dep, @@ -195,13 +176,13 @@ endif if not without_examples executable('webfuse-provider', - 'examples/src/main.c', + 'examples/provider/main.c', dependencies: [webfuse_provider_dep]) executable('static-filesystem-provider', - 'examples/src/static_filesystem/static_filesystem.c', - 'examples/src/static_filesystem/path.c', - 'examples/src/static_filesystem/main.c', + 'examples/static_filesystem/static_filesystem.c', + 'examples/static_filesystem/path.c', + 'examples/static_filesystem/main.c', dependencies: [webfuse_provider_dep]) diff --git a/test/json_matcher.hpp b/test/webfuse_provider/json_matcher.hpp similarity index 100% rename from test/json_matcher.hpp rename to test/webfuse_provider/json_matcher.hpp diff --git a/test/webfuse/mocks/fake_invokation_context.cc b/test/webfuse_provider/mocks/fake_invokation_context.cc similarity index 81% rename from test/webfuse/mocks/fake_invokation_context.cc rename to test/webfuse_provider/mocks/fake_invokation_context.cc index 4aea3ee..1d5343c 100644 --- a/test/webfuse/mocks/fake_invokation_context.cc +++ b/test/webfuse_provider/mocks/fake_invokation_context.cc @@ -1,4 +1,4 @@ -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" namespace webfuse_test { diff --git a/test/webfuse/mocks/fake_invokation_context.hpp b/test/webfuse_provider/mocks/fake_invokation_context.hpp similarity index 67% rename from test/webfuse/mocks/fake_invokation_context.hpp rename to test/webfuse_provider/mocks/fake_invokation_context.hpp index 07eb971..fcf0adc 100644 --- a/test/webfuse/mocks/fake_invokation_context.hpp +++ b/test/webfuse_provider/mocks/fake_invokation_context.hpp @@ -1,8 +1,8 @@ #ifndef FAKE_INVOCATION_CONTEXT_HPP #define FAKE_INVOCATION_CONTEXT_HPP -#include "webfuse/provider/impl/provider.h" -#include "webfuse/mocks/mock_provider.hpp" +#include "webfuse_provider/impl/provider.h" +#include "webfuse_provider/mocks/mock_provider.hpp" namespace webfuse_test { diff --git a/test/webfuse/mocks/lookup_matcher.hpp b/test/webfuse_provider/mocks/lookup_matcher.hpp similarity index 100% rename from test/webfuse/mocks/lookup_matcher.hpp rename to test/webfuse_provider/mocks/lookup_matcher.hpp diff --git a/test/webfuse/mocks/mock_invokation_handler.hpp b/test/webfuse_provider/mocks/mock_invokation_handler.hpp similarity index 100% rename from test/webfuse/mocks/mock_invokation_handler.hpp rename to test/webfuse_provider/mocks/mock_invokation_handler.hpp diff --git a/test/webfuse/mocks/mock_jsonrpc_proxy.cc b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc similarity index 85% rename from test/webfuse/mocks/mock_jsonrpc_proxy.cc rename to test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc index 3fb243e..68e23e9 100644 --- a/test/webfuse/mocks/mock_jsonrpc_proxy.cc +++ b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc @@ -1,5 +1,5 @@ -#include "webfuse/mocks/mock_jsonrpc_proxy.hpp" -#include "webfuse/utils/wrap.hpp" +#include "webfuse_provider/mocks/mock_jsonrpc_proxy.hpp" +#include "webfuse_provider/utils/wrap.hpp" extern "C" { diff --git a/test/webfuse/mocks/mock_jsonrpc_proxy.hpp b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.hpp similarity index 91% rename from test/webfuse/mocks/mock_jsonrpc_proxy.hpp rename to test/webfuse_provider/mocks/mock_jsonrpc_proxy.hpp index 74d61af..2c5b84c 100644 --- a/test/webfuse/mocks/mock_jsonrpc_proxy.hpp +++ b/test/webfuse_provider/mocks/mock_jsonrpc_proxy.hpp @@ -1,7 +1,7 @@ #ifndef MOCK_JSONRPC_PROXY_HPP #define MOCK_JSONRPC_PROXY_HPP -#include "webfuse/core/jsonrpc/proxy_intern.h" +#include "webfuse_provider/impl/jsonrpc/proxy_intern.h" #include namespace webfuse_test diff --git a/test/webfuse/mocks/mock_operation_context.cc b/test/webfuse_provider/mocks/mock_operation_context.cc similarity index 89% rename from test/webfuse/mocks/mock_operation_context.cc rename to test/webfuse_provider/mocks/mock_operation_context.cc index 9537533..781b077 100644 --- a/test/webfuse/mocks/mock_operation_context.cc +++ b/test/webfuse_provider/mocks/mock_operation_context.cc @@ -1,4 +1,4 @@ -#include "webfuse/mocks/mock_operation_context.hpp" +#include "webfuse_provider/mocks/mock_operation_context.hpp" #include "webfuse/utils/wrap.hpp" extern "C" diff --git a/test/webfuse/mocks/mock_operation_context.hpp b/test/webfuse_provider/mocks/mock_operation_context.hpp similarity index 100% rename from test/webfuse/mocks/mock_operation_context.hpp rename to test/webfuse_provider/mocks/mock_operation_context.hpp diff --git a/test/webfuse/mocks/mock_provider.cc b/test/webfuse_provider/mocks/mock_provider.cc similarity index 98% rename from test/webfuse/mocks/mock_provider.cc rename to test/webfuse_provider/mocks/mock_provider.cc index 1aab4cf..ccce595 100644 --- a/test/webfuse/mocks/mock_provider.cc +++ b/test/webfuse_provider/mocks/mock_provider.cc @@ -1,4 +1,4 @@ -#include "webfuse/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" extern "C" { diff --git a/test/webfuse/mocks/mock_provider.hpp b/test/webfuse_provider/mocks/mock_provider.hpp similarity index 95% rename from test/webfuse/mocks/mock_provider.hpp rename to test/webfuse_provider/mocks/mock_provider.hpp index 1f03b08..d201ef2 100644 --- a/test/webfuse/mocks/mock_provider.hpp +++ b/test/webfuse_provider/mocks/mock_provider.hpp @@ -1,7 +1,7 @@ #ifndef WF_MOCK_PROVIDER_HPP #define WF_MOCK_PROVIDER_HPP -#include "webfuse/provider/impl/provider.h" +#include "webfuse_provider/impl/provider.h" #include namespace webfuse_test diff --git a/test/webfuse/mocks/mock_provider_client.cc b/test/webfuse_provider/mocks/mock_provider_client.cc similarity index 97% rename from test/webfuse/mocks/mock_provider_client.cc rename to test/webfuse_provider/mocks/mock_provider_client.cc index 779c0ef..bb138e5 100644 --- a/test/webfuse/mocks/mock_provider_client.cc +++ b/test/webfuse_provider/mocks/mock_provider_client.cc @@ -1,6 +1,6 @@ -#include "webfuse/mocks/mock_provider_client.hpp" -#include "webfuse/provider/operation/error.h" -#include "webfuse/provider/dirbuffer.h" +#include "webfuse_provider/mocks/mock_provider_client.hpp" +#include "webfuse_provider/operation/error.h" +#include "webfuse_provider/dirbuffer.h" extern "C" { diff --git a/test/webfuse/mocks/mock_provider_client.hpp b/test/webfuse_provider/mocks/mock_provider_client.hpp similarity index 96% rename from test/webfuse/mocks/mock_provider_client.hpp rename to test/webfuse_provider/mocks/mock_provider_client.hpp index b60e743..06caa6b 100644 --- a/test/webfuse/mocks/mock_provider_client.hpp +++ b/test/webfuse_provider/mocks/mock_provider_client.hpp @@ -2,8 +2,8 @@ #define WF_MOCK_PROVIDER_CLIENT_HPP #include -#include "webfuse/provider/client_config.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/client_config.h" +#include "webfuse_provider/status.h" #include namespace webfuse_test diff --git a/test/webfuse/mocks/mock_request.cc b/test/webfuse_provider/mocks/mock_request.cc similarity index 94% rename from test/webfuse/mocks/mock_request.cc rename to test/webfuse_provider/mocks/mock_request.cc index 5b31c63..c1423d0 100644 --- a/test/webfuse/mocks/mock_request.cc +++ b/test/webfuse_provider/mocks/mock_request.cc @@ -1,4 +1,4 @@ -#include "webfuse/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_request.hpp" #include extern "C" diff --git a/test/webfuse/mocks/mock_request.hpp b/test/webfuse_provider/mocks/mock_request.hpp similarity index 98% rename from test/webfuse/mocks/mock_request.hpp rename to test/webfuse_provider/mocks/mock_request.hpp index 0582d6a..5c517c9 100644 --- a/test/webfuse/mocks/mock_request.hpp +++ b/test/webfuse_provider/mocks/mock_request.hpp @@ -4,7 +4,7 @@ #include #include #include -#include "webfuse/provider/impl/request.h" +#include "webfuse_provider/impl/request.h" namespace webfuse_test diff --git a/test/webfuse/tests/core/jsonrpc/mock_timer.cc b/test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc similarity index 88% rename from test/webfuse/tests/core/jsonrpc/mock_timer.cc rename to test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc index 3cf8e74..0af9372 100644 --- a/test/webfuse/tests/core/jsonrpc/mock_timer.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc @@ -1,5 +1,5 @@ -#include "webfuse/tests/core/jsonrpc/mock_timer.hpp" -#include "webfuse/utils/wrap.hpp" +#include "webfuse_provider/tests/core/jsonrpc/mock_timer.hpp" +#include "webfuse_provider/utils/wrap.hpp" extern "C" { diff --git a/test/webfuse/tests/core/jsonrpc/mock_timer.hpp b/test/webfuse_provider/tests/core/jsonrpc/mock_timer.hpp similarity index 93% rename from test/webfuse/tests/core/jsonrpc/mock_timer.hpp rename to test/webfuse_provider/tests/core/jsonrpc/mock_timer.hpp index 5c95852..5e1753f 100644 --- a/test/webfuse/tests/core/jsonrpc/mock_timer.hpp +++ b/test/webfuse_provider/tests/core/jsonrpc/mock_timer.hpp @@ -1,8 +1,8 @@ #ifndef WF_JSONRPC_MOCK_TIMERMANAGER_HPP #define WF_JSONRPC_MOCK_TIMERMANAGER_HPP -#include "webfuse/core/timer/timer.h" -#include "webfuse/core/timer/manager.h" +#include "webfuse_provider/impl/timer/timer.h" +#include "webfuse_provider/impl/timer/manager.h" #include namespace wf_jsonrpc_test diff --git a/test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc b/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc similarity index 89% rename from test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc rename to test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc index 7e62c31..d6709ca 100644 --- a/test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc @@ -1,4 +1,4 @@ -#include "webfuse/tests/core/jsonrpc/mock_timer_callback.hpp" +#include "webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp" extern "C" { diff --git a/test/webfuse/tests/core/jsonrpc/mock_timer_callback.hpp b/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp similarity index 87% rename from test/webfuse/tests/core/jsonrpc/mock_timer_callback.hpp rename to test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp index e55b7e1..ef8fc72 100644 --- a/test/webfuse/tests/core/jsonrpc/mock_timer_callback.hpp +++ b/test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.hpp @@ -1,7 +1,7 @@ #ifndef WF_JSONRPC_MOCK_TIMERCALLBACK_HPP #define WF_JSONRPC_MOCK_TIMERCALLBACK_HPP -#include "webfuse/core/timer/on_timer_fn.h" +#include "webfuse_provider/impl/timer/on_timer_fn.h" #include namespace wf_jsonrpc_test diff --git a/test/webfuse/tests/core/jsonrpc/test_is_request.cc b/test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc similarity index 98% rename from test/webfuse/tests/core/jsonrpc/test_is_request.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc index 4599611..2a3636d 100644 --- a/test/webfuse/tests/core/jsonrpc/test_is_request.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/jsonrpc/request.h" +#include "webfuse_provider/impl/jsonrpc/request.h" TEST(wf_jsonrpc_is_request, request_with_object_params) { diff --git a/test/webfuse/tests/core/jsonrpc/test_is_response.cc b/test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc similarity index 97% rename from test/webfuse/tests/core/jsonrpc/test_is_response.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc index 908ddf0..914647a 100644 --- a/test/webfuse/tests/core/jsonrpc/test_is_response.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/jsonrpc/response.h" +#include "webfuse_provider/impl/jsonrpc/response.h" TEST(wf_jsonrpc_is_response, valid_result) { diff --git a/test/webfuse/tests/core/jsonrpc/test_proxy.cc b/test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc similarity index 98% rename from test/webfuse/tests/core/jsonrpc/test_proxy.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc index e594e89..2449db3 100644 --- a/test/webfuse/tests/core/jsonrpc/test_proxy.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc @@ -1,9 +1,9 @@ #include -#include "webfuse/core/jsonrpc/proxy.h" -#include "webfuse/core/status.h" -#include "webfuse/core/timer/manager.h" +#include "webfuse_provider/impl/jsonrpc/proxy.h" +#include "webfuse_provider/status.h" +#include "webfuse_provider/impl/timer/manager.h" -#include "webfuse/tests/core/jsonrpc/mock_timer.hpp" +#include "webfuse_provider/tests/core/jsonrpc/mock_timer.hpp" #include #include diff --git a/test/webfuse/tests/core/jsonrpc/test_request.cc b/test/webfuse_provider/tests/core/jsonrpc/test_request.cc similarity index 97% rename from test/webfuse/tests/core/jsonrpc/test_request.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_request.cc index 8d37a9f..aaf5e25 100644 --- a/test/webfuse/tests/core/jsonrpc/test_request.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_request.cc @@ -1,6 +1,6 @@ #include -#include "webfuse/core/jsonrpc/request.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/jsonrpc/request.h" +#include "webfuse_provider/status.h" namespace { diff --git a/test/webfuse/tests/core/jsonrpc/test_response.cc b/test/webfuse_provider/tests/core/jsonrpc/test_response.cc similarity index 98% rename from test/webfuse/tests/core/jsonrpc/test_response.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_response.cc index f6ef9e7..412893a 100644 --- a/test/webfuse/tests/core/jsonrpc/test_response.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_response.cc @@ -1,6 +1,6 @@ #include -#include "webfuse/core/jsonrpc/response_intern.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/jsonrpc/response_intern.h" +#include "webfuse_provider/status.h" TEST(wf_json_response, init_result) { diff --git a/test/webfuse/tests/core/jsonrpc/test_response_parser.cc b/test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc similarity index 96% rename from test/webfuse/tests/core/jsonrpc/test_response_parser.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc index f9941c1..f7c92be 100644 --- a/test/webfuse/tests/core/jsonrpc/test_response_parser.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc @@ -1,7 +1,7 @@ #include #include -#include "webfuse/core/jsonrpc/response_intern.h" +#include "webfuse_provider/impl/jsonrpc/response_intern.h" static void response_parse_str( diff --git a/test/webfuse/tests/core/jsonrpc/test_server.cc b/test/webfuse_provider/tests/core/jsonrpc/test_server.cc similarity index 98% rename from test/webfuse/tests/core/jsonrpc/test_server.cc rename to test/webfuse_provider/tests/core/jsonrpc/test_server.cc index 688028f..e264672 100644 --- a/test/webfuse/tests/core/jsonrpc/test_server.cc +++ b/test/webfuse_provider/tests/core/jsonrpc/test_server.cc @@ -1,7 +1,7 @@ #include -#include "webfuse/core/jsonrpc/server.h" -#include "webfuse/core/jsonrpc/request.h" -#include "webfuse/core/status.h" +#include "webfuse_provider/impl/jsonrpc/server.h" +#include "webfuse_provider/impl/jsonrpc/request.h" +#include "webfuse_provider/status.h" namespace { diff --git a/test/webfuse/tests/core/test_base64.cc b/test/webfuse_provider/tests/core/test_base64.cc similarity index 98% rename from test/webfuse/tests/core/test_base64.cc rename to test/webfuse_provider/tests/core/test_base64.cc index e6ae97d..79eb49d 100644 --- a/test/webfuse/tests/core/test_base64.cc +++ b/test/webfuse_provider/tests/core/test_base64.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/base64.h" +#include "webfuse_provider/impl/base64.h" TEST(Base64, EncodedSize) { diff --git a/test/webfuse/tests/core/test_container_of.cc b/test/webfuse_provider/tests/core/test_container_of.cc similarity index 90% rename from test/webfuse/tests/core/test_container_of.cc rename to test/webfuse_provider/tests/core/test_container_of.cc index 900e180..5d95f45 100644 --- a/test/webfuse/tests/core/test_container_of.cc +++ b/test/webfuse_provider/tests/core/test_container_of.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/container_of.h" +#include "webfuse_provider/impl/container_of.h" namespace { diff --git a/test/webfuse/tests/core/test_message.cc b/test/webfuse_provider/tests/core/test_message.cc similarity index 91% rename from test/webfuse/tests/core/test_message.cc rename to test/webfuse_provider/tests/core/test_message.cc index 6212280..e2d3a0d 100644 --- a/test/webfuse/tests/core/test_message.cc +++ b/test/webfuse_provider/tests/core/test_message.cc @@ -1,6 +1,6 @@ #include #include -#include "webfuse/core/message.h" +#include "webfuse_provider/impl/message.h" TEST(wf_message, create) { diff --git a/test/webfuse/tests/core/test_message_queue.cc b/test/webfuse_provider/tests/core/test_message_queue.cc similarity index 89% rename from test/webfuse/tests/core/test_message_queue.cc rename to test/webfuse_provider/tests/core/test_message_queue.cc index ef07bed..b0dab02 100644 --- a/test/webfuse/tests/core/test_message_queue.cc +++ b/test/webfuse_provider/tests/core/test_message_queue.cc @@ -1,7 +1,7 @@ #include -#include "webfuse/core/message_queue.h" -#include "webfuse/core/message.h" -#include "webfuse/core/slist.h" +#include "webfuse_provider/impl/message_queue.h" +#include "webfuse_provider/impl/message.h" +#include "webfuse_provider/impl/slist.h" namespace { diff --git a/test/webfuse/tests/core/test_slist.cc b/test/webfuse_provider/tests/core/test_slist.cc similarity index 98% rename from test/webfuse/tests/core/test_slist.cc rename to test/webfuse_provider/tests/core/test_slist.cc index ddfb57d..ec2cd09 100644 --- a/test/webfuse/tests/core/test_slist.cc +++ b/test/webfuse_provider/tests/core/test_slist.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/slist.h" +#include "webfuse_provider/impl/slist.h" TEST(wf_slist, init) { diff --git a/test/webfuse/tests/core/test_status.cc b/test/webfuse_provider/tests/core/test_status.cc similarity index 95% rename from test/webfuse/tests/core/test_status.cc rename to test/webfuse_provider/tests/core/test_status.cc index 4558f72..857b039 100644 --- a/test/webfuse/tests/core/test_status.cc +++ b/test/webfuse_provider/tests/core/test_status.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/status_intern.h" +#include "webfuse_provider/impl/status_intern.h" TEST(wf_status, tostring) { diff --git a/test/webfuse/tests/core/test_url.cc b/test/webfuse_provider/tests/core/test_url.cc similarity index 98% rename from test/webfuse/tests/core/test_url.cc rename to test/webfuse_provider/tests/core/test_url.cc index ba5ba76..aead917 100644 --- a/test/webfuse/tests/core/test_url.cc +++ b/test/webfuse_provider/tests/core/test_url.cc @@ -1,6 +1,6 @@ #include -#include "webfuse/core/url.h" +#include "webfuse_provider/impl/url.h" TEST(url, ParseWs) { diff --git a/test/webfuse/tests/core/test_util.cc b/test/webfuse_provider/tests/core/test_util.cc similarity index 95% rename from test/webfuse/tests/core/test_util.cc rename to test/webfuse_provider/tests/core/test_util.cc index 3e4b75d..6bb59da 100644 --- a/test/webfuse/tests/core/test_util.cc +++ b/test/webfuse_provider/tests/core/test_util.cc @@ -1,5 +1,5 @@ #include -#include "webfuse/core/json_util.h" +#include "webfuse_provider/impl/json_util.h" TEST(jsonrpc_util, get_int) { diff --git a/test/webfuse/tests/core/timer/test_timepoint.cc b/test/webfuse_provider/tests/core/timer/test_timepoint.cc similarity index 94% rename from test/webfuse/tests/core/timer/test_timepoint.cc rename to test/webfuse_provider/tests/core/timer/test_timepoint.cc index f55adab..733d6d9 100644 --- a/test/webfuse/tests/core/timer/test_timepoint.cc +++ b/test/webfuse_provider/tests/core/timer/test_timepoint.cc @@ -1,6 +1,6 @@ #include -#include "webfuse/core/timer/timepoint.h" +#include "webfuse_provider/impl/timer/timepoint.h" #include #include diff --git a/test/webfuse/tests/core/timer/test_timer.cc b/test/webfuse_provider/tests/core/timer/test_timer.cc similarity index 97% rename from test/webfuse/tests/core/timer/test_timer.cc rename to test/webfuse_provider/tests/core/timer/test_timer.cc index d25b1f5..493064a 100644 --- a/test/webfuse/tests/core/timer/test_timer.cc +++ b/test/webfuse_provider/tests/core/timer/test_timer.cc @@ -4,8 +4,8 @@ #include #include -#include "webfuse/core/timer/timer.h" -#include "webfuse/core/timer/manager.h" +#include "webfuse_provider/impl/timer/timer.h" +#include "webfuse_provider/impl/timer/manager.h" using std::size_t; using namespace std::chrono_literals; diff --git a/test/webfuse/tests/integration/file.cc b/test/webfuse_provider/tests/integration/file.cc similarity index 96% rename from test/webfuse/tests/integration/file.cc rename to test/webfuse_provider/tests/integration/file.cc index 5719382..5b059d8 100644 --- a/test/webfuse/tests/integration/file.cc +++ b/test/webfuse_provider/tests/integration/file.cc @@ -1,4 +1,4 @@ -#include "webfuse/tests/integration/file.hpp" +#include "webfuse_provider/tests/integration/file.hpp" #include #include diff --git a/test/webfuse/tests/integration/file.hpp b/test/webfuse_provider/tests/integration/file.hpp similarity index 100% rename from test/webfuse/tests/integration/file.hpp rename to test/webfuse_provider/tests/integration/file.hpp diff --git a/test/webfuse/tests/integration/fs_check.c b/test/webfuse_provider/tests/integration/fs_check.c similarity index 100% rename from test/webfuse/tests/integration/fs_check.c rename to test/webfuse_provider/tests/integration/fs_check.c diff --git a/test/webfuse/tests/integration/provider.cc b/test/webfuse_provider/tests/integration/provider.cc similarity index 97% rename from test/webfuse/tests/integration/provider.cc rename to test/webfuse_provider/tests/integration/provider.cc index cf3aeca..46e6c4f 100644 --- a/test/webfuse/tests/integration/provider.cc +++ b/test/webfuse_provider/tests/integration/provider.cc @@ -1,6 +1,6 @@ -#include "webfuse/tests/integration/provider.hpp" +#include "webfuse_provider/tests/integration/provider.hpp" #include "webfuse_provider.h" -#include "webfuse/provider/impl/client.h" +#include "webfuse_provider/impl/client.h" #include #include #include diff --git a/test/webfuse/tests/integration/provider.hpp b/test/webfuse_provider/tests/integration/provider.hpp similarity index 100% rename from test/webfuse/tests/integration/provider.hpp rename to test/webfuse_provider/tests/integration/provider.hpp diff --git a/test/webfuse/tests/integration/server.cc b/test/webfuse_provider/tests/integration/server.cc similarity index 98% rename from test/webfuse/tests/integration/server.cc rename to test/webfuse_provider/tests/integration/server.cc index f175210..d3c2735 100644 --- a/test/webfuse/tests/integration/server.cc +++ b/test/webfuse_provider/tests/integration/server.cc @@ -1,4 +1,4 @@ -#include "webfuse/tests/integration/server.hpp" +#include "webfuse_provider/tests/integration/server.hpp" #include #include #include diff --git a/test/webfuse/tests/integration/server.hpp b/test/webfuse_provider/tests/integration/server.hpp similarity index 100% rename from test/webfuse/tests/integration/server.hpp rename to test/webfuse_provider/tests/integration/server.hpp diff --git a/test/webfuse/tests/integration/test_integration.cc b/test/webfuse_provider/tests/integration/test_integration.cc similarity index 90% rename from test/webfuse/tests/integration/test_integration.cc rename to test/webfuse_provider/tests/integration/test_integration.cc index ae9033c..192c860 100644 --- a/test/webfuse/tests/integration/test_integration.cc +++ b/test/webfuse_provider/tests/integration/test_integration.cc @@ -1,7 +1,7 @@ #include -#include "webfuse/tests/integration/server.hpp" -#include "webfuse/tests/integration/provider.hpp" -#include "webfuse/tests/integration/file.hpp" +#include "webfuse_provider/tests/integration/server.hpp" +#include "webfuse_provider/tests/integration/provider.hpp" +#include "webfuse_provider/tests/integration/file.hpp" #include #include @@ -15,7 +15,7 @@ #include #include -#include "webfuse/core/lws_log.h" +#include "webfuse_provider/impl/lws_log.h" using webfuse_test::Server; using webfuse_test::Provider; diff --git a/test/webfuse/tests/integration/test_lowlevel.cc b/test/webfuse_provider/tests/integration/test_lowlevel.cc similarity index 100% rename from test/webfuse/tests/integration/test_lowlevel.cc rename to test/webfuse_provider/tests/integration/test_lowlevel.cc diff --git a/test/webfuse/tests/provider/operation/test_close.cc b/test/webfuse_provider/tests/provider/operation/test_close.cc similarity index 94% rename from test/webfuse/tests/provider/operation/test_close.cc rename to test/webfuse_provider/tests/provider/operation/test_close.cc index 3769579..503bb80 100644 --- a/test/webfuse/tests/provider/operation/test_close.cc +++ b/test/webfuse_provider/tests/provider/operation/test_close.cc @@ -1,6 +1,6 @@ -#include "webfuse/provider/impl/operation/close.h" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/impl/operation/close.h" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" #include diff --git a/test/webfuse/tests/provider/operation/test_getattr.cc b/test/webfuse_provider/tests/provider/operation/test_getattr.cc similarity index 92% rename from test/webfuse/tests/provider/operation/test_getattr.cc rename to test/webfuse_provider/tests/provider/operation/test_getattr.cc index 332ab89..5346f33 100644 --- a/test/webfuse/tests/provider/operation/test_getattr.cc +++ b/test/webfuse_provider/tests/provider/operation/test_getattr.cc @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/operation/getattr.h" -#include "webfuse/mocks/mock_request.hpp" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/impl/operation/getattr.h" +#include "webfuse_provider/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" #include #include diff --git a/test/webfuse/tests/provider/operation/test_lookup.cc b/test/webfuse_provider/tests/provider/operation/test_lookup.cc similarity index 94% rename from test/webfuse/tests/provider/operation/test_lookup.cc rename to test/webfuse_provider/tests/provider/operation/test_lookup.cc index 4cbccd4..b4db6f9 100644 --- a/test/webfuse/tests/provider/operation/test_lookup.cc +++ b/test/webfuse_provider/tests/provider/operation/test_lookup.cc @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/operation/lookup.h" -#include "webfuse/mocks/mock_request.hpp" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/impl/operation/lookup.h" +#include "webfuse_provider/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" #include #include diff --git a/test/webfuse/tests/provider/operation/test_open.cc b/test/webfuse_provider/tests/provider/operation/test_open.cc similarity index 93% rename from test/webfuse/tests/provider/operation/test_open.cc rename to test/webfuse_provider/tests/provider/operation/test_open.cc index 4c52b02..3689941 100644 --- a/test/webfuse/tests/provider/operation/test_open.cc +++ b/test/webfuse_provider/tests/provider/operation/test_open.cc @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/operation/open.h" -#include "webfuse/mocks/mock_request.hpp" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/impl/operation/open.h" +#include "webfuse_provider/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" #include #include diff --git a/test/webfuse/tests/provider/operation/test_read.cc b/test/webfuse_provider/tests/provider/operation/test_read.cc similarity index 96% rename from test/webfuse/tests/provider/operation/test_read.cc rename to test/webfuse_provider/tests/provider/operation/test_read.cc index 36bf14f..5b818ff 100644 --- a/test/webfuse/tests/provider/operation/test_read.cc +++ b/test/webfuse_provider/tests/provider/operation/test_read.cc @@ -1,7 +1,7 @@ -#include "webfuse/provider/impl/operation/read.h" -#include "webfuse/mocks/mock_request.hpp" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/impl/operation/read.h" +#include "webfuse_provider/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" #include #include diff --git a/test/webfuse/tests/provider/operation/test_readdir.cc b/test/webfuse_provider/tests/provider/operation/test_readdir.cc similarity index 90% rename from test/webfuse/tests/provider/operation/test_readdir.cc rename to test/webfuse_provider/tests/provider/operation/test_readdir.cc index 33557f5..6a14f8d 100644 --- a/test/webfuse/tests/provider/operation/test_readdir.cc +++ b/test/webfuse_provider/tests/provider/operation/test_readdir.cc @@ -1,8 +1,8 @@ -#include "webfuse/provider/impl/operation/readdir.h" -#include "webfuse/mocks/mock_request.hpp" -#include "webfuse/mocks/mock_provider.hpp" -#include "webfuse/mocks/fake_invokation_context.hpp" -#include "webfuse/provider/dirbuffer.h" +#include "webfuse_provider/impl/operation/readdir.h" +#include "webfuse_provider/mocks/mock_request.hpp" +#include "webfuse_provider/mocks/mock_provider.hpp" +#include "webfuse_provider/mocks/fake_invokation_context.hpp" +#include "webfuse_provider/dirbuffer.h" #include #include diff --git a/test/webfuse/tests/provider/test_client_protocol.cc b/test/webfuse_provider/tests/provider/test_client_protocol.cc similarity index 96% rename from test/webfuse/tests/provider/test_client_protocol.cc rename to test/webfuse_provider/tests/provider/test_client_protocol.cc index e2fe6b6..405b1c5 100644 --- a/test/webfuse/tests/provider/test_client_protocol.cc +++ b/test/webfuse_provider/tests/provider/test_client_protocol.cc @@ -1,12 +1,12 @@ #include #include -#include -#include -#include "webfuse/utils/ws_server.h" -#include "webfuse/mocks/mock_provider_client.hpp" -#include "webfuse/core/protocol_names.h" -#include "webfuse/utils/timeout_watcher.hpp" +#include +#include +#include "webfuse_provider/utils/ws_server.h" +#include "webfuse_provider/mocks/mock_provider_client.hpp" +#include "webfuse_provider/protocol_names.h" +#include "webfuse_provider/utils/timeout_watcher.hpp" #include diff --git a/test/webfuse/tests/provider/test_dirbuffer.cc b/test/webfuse_provider/tests/provider/test_dirbuffer.cc similarity index 94% rename from test/webfuse/tests/provider/test_dirbuffer.cc rename to test/webfuse_provider/tests/provider/test_dirbuffer.cc index b4dfe58..639b0ef 100644 --- a/test/webfuse/tests/provider/test_dirbuffer.cc +++ b/test/webfuse_provider/tests/provider/test_dirbuffer.cc @@ -1,4 +1,4 @@ -#include "webfuse/provider/impl/dirbuffer.h" +#include "webfuse_provider/impl/dirbuffer.h" #include TEST(DirBuffer, CreateDispose) diff --git a/test/webfuse/utils/adapter_client.cc b/test/webfuse_provider/utils/adapter_client.cc similarity index 100% rename from test/webfuse/utils/adapter_client.cc rename to test/webfuse_provider/utils/adapter_client.cc diff --git a/test/webfuse/utils/adapter_client.hpp b/test/webfuse_provider/utils/adapter_client.hpp similarity index 100% rename from test/webfuse/utils/adapter_client.hpp rename to test/webfuse_provider/utils/adapter_client.hpp diff --git a/test/webfuse/utils/file_utils.cc b/test/webfuse_provider/utils/file_utils.cc similarity index 93% rename from test/webfuse/utils/file_utils.cc rename to test/webfuse_provider/utils/file_utils.cc index 7a3d29c..61b50e9 100644 --- a/test/webfuse/utils/file_utils.cc +++ b/test/webfuse_provider/utils/file_utils.cc @@ -1,4 +1,4 @@ -#include "webfuse/utils/file_utils.hpp" +#include "webfuse_provider/utils/file_utils.hpp" #include #include diff --git a/test/webfuse/utils/file_utils.hpp b/test/webfuse_provider/utils/file_utils.hpp similarity index 100% rename from test/webfuse/utils/file_utils.hpp rename to test/webfuse_provider/utils/file_utils.hpp diff --git a/test/webfuse/utils/jansson_test_environment.cc b/test/webfuse_provider/utils/jansson_test_environment.cc similarity index 100% rename from test/webfuse/utils/jansson_test_environment.cc rename to test/webfuse_provider/utils/jansson_test_environment.cc diff --git a/test/webfuse/utils/path.c b/test/webfuse_provider/utils/path.c similarity index 98% rename from test/webfuse/utils/path.c rename to test/webfuse_provider/utils/path.c index e63aafb..6179d02 100644 --- a/test/webfuse/utils/path.c +++ b/test/webfuse_provider/utils/path.c @@ -1,4 +1,4 @@ -#include "webfuse/utils/path.h" +#include "webfuse_provider/utils/path.h" #include #include diff --git a/test/webfuse/utils/path.h b/test/webfuse_provider/utils/path.h similarity index 100% rename from test/webfuse/utils/path.h rename to test/webfuse_provider/utils/path.h diff --git a/test/webfuse/utils/static_filesystem.c b/test/webfuse_provider/utils/static_filesystem.c similarity index 97% rename from test/webfuse/utils/static_filesystem.c rename to test/webfuse_provider/utils/static_filesystem.c index 0f64733..1667d3d 100644 --- a/test/webfuse/utils/static_filesystem.c +++ b/test/webfuse_provider/utils/static_filesystem.c @@ -1,10 +1,10 @@ -#include "webfuse/utils/static_filesystem.h" -#include "webfuse/provider/client_config.h" -#include "webfuse/provider/dirbuffer.h" -#include "webfuse/provider/operation/error.h" +#include "webfuse_provider/utils/static_filesystem.h" +#include "webfuse_provider/client_config.h" +#include "webfuse_provider/dirbuffer.h" +#include "webfuse_provider/operation/error.h" -#include "webfuse/utils/path.h" -#include "webfuse/core/util.h" +#include "webfuse_provider/utils/path.h" +#include "webfuse_provider/impl/util.h" #include #include diff --git a/test/webfuse/utils/static_filesystem.h b/test/webfuse_provider/utils/static_filesystem.h similarity index 97% rename from test/webfuse/utils/static_filesystem.h rename to test/webfuse_provider/utils/static_filesystem.h index d4d574a..7542b30 100644 --- a/test/webfuse/utils/static_filesystem.h +++ b/test/webfuse_provider/utils/static_filesystem.h @@ -8,7 +8,7 @@ using ::std::size_t; #endif -#include +#include #ifdef __cplusplus extern "C" diff --git a/test/webfuse/utils/tempdir.cc b/test/webfuse_provider/utils/tempdir.cc similarity index 90% rename from test/webfuse/utils/tempdir.cc rename to test/webfuse_provider/utils/tempdir.cc index 46b78a7..a36574d 100644 --- a/test/webfuse/utils/tempdir.cc +++ b/test/webfuse_provider/utils/tempdir.cc @@ -1,4 +1,4 @@ -#include "webfuse/utils/tempdir.hpp" +#include "webfuse_provider/utils/tempdir.hpp" #include #include diff --git a/test/webfuse/utils/tempdir.hpp b/test/webfuse_provider/utils/tempdir.hpp similarity index 100% rename from test/webfuse/utils/tempdir.hpp rename to test/webfuse_provider/utils/tempdir.hpp diff --git a/test/webfuse/utils/timeout_watcher.cc b/test/webfuse_provider/utils/timeout_watcher.cc similarity index 94% rename from test/webfuse/utils/timeout_watcher.cc rename to test/webfuse_provider/utils/timeout_watcher.cc index 705f1f3..299eacf 100644 --- a/test/webfuse/utils/timeout_watcher.cc +++ b/test/webfuse_provider/utils/timeout_watcher.cc @@ -1,4 +1,4 @@ -#include "webfuse/utils/timeout_watcher.hpp" +#include "webfuse_provider/utils/timeout_watcher.hpp" #include #include diff --git a/test/webfuse/utils/timeout_watcher.hpp b/test/webfuse_provider/utils/timeout_watcher.hpp similarity index 100% rename from test/webfuse/utils/timeout_watcher.hpp rename to test/webfuse_provider/utils/timeout_watcher.hpp diff --git a/test/webfuse/utils/wrap.hpp b/test/webfuse_provider/utils/wrap.hpp similarity index 100% rename from test/webfuse/utils/wrap.hpp rename to test/webfuse_provider/utils/wrap.hpp diff --git a/test/webfuse/utils/ws_server.cc b/test/webfuse_provider/utils/ws_server.cc similarity index 98% rename from test/webfuse/utils/ws_server.cc rename to test/webfuse_provider/utils/ws_server.cc index 2c3dcfe..908131b 100644 --- a/test/webfuse/utils/ws_server.cc +++ b/test/webfuse_provider/utils/ws_server.cc @@ -1,5 +1,5 @@ -#include "webfuse/utils/ws_server.h" -#include "webfuse/core/lws_log.h" +#include "webfuse_provider/utils/ws_server.h" +#include "webfuse_provider/impl/lws_log.h" #include #include diff --git a/test/webfuse/utils/ws_server.h b/test/webfuse_provider/utils/ws_server.h similarity index 100% rename from test/webfuse/utils/ws_server.h rename to test/webfuse_provider/utils/ws_server.h diff --git a/test/webfuse/utils/ws_server2.cc b/test/webfuse_provider/utils/ws_server2.cc similarity index 98% rename from test/webfuse/utils/ws_server2.cc rename to test/webfuse_provider/utils/ws_server2.cc index 21d4a6e..a11f4c3 100644 --- a/test/webfuse/utils/ws_server2.cc +++ b/test/webfuse_provider/utils/ws_server2.cc @@ -1,5 +1,5 @@ -#include "webfuse/utils/ws_server2.hpp" -#include "webfuse/core/lws_log.h" +#include "webfuse_provider/utils/ws_server2.hpp" +#include "webfuse_provider/impl/lws_log.h" #include #include diff --git a/test/webfuse/utils/ws_server2.hpp b/test/webfuse_provider/utils/ws_server2.hpp similarity index 100% rename from test/webfuse/utils/ws_server2.hpp rename to test/webfuse_provider/utils/ws_server2.hpp