1
0
mirror of https://github.com/falk-werner/webfuse-provider synced 2026-03-02 04:09:18 +00:00

switched prefix to wfp for old wf stuff

This commit is contained in:
Falk Werner
2020-06-16 23:57:41 +02:00
parent 2f80ebffcc
commit 83b76a1a5a
133 changed files with 1324 additions and 1324 deletions

View File

@@ -25,10 +25,10 @@ class AdapterClient::Private
{
public:
Private(
wf_client_callback_fn * callback,
wfp_client_callback_fn * callback,
void * user_data,
std::string const & url)
: client(wf_client_create(callback, user_data))
: client(wfp_client_create(callback, user_data))
, url_(url)
, command(Command::run)
, tempdir("webfuse_adpter_client")
@@ -40,7 +40,7 @@ public:
{
ApplyCommand(Command::shutdown);
thread.join();
wf_client_dispose(client);
wfp_client_dispose(client);
}
void ApplyCommand(Command actual_command)
@@ -50,7 +50,7 @@ public:
command = actual_command;
}
wf_client_interrupt(client);
wfp_client_interrupt(client);
}
std::string GetDir()
@@ -74,19 +74,19 @@ private:
switch (actual_command)
{
case Command::run:
wf_client_service(self->client);
wfp_client_service(self->client);
break;
case Command::connect:
wf_client_connect(self->client, self->url_.c_str());
wfp_client_connect(self->client, self->url_.c_str());
break;
case Command::disconnect:
wf_client_disconnect(self->client);
wfp_client_disconnect(self->client);
break;
case Command::authenticate:
wf_client_authenticate(self->client);
wfp_client_authenticate(self->client);
break;
case Command::add_filesystem:
wf_client_add_filesystem(self->client, self->tempdir.path(), "test");
wfp_client_add_filesystem(self->client, self->tempdir.path(), "test");
break;
case Command::shutdown:
// fall-through
@@ -98,7 +98,7 @@ private:
}
}
wf_client * client;
wfp_client * client;
std::string url_;
Command command;
TempDir tempdir;
@@ -107,7 +107,7 @@ private:
};
AdapterClient::AdapterClient(
wf_client_callback_fn * callback,
wfp_client_callback_fn * callback,
void * user_data,
std::string const & url)
: d(new Private(callback, user_data, url))

View File

@@ -1,5 +1,5 @@
#ifndef WF_UTILS_ADAPTER_CLIENT_HPP
#define WF_UTILS_APAPTER_CLIENT_HPP
#ifndef WFP_UTILS_ADAPTER_CLIENT_HPP
#define WFP_UTILS_APAPTER_CLIENT_HPP
#include "webfuse/adapter/client.h"
#include <string>
@@ -13,7 +13,7 @@ class AdapterClient
AdapterClient& operator=(AdapterClient const &) = delete;
public:
AdapterClient(
wf_client_callback_fn * callback,
wfp_client_callback_fn * callback,
void * user_data,
std::string const & url);
~AdapterClient();

View File

@@ -1,5 +1,5 @@
#ifndef WF_TEST_FILE_UTILS_HPP
#define WF_TEST_FILE_UTILS_HPP
#ifndef WFP_TEST_FILE_UTILS_HPP
#define WFP_TEST_FILE_UTILS_HPP
#include <string>

View File

@@ -2,9 +2,9 @@
#include <stdlib.h>
#include <string.h>
#define WF_PATH_DEFAULT_CAPACITY (8)
#define WFP_PATH_DEFAULT_CAPACITY (8)
struct wf_path
struct wfp_path
{
char * * elements;
size_t count;
@@ -12,8 +12,8 @@ struct wf_path
};
static void
wf_path_add(
struct wf_path * path,
wfp_path_add(
struct wfp_path * path,
char const * element,
size_t element_size)
{
@@ -40,32 +40,32 @@ wf_path_add(
}
}
struct wf_path *
wf_path_create(
struct wfp_path *
wfp_path_create(
char const * value)
{
struct wf_path * path = malloc(sizeof(struct wf_path));
path->elements = malloc(sizeof(char*) * WF_PATH_DEFAULT_CAPACITY);
path->capacity = WF_PATH_DEFAULT_CAPACITY;
struct wfp_path * path = malloc(sizeof(struct wfp_path));
path->elements = malloc(sizeof(char*) * WFP_PATH_DEFAULT_CAPACITY);
path->capacity = WFP_PATH_DEFAULT_CAPACITY;
path->count = 0;
char const * remainder = value;
char const * pos = strchr(remainder, '/');
while (NULL != pos)
{
wf_path_add(path, remainder, (pos - remainder));
wfp_path_add(path, remainder, (pos - remainder));
remainder = pos + 1;
pos = strchr(remainder, '/');
}
wf_path_add(path, remainder, strlen(remainder));
wfp_path_add(path, remainder, strlen(remainder));
return path;
}
void
wf_path_dispose(
struct wf_path * path)
wfp_path_dispose(
struct wfp_path * path)
{
for(size_t i = 0; i < path->count; i++)
{
@@ -78,15 +78,15 @@ wf_path_dispose(
}
size_t
wf_path_element_count(
struct wf_path * path)
wfp_path_element_count(
struct wfp_path * path)
{
return path->count;
}
char const *
wf_path_get_element(
struct wf_path * path,
wfp_path_get_element(
struct wfp_path * path,
size_t i)
{
char const * result = NULL;
@@ -99,8 +99,8 @@ wf_path_get_element(
}
char const *
wf_path_get_filename(
struct wf_path * path)
wfp_path_get_filename(
struct wfp_path * path)
{
char const * result = NULL;

View File

@@ -1,5 +1,5 @@
#ifndef WF_PATH_H
#define WF_PATH_H
#ifndef WFP_PATH_H
#define WFP_PATH_H
#ifndef __cplusplus
#include <stddef.h>
@@ -13,28 +13,28 @@ extern "C"
{
#endif
struct wf_path;
struct wfp_path;
extern struct wf_path *
wf_path_create(
extern struct wfp_path *
wfp_path_create(
char const * value);
extern void
wf_path_dispose(
struct wf_path * path);
wfp_path_dispose(
struct wfp_path * path);
extern size_t
wf_path_element_count(
struct wf_path * path);
wfp_path_element_count(
struct wfp_path * path);
extern char const *
wf_path_get_element(
struct wf_path * path,
wfp_path_get_element(
struct wfp_path * path,
size_t i);
extern char const *
wf_path_get_filename(
struct wf_path * path);
wfp_path_get_filename(
struct wfp_path * path);
#ifdef __cplusplus
}

View File

@@ -165,16 +165,16 @@ wfp_static_filesystem_add_dir(
static size_t
wfp_static_filesystem_make_parent(
struct wfp_static_filesystem * filesystem,
struct wf_path * path)
struct wfp_path * path)
{
size_t result = WFP_STATIC_FILSYSTEM_INODE_ROOT;
size_t count = wf_path_element_count(path);
size_t count = wfp_path_element_count(path);
if (0 < count)
{
for(size_t i = 0; i < (count - 1); i++)
{
char const * name = wf_path_get_element(path, i);
char const * name = wfp_path_get_element(path, i);
result = wfp_static_filesystem_add_dir(filesystem, result, name);
}
}
@@ -217,7 +217,7 @@ static void wfp_static_filesystem_lookup(
}
else
{
wfp_respond_error(request, WF_BAD_NOENTRY);
wfp_respond_error(request, WFP_BAD_NOENTRY);
}
}
@@ -238,7 +238,7 @@ static void wfp_static_filesystem_getattr(
}
else
{
wfp_respond_error(request, WF_BAD_NOENTRY);
wfp_respond_error(request, WFP_BAD_NOENTRY);
}
}
@@ -270,7 +270,7 @@ static void wfp_static_filesystem_readdir(
}
else
{
wfp_respond_error(request, WF_BAD_NOENTRY);
wfp_respond_error(request, WFP_BAD_NOENTRY);
}
}
@@ -291,19 +291,19 @@ static void wfp_static_filesystem_open(
}
else
{
wfp_respond_error(request, WF_BAD_ACCESS_DENIED);
wfp_respond_error(request, WFP_BAD_ACCESS_DENIED);
}
}
else
{
wfp_respond_error(request, WF_BAD_NOENTRY);
wfp_respond_error(request, WFP_BAD_NOENTRY);
}
}
static void wfp_static_filesystem_read(
struct wfp_request * request,
ino_t inode,
uint32_t WF_UNUSED_PARAM(handle),
uint32_t WFP_UNUSED_PARAM(handle),
size_t offset,
size_t length,
void * user_data)
@@ -321,7 +321,7 @@ static void wfp_static_filesystem_read(
}
else
{
wfp_respond_error(request, WF_BAD_NOENTRY);
wfp_respond_error(request, WFP_BAD_NOENTRY);
}
}
@@ -373,14 +373,14 @@ wfp_static_filesystem_add(
char const * content,
size_t length)
{
struct wf_path * path_ = wf_path_create(path);
struct wfp_path * path_ = wfp_path_create(path);
if (NULL != path_)
{
size_t parent = wfp_static_filesystem_make_parent(filesystem, path_);
struct wfp_static_filesystem_entry * entry = wfp_static_filesystem_add_entry(filesystem);
entry->parent = parent;
entry->is_file = true;
entry->name = strdup(wf_path_get_filename(path_));
entry->name = strdup(wfp_path_get_filename(path_));
entry->mode = mode;
entry->size = length;
entry->get_info = &wfp_static_filesystem_entry_get_info;
@@ -390,7 +390,7 @@ wfp_static_filesystem_add(
entry->content = malloc(length);
memcpy(entry->content, content, length);
wf_path_dispose(path_);
wfp_path_dispose(path_);
}
}

View File

@@ -1,5 +1,5 @@
#ifndef WF_TEST_TEMPDIR_HPP
#define WF_TEST_TEMPDIR_HPP
#ifndef WFP_TEST_TEMPDIR_HPP
#define WFP_TEST_TEMPDIR_HPP
namespace webfuse_test
{

View File

@@ -1,5 +1,5 @@
#ifndef WF_TEST_TIMEOUT_WATCHER_HPP
#define WF_TEST_TIMEOUT_WATCHER_HPP
#ifndef WFP_TEST_TIMEOUT_WATCHER_HPP
#define WFP_TEST_TIMEOUT_WATCHER_HPP
#include <chrono>
#include <functional>

View File

@@ -1,7 +1,7 @@
#ifndef WF_WRAP_HPP
#define WF_WRAP_HPP
#ifndef WFP_WRAP_HPP
#define WFP_WRAP_HPP
#define WF_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
#define WFP_WRAP_FUNC0( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (); \
RETURN_TYPE __wrap_ ## FUNC_NAME () \
{ \
@@ -15,7 +15,7 @@
} \
}
#define WF_WRAP_FUNC1( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE ) \
#define WFP_WRAP_FUNC1( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1) \
{ \
@@ -29,7 +29,7 @@
} \
}
#define WF_WRAP_FUNC2( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE ) \
#define WFP_WRAP_FUNC2( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2) \
{ \
@@ -43,7 +43,7 @@
} \
}
#define WF_WRAP_FUNC3( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE ) \
#define WFP_WRAP_FUNC3( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3) \
{ \
@@ -57,7 +57,7 @@
} \
}
#define WF_WRAP_FUNC4( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE ) \
#define WFP_WRAP_FUNC4( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3, ARG4_TYPE arg4) \
{ \
@@ -71,7 +71,7 @@
} \
}
#define WF_WRAP_FUNC5( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE ) \
#define WFP_WRAP_FUNC5( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3, ARG4_TYPE arg4, ARG5_TYPE arg5) \
{ \
@@ -85,7 +85,7 @@
} \
}
#define WF_WRAP_FUNC6( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE, ARG6_TYPE ) \
#define WFP_WRAP_FUNC6( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE, ARG6_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE, ARG6_TYPE); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3, ARG4_TYPE arg4, ARG5_TYPE arg5, ARG6_TYPE arg6) \
{ \
@@ -100,7 +100,7 @@
}
#define WF_WRAP_VFUNC3( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE ) \
#define WFP_WRAP_VFUNC3( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, va_list); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3, va_list args) \
{ \
@@ -114,7 +114,7 @@
} \
}
#define WF_WRAP_VFUNC5( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE ) \
#define WFP_WRAP_VFUNC5( GLOBAL_VAR, RETURN_TYPE, FUNC_NAME, ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE ) \
extern RETURN_TYPE __real_ ## FUNC_NAME (ARG1_TYPE, ARG2_TYPE, ARG3_TYPE, ARG4_TYPE, ARG5_TYPE, va_list); \
RETURN_TYPE __wrap_ ## FUNC_NAME (ARG1_TYPE arg1, ARG2_TYPE arg2, ARG3_TYPE arg3, ARG4_TYPE arg4, ARG5_TYPE arg5, va_list args) \
{ \

View File

@@ -63,7 +63,7 @@ private:
extern "C"
{
static int wf_test_utils_ws_server_callback(
static int wfp_test_utils_ws_server_callback(
struct lws * wsi,
enum lws_callback_reasons reason,
void * user,
@@ -146,12 +146,12 @@ WsServer::Private::Private(std::string const & protocol, int port)
, is_shutdown_requested(false)
, wsi_(nullptr)
{
wf_lwslog_disable();
wfp_lwslog_disable();
IServer * server = this;
memset(ws_protocols, 0, sizeof(struct lws_protocols) * 2 );
ws_protocols[0].name = protocol_.c_str();
ws_protocols[0].callback = &wf_test_utils_ws_server_callback;
ws_protocols[0].callback = &wfp_test_utils_ws_server_callback;
ws_protocols[0].per_session_data_size = 0;
ws_protocols[0].user = reinterpret_cast<void*>(server);

View File

@@ -1,5 +1,5 @@
#ifndef WF_TEST_UTILS_WS_SERVER_HPP
#define WF_TEST_UTILS_WS_SERVER_HPP
#ifndef WFP_TEST_UTILS_WS_SERVER_HPP
#define WFP_TEST_UTILS_WS_SERVER_HPP
#include <jansson.h>
#include <string>

View File

@@ -26,7 +26,7 @@ public:
extern "C"
{
static int wf_test_utils_ws_server_callback(
static int wfp_test_utils_ws_server_callback(
struct lws * wsi,
enum lws_callback_reasons reason,
void * user,
@@ -150,12 +150,12 @@ WsServer2::Private::Private(
, is_shutdown_requested(false)
, wsi_(nullptr)
{
wf_lwslog_disable();
wfp_lwslog_disable();
IServer * server = this;
memset(ws_protocols, 0, sizeof(struct lws_protocols) * 2 );
ws_protocols[0].name = protocol_.c_str();
ws_protocols[0].callback = &wf_test_utils_ws_server_callback;
ws_protocols[0].callback = &wfp_test_utils_ws_server_callback;
ws_protocols[0].per_session_data_size = 0;
ws_protocols[0].user = reinterpret_cast<void*>(server);

View File

@@ -1,5 +1,5 @@
#ifndef WF_TEST_UTILS_WS_SERVER2_HPP
#define WF_TEST_UTILS_WS_SERVER2_HPP
#ifndef WFP_TEST_UTILS_WS_SERVER2_HPP
#define WFP_TEST_UTILS_WS_SERVER2_HPP
#include <jansson.h>
#include <string>