puts core files into core directories

2025-06-13 12:54:15 +00:00 · 2019-03-24 18:26:38 +01:00 · 2019-03-24 18:26:38 +01:00 · 11724ec792
commit 11724ec792
parent bd1032c494
30 changed files with 36 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -45,14 +45,12 @@ set(EXTRA_CFLAGS
 )


-install(FILES include/wsfs/status.h DESTINATION include/wsfs)
-
 # libwsfs-core

 add_library(wsfs-core STATIC 
-	lib/wsfs/message.c
-	lib/wsfs/message_queue.c
-	lib/wsfs/status.c
+	lib/wsfs/core/message.c
+	lib/wsfs/core/message_queue.c
+	lib/wsfs/core/status.c
 )

 set_target_properties(wsfs-core PROPERTIES OUTPUT_NAME wsfs-core)
@ -60,6 +58,9 @@ target_include_directories(wsfs-core PUBLIC lib ${EXTRA_INCLUDE_DIRS})
 target_compile_options(wsfs-core PUBLIC ${EXTRA_CFLAGS})
 set_target_properties(wsfs-core PROPERTIES C_VISIBILITY_PRESET hidden)

+install(DIRECTORY include/wsfs/core DESTINATION include/wsfs)
+
+
 # libwsfs-adapter

 add_library(wsfs-adapter-static STATIC 
--- a/include/wsfs/core/status.h
+++ b/include/wsfs/core/status.h
--- a/include/wsfs/provider/operation/error.h
+++ b/include/wsfs/provider/operation/error.h
@ -2,7 +2,7 @@
 #define WSFSP_OPERATION_ERROR_H

 #include "wsfs/provider/api.h"
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"

 struct wsfsp_request;

--- a/include/wsfs_adapter.h
+++ b/include/wsfs_adapter.h
@ -1,7 +1,7 @@
 #ifndef WSFS_ADAPTER_H
 #define WSFS_ADAPTER_H

-#include <wsfs/status.h>
+#include <wsfs/core/status.h>

 #include <wsfs/adapter/api.h>
 #include <wsfs/adapter/server.h>
--- a/include/wsfs_provider.h
+++ b/include/wsfs_provider.h
@ -1,7 +1,7 @@
 #ifndef WSFS_PROVIDER_H
 #define WSFS_PROVIDER_H

-#include <wsfs/status.h>
+#include <wsfs/core/status.h>

 #include <wsfs/provider/api.h>
 #include <wsfs/provider/client.h>
--- a/lib/wsfs/adapter/impl/jsonrpc/method.h
+++ b/lib/wsfs/adapter/impl/jsonrpc/method.h
@ -6,7 +6,7 @@
 #endif

 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/wsfs/adapter/impl/jsonrpc/response.h
+++ b/lib/wsfs/adapter/impl/jsonrpc/response.h
@ -9,7 +9,7 @@ using std::size_t;
 #endif

 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"

 #ifdef __cplusplus
 extern "C" {
--- a/lib/wsfs/adapter/impl/operation/close.c
+++ b/lib/wsfs/adapter/impl/operation/close.c
@ -5,7 +5,7 @@
 #include <jansson.h>

 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfs_impl_operation_close(
 	fuse_req_t request,
--- a/lib/wsfs/adapter/impl/operation/getattr.c
+++ b/lib/wsfs/adapter/impl/operation/getattr.c
@ -9,7 +9,7 @@

 #include "wsfs/adapter/impl/jsonrpc/server.h"
 #include "wsfs/adapter/impl/jsonrpc/util.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 struct wsfs_impl_operation_getattr_context
 {
--- a/lib/wsfs/adapter/impl/operation/lookup.c
+++ b/lib/wsfs/adapter/impl/operation/lookup.c
@ -12,7 +12,7 @@

 #include "wsfs/adapter/impl/jsonrpc/server.h"
 #include "wsfs/adapter/impl/jsonrpc/util.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 struct wsfs_impl_operation_lookup_context
 {
--- a/lib/wsfs/adapter/impl/operation/open.c
+++ b/lib/wsfs/adapter/impl/operation/open.c
@ -5,8 +5,8 @@
 #include <jansson.h>

 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
-#include "wsfs/status.h"
+#include "wsfs/core/util.h"
+#include "wsfs/core/status.h"

 static void wsfs_impl_operation_open_finished(
 	void * user_data,
--- a/lib/wsfs/adapter/impl/operation/readdir.c
+++ b/lib/wsfs/adapter/impl/operation/readdir.c
@ -9,7 +9,7 @@
 #include <unistd.h> 

 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"


 #define WSFS_DIRBUFFER_INITIAL_SIZE 1024
--- a/lib/wsfs/adapter/impl/server_protocol.c
+++ b/lib/wsfs/adapter/impl/server_protocol.c
@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <libwebsockets.h>

-#include "wsfs/message.h"
-#include "wsfs/util.h"
+#include "wsfs/core/message.h"
+#include "wsfs/core/util.h"

 #include "wsfs/adapter/impl/filesystem.h"

--- a/lib/wsfs/adapter/impl/session.c
+++ b/lib/wsfs/adapter/impl/session.c
@ -1,7 +1,7 @@
 #include "wsfs/adapter/impl/session.h"
 #include "wsfs/adapter/impl/authenticators.h"
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/core/message_queue.h"
+#include "wsfs/core/message.h"
 #include "wsfs/adapter/impl/jsonrpc/server.h"

 #include <libwebsockets.h>
--- a/lib/wsfs/adapter/impl/session.h
+++ b/lib/wsfs/adapter/impl/session.h
@ -9,7 +9,7 @@
 using std::size_t;
 #endif

-#include "wsfs/message_queue.h"
+#include "wsfs/core/message_queue.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/wsfs/core/message.c
+++ b/lib/wsfs/core/message.c
@ -1,4 +1,4 @@
-#include "wsfs/message.h"
+#include "wsfs/core/message.h"

 #include <stdlib.h>
 #include <libwebsockets.h>
--- a/lib/wsfs/core/message.h
+++ b/lib/wsfs/core/message.h
--- a/lib/wsfs/core/message_queue.c
+++ b/lib/wsfs/core/message_queue.c
@ -1,5 +1,5 @@
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/core/message_queue.h"
+#include "wsfs/core/message.h"

 void wsfs_message_queue_init(
    struct wsfs_message_queue * queue)
--- a/lib/wsfs/core/message_queue.h
+++ b/lib/wsfs/core/message_queue.h
--- a/lib/wsfs/core/status.c
+++ b/lib/wsfs/core/status.c
@ -1,4 +1,4 @@
-#include "wsfs/status_intern.h"
+#include "wsfs/core/status_intern.h"

 #include <errno.h>

--- a/lib/wsfs/core/status_intern.h
+++ b/lib/wsfs/core/status_intern.h
@ -1,7 +1,7 @@
 #ifndef WSFS_STATUS_INTERN_H
 #define WSFS_STATUS_INTERN_H

-#include "wsfs/status.h"
+#include "wsfs/core/status.h"

 #ifdef __cplusplus
 extern "C" {
--- a/lib/wsfs/core/util.h
+++ b/lib/wsfs/core/util.h
--- a/lib/wsfs/provider/client_protocol.c
+++ b/lib/wsfs/provider/client_protocol.c
@ -8,8 +8,8 @@


 #include "wsfs/provider/provider.h"
-#include "wsfs/util.h"
-#include "wsfs/message.h"
+#include "wsfs/core/util.h"
+#include "wsfs/core/message.h"

 static void wsfsp_client_protocol_respond(
    json_t * response,
--- a/lib/wsfs/provider/client_protocol_intern.h
+++ b/lib/wsfs/provider/client_protocol_intern.h
@ -5,7 +5,7 @@
 #include "wsfs/provider/provider.h"
 #include "wsfs/provider/request.h"

-#include "wsfs/message_queue.h"
+#include "wsfs/core/message_queue.h"

 struct wsfsp_client_protocol
 {
--- a/lib/wsfs/provider/operation/close.c
+++ b/lib/wsfs/provider/operation/close.c
@ -1,6 +1,6 @@
 #include "wsfs/provider/operation/close_intern.h"
 #include <limits.h>
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfsp_close(
    struct wsfsp_invokation_context * context,
--- a/lib/wsfs/provider/operation/getattr.c
+++ b/lib/wsfs/provider/operation/getattr.c
@ -4,7 +4,7 @@

 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"


 void wsfsp_getattr(
--- a/lib/wsfs/provider/operation/lookup.c
+++ b/lib/wsfs/provider/operation/lookup.c
@ -3,7 +3,7 @@
 #include <stdbool.h>

 #include "wsfs/provider/operation/error.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfsp_lookup(
    struct wsfsp_invokation_context * context,
--- a/lib/wsfs/provider/operation/open.c
+++ b/lib/wsfs/provider/operation/open.c
@ -1,7 +1,7 @@
 #include "wsfs/provider/operation/open_intern.h"
 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfsp_open(
    struct wsfsp_invokation_context * context,
--- a/lib/wsfs/provider/operation/read.c
+++ b/lib/wsfs/provider/operation/read.c
@ -4,7 +4,7 @@
 #include <libwebsockets.h>

 #include "wsfs/provider/operation/error.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfsp_read(
    struct wsfsp_invokation_context * context,
--- a/lib/wsfs/provider/operation/readdir.c
+++ b/lib/wsfs/provider/operation/readdir.c
@ -2,7 +2,7 @@
 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/dirbuffer_intern.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"

 void wsfsp_readdir(
    struct wsfsp_invokation_context * context,