reorganized project: prepared to extract common functionality

include/wsfs.h

@@ -1,9 +0,0 @@
-#ifndef WSFS_H
-#define WSFS_H
-
-#include <wsfs/api.h>
-#include <wsfs/server.h>
-#include <wsfs/server_config.h>
-#include <wsfs/server_protocol.h>
-
-#endif

include/wsfs/adapter/server.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_H
 #define WSFS_SERVER_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server;
 struct wsfs_server_config;

include/wsfs/adapter/server_config.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_CONFIG_H
 #define WSFS_SERVER_CONFIG_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server_config
 {

include/wsfs/adapter/server_protocol.h

@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_PROTOCOL_H
 #define WSFS_SERVER_PROTOCOL_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server_protocol;
 struct lws_protocols;

include/wsfs/provider/client.h

@@ -1,7 +1,7 @@
 #ifndef WSFSP_CLIENT_H
 #define WSFSP_CLIENT_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_provider;
 struct wsfsp_client;

include/wsfs/provider/client_protocol.h

@@ -1,7 +1,7 @@
 #ifndef WSFSP_CLIENT_PROTOCOL_H
 #define WSFSP_CLIENT_PROTOCOL_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_client_protocol;
 struct wsfsp_provider;

include/wsfs/provider/dirbuffer.h

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_dirbuffer;
 

include/wsfs/provider/operation/close.h

@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 typedef void wsfsp_close_fn(
     ino_t inode,

include/wsfs/provider/operation/error.h

@@ -1,7 +1,7 @@
 #ifndef WSFSP_OPERATION_ERROR_H
 #define WSFSP_OPERATION_ERROR_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 

include/wsfs/provider/operation/getattr.h

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 

include/wsfs/provider/operation/lookup.h

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 

include/wsfs/provider/operation/open.h

@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 

include/wsfs/provider/operation/read.h

@@ -14,7 +14,7 @@ using std::size_t;
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 

include/wsfs/provider/operation/readdir.h

@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_dirbuffer;
 struct wsfsp_request;

include/wsfs/provider/provider.h

@@ -1,12 +1,12 @@
 #ifndef WSFSP_PROVIDER_H
 #define WSFSP_PROVIDER_H
 
-#include <wsfsp/operation/lookup.h>
-#include <wsfsp/operation/getattr.h>
-#include <wsfsp/operation/readdir.h>
-#include <wsfsp/operation/open.h>
-#include <wsfsp/operation/close.h>
-#include <wsfsp/operation/read.h>
+#include <wsfs/provider/operation/lookup.h>
+#include <wsfs/provider/operation/getattr.h>
+#include <wsfs/provider/operation/readdir.h>
+#include <wsfs/provider/operation/open.h>
+#include <wsfs/provider/operation/close.h>
+#include <wsfs/provider/operation/read.h>
 
 typedef void wsfsp_connected_fn(
     void * user_data);

include/wsfs_adapter.h

@@ -0,0 +1,9 @@
+#ifndef WSFS_H
+#define WSFS_H
+
+#include <wsfs/adapter/api.h>
+#include <wsfs/adapter/server.h>
+#include <wsfs/adapter/server_config.h>
+#include <wsfs/adapter/server_protocol.h>
+
+#endif

include/wsfs_provider.h

@@ -1,18 +1,18 @@
 #ifndef WSFSP_H
 #define WSFSP_H
 
-#include <wsfsp/api.h>
-#include <wsfsp/client.h>
-#include <wsfsp/client_protocol.h>
-#include <wsfsp/provider.h>
-#include <wsfsp/dirbuffer.h>
+#include <wsfs/provider/api.h>
+#include <wsfs/provider/client.h>
+#include <wsfs/provider/client_protocol.h>
+#include <wsfs/provider/provider.h>
+#include <wsfs/provider/dirbuffer.h>
 
-#include <wsfsp/operation/error.h>
-#include <wsfsp/operation/lookup.h>
-#include <wsfsp/operation/getattr.h>
-#include <wsfsp/operation/readdir.h>
-#include <wsfsp/operation/open.h>
-#include <wsfsp/operation/close.h>
-#include <wsfsp/operation/read.h>
+#include <wsfs/provider/operation/error.h>
+#include <wsfs/provider/operation/lookup.h>
+#include <wsfs/provider/operation/getattr.h>
+#include <wsfs/provider/operation/readdir.h>
+#include <wsfs/provider/operation/open.h>
+#include <wsfs/provider/operation/close.h>
+#include <wsfs/provider/operation/read.h>
 
 #endif