reorganized project: prepared to extract common functionality

lib/wsfs/adapter/filesystem.c

@@ -1,6 +1,6 @@
-#include "wsfs/filesystem.h"
-#include "wsfs/operations.h"
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/filesystem.h"
+#include "wsfs/adapter/operations.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 
 #include <stddef.h>
 #include <string.h>

lib/wsfs/adapter/filesystem.h

@@ -5,8 +5,8 @@
 #include <stdbool.h>
 #endif
 
-#include "wsfs/fuse_wrapper.h"
-#include "wsfs/operations.h"
+#include "wsfs/adapter/fuse_wrapper.h"
+#include "wsfs/adapter/operations.h"
 
 struct wsfs_jsonrpc_server;
 

lib/wsfs/adapter/jsonrpc/method.c

@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/method_intern.h"
+#include "wsfs/adapter/jsonrpc/method_intern.h"
 
 #include <stdlib.h>
 #include <string.h>

lib/wsfs/adapter/jsonrpc/method.h

@@ -6,7 +6,7 @@
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 
 typedef bool wsfs_jsonrpc_method_invoke_fn(

lib/wsfs/adapter/jsonrpc/method_intern.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_JSONRPC_METHOD_INTERN_H
 #define WSFS_JSONRPC_METHOD_INTERN_H
 
-#include "wsfs/jsonrpc/method.h"
+#include "wsfs/adapter/jsonrpc/method.h"
 
 struct wsfs_jsonrpc_method
 {

lib/wsfs/adapter/jsonrpc/request.c

@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/request.h"
+#include "wsfs/adapter/jsonrpc/request.h"
 
 json_t * wsfs_jsonrpc_request_create(
 	char const * method,

lib/wsfs/adapter/jsonrpc/response.c

@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/response.h"
+#include "wsfs/adapter/jsonrpc/response.h"
 
 void wsfs_jsonrpc_response_init(
 	struct wsfs_jsonrpc_response * result,

lib/wsfs/adapter/jsonrpc/response.h

@@ -9,7 +9,7 @@ using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 struct wsfs_jsonrpc_response
 {

lib/wsfs/adapter/jsonrpc/server.c

@@ -1,9 +1,9 @@
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include <string.h>
 
-#include "wsfs/jsonrpc/method_intern.h"
-#include "wsfs/jsonrpc/request.h"
-#include "wsfs/jsonrpc/response.h"
+#include "wsfs/adapter/jsonrpc/method_intern.h"
+#include "wsfs/adapter/jsonrpc/request.h"
+#include "wsfs/adapter/jsonrpc/response.h"
 
 #define WSFS_DEFAULT_TIMEOUT (10 * 1000)
 

lib/wsfs/adapter/jsonrpc/server.h

@@ -12,9 +12,9 @@ using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "wsfs/jsonrpc/method.h"
-#include "wsfs/time/timeout_manager.h"
-#include "wsfs/time/timer.h"
+#include "wsfs/adapter/jsonrpc/method.h"
+#include "wsfs/adapter/time/timeout_manager.h"
+#include "wsfs/adapter/time/timer.h"
 
 
 struct wsfs_jsonrpc_request

lib/wsfs/adapter/jsonrpc/util.c

@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 
 int wsfs_json_get_int(json_t const * object, char const * key, int default_value)
 {

lib/wsfs/adapter/message.c

@@ -1,4 +1,4 @@
-#include "wsfs/message.h"
+#include "wsfs/adapter/message.h"
 
 #include <stdlib.h>
 #include <libwebsockets.h>

lib/wsfs/adapter/message_queue.c

@@ -1,5 +1,5 @@
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/adapter/message_queue.h"
+#include "wsfs/adapter/message.h"
 
 void wsfs_message_queue_init(
     struct wsfs_message_queue * queue)

lib/wsfs/adapter/operation/close.c

@@ -1,10 +1,10 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <limits.h>
 #include <errno.h>
 #include <jansson.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
 
 void wsfs_operation_close(

lib/wsfs/adapter/operation/getattr.c

@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <errno.h>
 #include <string.h>
@@ -7,8 +7,8 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 #include "wsfs/util.h"
 
 struct wsfs_operation_getattr_context

lib/wsfs/adapter/operation/lookup.c

@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <limits.h>
 #include <errno.h>
@@ -10,8 +10,8 @@
 
 #include <stdlib.h>
 
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 #include "wsfs/util.h"
 
 struct wsfs_operation_lookup_context

lib/wsfs/adapter/operation/open.c

@@ -1,12 +1,12 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <string.h>
 #include <errno.h>
 #include <jansson.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 static void wsfs_operation_open_finished(
 	void * user_data,

lib/wsfs/adapter/operation/read.c

@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <errno.h>
 #include <string.h>
@@ -6,7 +6,7 @@
 #include <jansson.h>
 #include <libwebsockets.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 
 #define WSFS_MAX_READ_LENGTH 4096
 

lib/wsfs/adapter/operation/readdir.c

@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
 
 

lib/wsfs/adapter/operations.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_OPERATIONS
 #define WSFS_OPERATIONS
 
-#include "wsfs/fuse_wrapper.h"
+#include "wsfs/adapter/fuse_wrapper.h"
 
 struct wsfs_jsonrpc_server;
 

lib/wsfs/adapter/server.c

@@ -1,11 +1,11 @@
-#include "wsfs/server.h"
+#include "wsfs/adapter/server.h"
 
 #include <stdlib.h>
 #include <stdbool.h>
 #include <libwebsockets.h>
 
-#include "wsfs/server_config.h"
-#include "wsfs/server_protocol_intern.h"
+#include "wsfs/adapter/server_config.h"
+#include "wsfs/adapter/server_protocol_intern.h"
 
 #define WSFS_DISABLE_LWS_LOG 0
 #define WSFS_SERVER_PROTOCOL_COUNT 3

lib/wsfs/adapter/server_config.c

@@ -1,4 +1,4 @@
-#include "wsfs/server_config.h"
+#include "wsfs/adapter/server_config.h"
 
 #include <stdlib.h>
 #include <string.h>

lib/wsfs/adapter/server_protocol.c

@@ -1,10 +1,10 @@
-#include "wsfs/server_protocol_intern.h"
+#include "wsfs/adapter/server_protocol_intern.h"
 
 #include <stdlib.h>
 #include <libwebsockets.h>
 
-#include "wsfs/message.h"
-#include "wsfs/filesystem.h"
+#include "wsfs/adapter/message.h"
+#include "wsfs/adapter/filesystem.h"
 #include "wsfs/util.h"
 
 static int wsfs_server_protocol_callback(

lib/wsfs/adapter/server_protocol_intern.h

@@ -1,11 +1,11 @@
 #ifndef WSFS_SERVER_PROTOCOL_INTERN_H
 #define WSFS_SERVER_PROTOCOL_INTERN_H
 
-#include "wsfs/server_protocol.h"
-#include "wsfs/filesystem.h"
-#include "wsfs/message_queue.h"
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/time/timeout_manager.h"
+#include "wsfs/adapter/server_protocol.h"
+#include "wsfs/adapter/filesystem.h"
+#include "wsfs/adapter/message_queue.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/time/timeout_manager.h"
 
 struct wsfs_server_protocol
 {

lib/wsfs/adapter/status.c

@@ -1,4 +1,4 @@
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 #include <errno.h>
 

lib/wsfs/adapter/time/timeout_manager.c

@@ -1,8 +1,8 @@
-#include "wsfs/time/timeout_manager_intern.h"
+#include "wsfs/adapter/time/timeout_manager_intern.h"
 
 #include <stddef.h>
-#include "wsfs/time/timer_intern.h"
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timer_intern.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 void wsfs_timeout_manager_init(
     struct wsfs_timeout_manager * manager)

lib/wsfs/adapter/time/timeout_manager_intern.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
 #define WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
 
-#include "wsfs/time/timeout_manager.h"
+#include "wsfs/adapter/time/timeout_manager.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/adapter/time/timepoint.c

@@ -1,4 +1,4 @@
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 #include <time.h>
 

lib/wsfs/adapter/time/timer.c

@@ -1,5 +1,5 @@
-#include "wsfs/time/timer_intern.h"
-#include "wsfs/time/timeout_manager_intern.h"
+#include "wsfs/adapter/time/timer_intern.h"
+#include "wsfs/adapter/time/timeout_manager_intern.h"
 
 #include <stddef.h>
 #include <string.h>

lib/wsfs/adapter/time/timer.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_TIMER_H
 #define WSFS_TIMER_H
 
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 struct wsfs_timer;
 struct wsfs_timeout_manager;

lib/wsfs/adapter/time/timer_intern.h

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #endif
 
-#include "wsfs/time/timer.h"
+#include "wsfs/adapter/time/timer.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/client.c

@@ -1,4 +1,4 @@
-#include "wsfsp/client.h"
+#include "wsfs/provider/client.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -6,9 +6,9 @@
 
 #include <libwebsockets.h>
 
-#include "wsfsp/provider.h"
-#include "wsfsp/client_protocol_intern.h"
-#include "wsfsp/url.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/client_protocol_intern.h"
+#include "wsfs/provider/url.h"
 
 #define WSFSP_PROTOCOL ("fs")
 #define WSFSP_DISABLE_LWS_LOG 0

lib/wsfs/provider/client_protocol.c

@@ -1,4 +1,4 @@
-#include "wsfsp/client_protocol_intern.h"
+#include "wsfs/provider/client_protocol_intern.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -7,13 +7,13 @@
 #include <jansson.h>
 
 
-#include "wsfsp/provider_intern.h"
-#include "wsfsp/operation/lookup_intern.h"
-#include "wsfsp/operation/getattr_intern.h"
-#include "wsfsp/operation/readdir_intern.h"
-#include "wsfsp/operation/open_intern.h"
-#include "wsfsp/operation/close_intern.h"
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/provider_intern.h"
+#include "wsfs/provider/operation/lookup_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 
 #include "wsfs/util.h"
 

lib/wsfs/provider/client_protocol_intern.h

@@ -1,9 +1,9 @@
 #ifndef WSFSP_CLIENT_PROTOCOL_INTERN_H
 #define WSFSP_CLIENT_PROTOCOL_INTERN_H
 
-#include "wsfsp/client_protocol.h"
-#include "wsfsp/provider.h"
-#include "wsfsp/request.h"
+#include "wsfs/provider/client_protocol.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/request.h"
 
 struct wsfsp_client_protocol
 {

lib/wsfs/provider/operation/close.c

@@ -1,4 +1,4 @@
-#include "wsfsp/operation/close_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
 #include <limits.h>
 #include "wsfs/util.h"
 

lib/wsfs/provider/operation/close_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_CLOSE_INTERN_H
 #define WSFSP_OPERATION_CLOSE_INTERN_H
 
-#include "wsfsp/operation/close.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/close.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/operation/error.c

@@ -1,6 +1,6 @@
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 #include <jansson.h>
-#include "wsfsp/request.h"
+#include "wsfs/provider/request.h"
 
 void wsfsp_respond_error(
     struct wsfsp_request * request,

lib/wsfs/provider/operation/getattr.c

@@ -1,7 +1,7 @@
-#include "wsfsp/operation/getattr_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
 #include <stdio.h>
 
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 
 void wsfsp_getattr(

lib/wsfs/provider/operation/getattr_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_GETATTR_INTERN_H
 #define WSFSP_OPERATION_GETATTR_INTERN_H
 
-#include "wsfsp/operation/getattr.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/getattr.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/operation/lookup.c

@@ -1,6 +1,6 @@
-#include "wsfsp/operation/lookup_intern.h"
+#include "wsfs/provider/operation/lookup_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_lookup(
     struct wsfsp_invokation_context * context,

lib/wsfs/provider/operation/lookup_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_LOOKUP_INTERN_H
 #define WSFSP_OPERATION_LOOKUP_INTERN_H
 
-#include "wsfsp/operation/lookup.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/lookup.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/operation/open.c

@@ -1,6 +1,6 @@
-#include "wsfsp/operation/open_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_open(
     struct wsfsp_invokation_context * context,

lib/wsfs/provider/operation/open_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_OPEN_INTERN_H
 #define WSFSP_OPERATION_OPEN_INTERN_H
 
-#include "wsfsp/operation/open.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/open.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/operation/read.c

@@ -1,6 +1,6 @@
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_read(
     struct wsfsp_invokation_context * context,

lib/wsfs/provider/operation/read_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_READ_INTERN_H
 #define WSFSP_OPERATION_READ_INTERN_H
 
-#include "wsfsp/operation/read.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/read.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/operation/readdir.c

@@ -1,6 +1,6 @@
-#include "wsfsp/operation/readdir_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_readdir(
     struct wsfsp_invokation_context * context,

lib/wsfs/provider/operation/readdir_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_READDIR_INTERN_H
 #define WSFSP_OPERATION_READDIR_INTERN_H
 
-#include "wsfsp/operation/readdir.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/readdir.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"

lib/wsfs/provider/provider.c

@@ -1,15 +1,15 @@
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/provider_intern.h"
 
 #include <stdbool.h>
 #include <string.h>
 
-#include "wsfsp/request.h"
-#include "wsfsp/operation/lookup_intern.h"
-#include "wsfsp/operation/getattr_intern.h"
-#include "wsfsp/operation/readdir_intern.h"
-#include "wsfsp/operation/open_intern.h"
-#include "wsfsp/operation/close_intern.h"
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/request.h"
+#include "wsfs/provider/operation/lookup_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 
 typedef void wsfsp_invoke_fn(
     struct wsfsp_invokation_context * context,

lib/wsfs/provider/provider_intern.h

@@ -1,8 +1,8 @@
 #ifndef WSFSP_PROVIDER_INTERN_H
 #define WSFSP_PROVIDER_INTERN_H
 
-#include "wsfsp/provider.h"
-#include "wsfsp/request.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/request.h"
 
 #include <jansson.h>
 

lib/wsfs/provider/request.c

@@ -1,4 +1,4 @@
-#include "wsfsp/request.h"
+#include "wsfs/provider/request.h"
 
 #include <stdlib.h>
 

lib/wsfs/provider/request.h

@@ -2,7 +2,7 @@
 #define WSFSP_REQUEST_H
 
 #include <jansson.h>
-#include "wsfsp/provider.h"
+#include "wsfs/provider/provider.h"
 
 typedef void wsfsp_request_respond_fn(
     json_t * response,

lib/wsfs/provider/url.c

@@ -1,4 +1,4 @@
-#include "wsfsp/url.h"
+#include "wsfs/provider/url.h"
 
 #include <stdlib.h>
 #include <string.h>