Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2026-03-02 04:09:18 +00:00
Code Issues Releases Wiki Activity

refactor: renamed getter functions of json node

Browse Source
This commit is contained in:
Falk Werner
2020-07-12 15:34:50 +02:00
parent bf8ba05863
commit ea15d8c5cf
17 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/webfuse_provider/impl/json/node.c
View File

@@ -40,21 +40,21 @@ wfp_impl_json_is_object(
}
bool
wfp_impl_json_get_bool(
wfp_impl_json_bool_get(
struct wfp_json const * json)
{
return (WFP_JSON_BOOL == json->type) ? json->value.b : false;
}
int
wfp_impl_json_get_int(
wfp_impl_json_int_get(
struct wfp_json const * json)
{
return (WFP_JSON_INT == json->type) ? json->value.i : 0;
}
const char *
wfp_impl_json_get_string(
wfp_impl_json_string_get(
struct wfp_json const * json)
{
return (WFP_JSON_STRING == json->type) ? json->value.s : "";

6
lib/webfuse_provider/impl/json/node.h
View File

@@ -36,15 +36,15 @@ wfp_impl_json_is_object(
struct wfp_json const * json);
extern bool
wfp_impl_json_get_bool(
wfp_impl_json_bool_get(
struct wfp_json const * json);
extern int
wfp_impl_json_get_int(
wfp_impl_json_int_get(
struct wfp_json const * json);
extern const char *
wfp_impl_json_get_string(
wfp_impl_json_string_get(
struct wfp_json const * json);
extern struct wfp_json const *

6
lib/webfuse_provider/impl/jsonrpc/response.c
View File

@@ -34,18 +34,18 @@ wfp_jsonrpc_response_init(
return;
}
result->id = wfp_impl_json_get_int(id_holder);
result->id = wfp_impl_json_int_get(id_holder);
result->result = wfp_impl_json_object_get(response, "result");
if (NULL == result->result)
{
struct wfp_json const * error = wfp_impl_json_object_get(response, "error");
if ((wfp_impl_json_is_object(error)) && (wfp_impl_json_is_int(wfp_impl_json_object_get(error, "code"))))
{
int code = wfp_impl_json_get_int(wfp_impl_json_object_get(error, "code"));
int code = wfp_impl_json_int_get(wfp_impl_json_object_get(error, "code"));
char const * message = "";
if (wfp_impl_json_is_string(wfp_impl_json_object_get(error, "message")))
{
message = wfp_impl_json_get_string(wfp_impl_json_object_get(error, "message"));
message = wfp_impl_json_string_get(wfp_impl_json_object_get(error, "message"));
}
result->error = wfp_jsonrpc_error_create(code, message);
}

6
lib/webfuse_provider/impl/operation/close.c
View File

@@ -19,9 +19,9 @@ void wfp_impl_close(
wfp_impl_json_is_int(handle_holder) &&
wfp_impl_json_is_int(flags_holder))
{
ino_t inode = (ino_t) wfp_impl_json_get_int(inode_holder);
uint32_t handle = (uint32_t) (wfp_impl_json_get_int(handle_holder) & UINT32_MAX);
int flags = wfp_impl_json_get_int(flags_holder);
ino_t inode = (ino_t) wfp_impl_json_int_get(inode_holder);
uint32_t handle = (uint32_t) (wfp_impl_json_int_get(handle_holder) & UINT32_MAX);
int flags = wfp_impl_json_int_get(flags_holder);
context->provider->close(inode, handle, flags, context->user_data);
}

2
lib/webfuse_provider/impl/operation/getattr.c
View File

@@ -21,7 +21,7 @@ void wfp_impl_getattr(
if (wfp_impl_json_is_int(inode_holder))
{
ino_t inode = (ino_t) wfp_impl_json_get_int(inode_holder);
ino_t inode = (ino_t) wfp_impl_json_int_get(inode_holder);
struct wfp_request * request = wfp_impl_request_create(context->request, id);
context->provider->getattr(request, inode, context->user_data);

4
lib/webfuse_provider/impl/operation/lookup.c
View File

@@ -22,8 +22,8 @@ void wfp_impl_lookup(
if (wfp_impl_json_is_int(inode_holder) &&
wfp_impl_json_is_string(name_holder))
{
ino_t inode = wfp_impl_json_get_int(inode_holder);
char const * name = wfp_impl_json_get_string(name_holder);
ino_t inode = wfp_impl_json_int_get(inode_holder);
char const * name = wfp_impl_json_string_get(name_holder);
struct wfp_request * request = wfp_impl_request_create(context->request, id);
context->provider->lookup(request, inode, name, context->user_data);

4
lib/webfuse_provider/impl/operation/open.c
View File

@@ -19,8 +19,8 @@ void wfp_impl_open(
if (wfp_impl_json_is_int(inode_holder) &&
wfp_impl_json_is_int(flags_holder))
{
ino_t inode = (ino_t) wfp_impl_json_get_int(inode_holder);
int flags = (ino_t) wfp_impl_json_get_int(flags_holder);
ino_t inode = (ino_t) wfp_impl_json_int_get(inode_holder);
int flags = (ino_t) wfp_impl_json_int_get(flags_holder);
struct wfp_request * request = wfp_impl_request_create(context->request, id);

8
lib/webfuse_provider/impl/operation/read.c
View File

@@ -26,10 +26,10 @@ void wfp_impl_read(
wfp_impl_json_is_int(offset_holder) &&
wfp_impl_json_is_int(length_holder))
{
ino_t inode = (ino_t) wfp_impl_json_get_int(inode_holder);
int handle = wfp_impl_json_get_int(handle_holder);
size_t offset = wfp_impl_json_get_int(offset_holder);
size_t length = wfp_impl_json_get_int(length_holder);
ino_t inode = (ino_t) wfp_impl_json_int_get(inode_holder);
int handle = wfp_impl_json_int_get(handle_holder);
size_t offset = wfp_impl_json_int_get(offset_holder);
size_t length = wfp_impl_json_int_get(length_holder);
struct wfp_request * request = wfp_impl_request_create(context->request, id);
context->provider->read(request, inode, handle, offset, length, context->user_data);

2
lib/webfuse_provider/impl/operation/readdir.c
View File

@@ -18,7 +18,7 @@ void wfp_impl_readdir(
if (wfp_impl_json_is_int(inode_holder))
{
ino_t inode = (ino_t) wfp_impl_json_get_int(inode_holder);
ino_t inode = (ino_t) wfp_impl_json_int_get(inode_holder);
struct wfp_request * request = wfp_impl_request_create(context->request, id);
context->provider->readdir(request, inode, context->user_data);

4
lib/webfuse_provider/impl/provider.c
View File

@@ -97,8 +97,8 @@ void wfp_impl_provider_invoke(
if ((wfp_impl_json_is_string(method_holder)) && (wfp_impl_json_is_array(params)))
{
char const * method = wfp_impl_json_get_string(method_holder);
int id = wfp_impl_json_is_int(id_holder) ? wfp_impl_json_get_int(id_holder) : 0;
char const * method = wfp_impl_json_string_get(method_holder);
int id = wfp_impl_json_is_int(id_holder) ? wfp_impl_json_int_get(id_holder) : 0;
wfp_impl_provider_invoke_method(context, method, params, id);
}