From ea15d8c5cf89a4e67a74af05ef7f02f1da5b91b9 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 12 Jul 2020 15:34:50 +0200 Subject: [PATCH] refactor: renamed getter functions of json node --- lib/webfuse_provider/impl/json/node.c | 6 ++--- lib/webfuse_provider/impl/json/node.h | 6 ++--- lib/webfuse_provider/impl/jsonrpc/response.c | 6 ++--- lib/webfuse_provider/impl/operation/close.c | 6 ++--- lib/webfuse_provider/impl/operation/getattr.c | 2 +- lib/webfuse_provider/impl/operation/lookup.c | 4 ++-- lib/webfuse_provider/impl/operation/open.c | 4 ++-- lib/webfuse_provider/impl/operation/read.c | 8 +++---- lib/webfuse_provider/impl/operation/readdir.c | 2 +- lib/webfuse_provider/impl/provider.c | 4 ++-- .../webfuse_provider/json/test_json_parser.cc | 10 ++++----- .../webfuse_provider/jsonrpc/test_response.cc | 2 +- test/webfuse_provider/mocks/mock_request.cc | 4 ++-- test/webfuse_provider/mocks/mock_request.hpp | 22 +++++++++---------- test/webfuse_provider/provider/test_client.cc | 16 +++++++------- .../provider/test_client_protocol.cc | 14 ++++++------ .../test_util/webfuse_server.cc | 4 ++-- 17 files changed, 60 insertions(+), 60 deletions(-) diff --git a/lib/webfuse_provider/impl/json/node.c b/lib/webfuse_provider/impl/json/node.c index 37ba7b0..4a8c56d 100644 --- a/lib/webfuse_provider/impl/json/node.c +++ b/lib/webfuse_provider/impl/json/node.c @@ -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 : ""; diff --git a/lib/webfuse_provider/impl/json/node.h b/lib/webfuse_provider/impl/json/node.h index e7a4ba2..dc40888 100644 --- a/lib/webfuse_provider/impl/json/node.h +++ b/lib/webfuse_provider/impl/json/node.h @@ -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 * diff --git a/lib/webfuse_provider/impl/jsonrpc/response.c b/lib/webfuse_provider/impl/jsonrpc/response.c index 3b225ca..c17900f 100644 --- a/lib/webfuse_provider/impl/jsonrpc/response.c +++ b/lib/webfuse_provider/impl/jsonrpc/response.c @@ -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); } diff --git a/lib/webfuse_provider/impl/operation/close.c b/lib/webfuse_provider/impl/operation/close.c index cd864bf..58218b5 100644 --- a/lib/webfuse_provider/impl/operation/close.c +++ b/lib/webfuse_provider/impl/operation/close.c @@ -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); } diff --git a/lib/webfuse_provider/impl/operation/getattr.c b/lib/webfuse_provider/impl/operation/getattr.c index dbd6c98..1642d58 100644 --- a/lib/webfuse_provider/impl/operation/getattr.c +++ b/lib/webfuse_provider/impl/operation/getattr.c @@ -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); diff --git a/lib/webfuse_provider/impl/operation/lookup.c b/lib/webfuse_provider/impl/operation/lookup.c index 1097843..c1af3dd 100644 --- a/lib/webfuse_provider/impl/operation/lookup.c +++ b/lib/webfuse_provider/impl/operation/lookup.c @@ -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); diff --git a/lib/webfuse_provider/impl/operation/open.c b/lib/webfuse_provider/impl/operation/open.c index 6639ab8..5b7ba0e 100644 --- a/lib/webfuse_provider/impl/operation/open.c +++ b/lib/webfuse_provider/impl/operation/open.c @@ -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); diff --git a/lib/webfuse_provider/impl/operation/read.c b/lib/webfuse_provider/impl/operation/read.c index 7478b05..08ad6f9 100644 --- a/lib/webfuse_provider/impl/operation/read.c +++ b/lib/webfuse_provider/impl/operation/read.c @@ -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); diff --git a/lib/webfuse_provider/impl/operation/readdir.c b/lib/webfuse_provider/impl/operation/readdir.c index 5c312f4..7fb8de9 100644 --- a/lib/webfuse_provider/impl/operation/readdir.c +++ b/lib/webfuse_provider/impl/operation/readdir.c @@ -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); diff --git a/lib/webfuse_provider/impl/provider.c b/lib/webfuse_provider/impl/provider.c index 88a57da..2686c5f 100644 --- a/lib/webfuse_provider/impl/provider.c +++ b/lib/webfuse_provider/impl/provider.c @@ -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); } diff --git a/test/webfuse_provider/json/test_json_parser.cc b/test/webfuse_provider/json/test_json_parser.cc index 366cf66..a8975ae 100644 --- a/test/webfuse_provider/json/test_json_parser.cc +++ b/test/webfuse_provider/json/test_json_parser.cc @@ -18,7 +18,7 @@ TEST(json_parser, parse_true) ASSERT_NE(nullptr, doc); wfp_json const * root = wfp_impl_json_doc_root(doc); ASSERT_TRUE(wfp_impl_json_is_bool(root)); - ASSERT_TRUE(wfp_impl_json_get_bool(root)); + ASSERT_TRUE(wfp_impl_json_bool_get(root)); wfp_impl_json_doc_dispose(doc); } @@ -30,7 +30,7 @@ TEST(json_parser, parse_false) ASSERT_NE(nullptr, doc); wfp_json const * root = wfp_impl_json_doc_root(doc); ASSERT_TRUE(wfp_impl_json_is_bool(root)); - ASSERT_FALSE(wfp_impl_json_get_bool(root)); + ASSERT_FALSE(wfp_impl_json_bool_get(root)); wfp_impl_json_doc_dispose(doc); } @@ -42,7 +42,7 @@ TEST(json_parser, parse_int) ASSERT_NE(nullptr, doc); wfp_json const * root = wfp_impl_json_doc_root(doc); ASSERT_TRUE(wfp_impl_json_is_int(root)); - ASSERT_EQ(42, wfp_impl_json_get_int(root)); + ASSERT_EQ(42, wfp_impl_json_int_get(root)); wfp_impl_json_doc_dispose(doc); } @@ -54,7 +54,7 @@ TEST(json_parser, parse_negative_int) ASSERT_NE(nullptr, doc); wfp_json const * root = wfp_impl_json_doc_root(doc); ASSERT_TRUE(wfp_impl_json_is_int(root)); - ASSERT_EQ(-1234, wfp_impl_json_get_int(root)); + ASSERT_EQ(-1234, wfp_impl_json_int_get(root)); wfp_impl_json_doc_dispose(doc); } @@ -66,7 +66,7 @@ TEST(json_parser, parse_string) ASSERT_NE(nullptr, doc); wfp_json const * root = wfp_impl_json_doc_root(doc); ASSERT_TRUE(wfp_impl_json_is_string(root)); - ASSERT_STREQ("brummni", wfp_impl_json_get_string(root)); + ASSERT_STREQ("brummni", wfp_impl_json_string_get(root)); wfp_impl_json_doc_dispose(doc); } diff --git a/test/webfuse_provider/jsonrpc/test_response.cc b/test/webfuse_provider/jsonrpc/test_response.cc index fd9f919..1f43de1 100644 --- a/test/webfuse_provider/jsonrpc/test_response.cc +++ b/test/webfuse_provider/jsonrpc/test_response.cc @@ -16,7 +16,7 @@ TEST(wfp_json_response, init_result) ASSERT_EQ(nullptr, response.error); ASSERT_TRUE(wfp_impl_json_is_int(response.result)); - ASSERT_EQ(47, wfp_impl_json_get_int(response.result)); + ASSERT_EQ(47, wfp_impl_json_int_get(response.result)); ASSERT_EQ(11, response.id); wfp_jsonrpc_response_cleanup(&response); diff --git a/test/webfuse_provider/mocks/mock_request.cc b/test/webfuse_provider/mocks/mock_request.cc index b21d10d..0202589 100644 --- a/test/webfuse_provider/mocks/mock_request.cc +++ b/test/webfuse_provider/mocks/mock_request.cc @@ -24,7 +24,7 @@ static void webfuse_test_MockRequest_respond( wfp_json const * id_holder = wfp_impl_json_object_get(response, "id"); if (wfp_impl_json_is_int(id_holder)) { - id = wfp_impl_json_get_int(id_holder); + id = wfp_impl_json_int_get(id_holder); } if (nullptr != result) @@ -40,7 +40,7 @@ static void webfuse_test_MockRequest_respond( wfp_json const * error_code_holder = wfp_impl_json_object_get(response, "error"); if (wfp_impl_json_is_int(error_code_holder)) { - error_code = wfp_impl_json_get_int(error_code_holder); + error_code = wfp_impl_json_int_get(error_code_holder); } } diff --git a/test/webfuse_provider/mocks/mock_request.hpp b/test/webfuse_provider/mocks/mock_request.hpp index 402d8f2..a860038 100644 --- a/test/webfuse_provider/mocks/mock_request.hpp +++ b/test/webfuse_provider/mocks/mock_request.hpp @@ -21,21 +21,21 @@ public: MATCHER_P3(StatMatcher, inode, mode, file_type, "") { wfp_json const * inode_holder = wfp_impl_json_object_get(arg, "inode"); - if ((!wfp_impl_json_is_int(inode_holder)) || (inode != wfp_impl_json_get_int(inode_holder))) + if ((!wfp_impl_json_is_int(inode_holder)) || (inode != wfp_impl_json_int_get(inode_holder))) { *result_listener << "missing inode"; return false; } wfp_json const * mode_holder = wfp_impl_json_object_get(arg, "mode"); - if ((!wfp_impl_json_is_int(mode_holder)) || (mode != wfp_impl_json_get_int(mode_holder))) + if ((!wfp_impl_json_is_int(mode_holder)) || (mode != wfp_impl_json_int_get(mode_holder))) { *result_listener << "missing mode"; return false; } wfp_json const * type_holder = wfp_impl_json_object_get(arg, "type"); - if ((!wfp_impl_json_is_string(type_holder)) || (0 != strcmp(file_type, wfp_impl_json_get_string(type_holder)))) + if ((!wfp_impl_json_is_string(type_holder)) || (0 != strcmp(file_type, wfp_impl_json_string_get(type_holder)))) { *result_listener << "missing type"; return false; @@ -47,7 +47,7 @@ MATCHER_P3(StatMatcher, inode, mode, file_type, "") MATCHER_P(OpenMatcher, handle, "") { wfp_json const * handle_holder = wfp_impl_json_object_get(arg, "handle"); - if ((!wfp_impl_json_is_int(handle_holder)) || (handle != wfp_impl_json_get_int(handle_holder))) + if ((!wfp_impl_json_is_int(handle_holder)) || (handle != wfp_impl_json_int_get(handle_holder))) { *result_listener << "missing handle"; return false; @@ -59,23 +59,23 @@ MATCHER_P(OpenMatcher, handle, "") MATCHER_P3(ReadResultMatcher, data, format, count, "") { wfp_json const * format_holder = wfp_impl_json_object_get(arg, "format"); - if ((!wfp_impl_json_is_string(format_holder)) || (0 != strcmp(format, wfp_impl_json_get_string(format_holder)))) + if ((!wfp_impl_json_is_string(format_holder)) || (0 != strcmp(format, wfp_impl_json_string_get(format_holder)))) { - *result_listener << "invalid or missing format: " << wfp_impl_json_get_string(format_holder); + *result_listener << "invalid or missing format: " << wfp_impl_json_string_get(format_holder); return false; } wfp_json const * count_holder = wfp_impl_json_object_get(arg, "count"); - if ((!wfp_impl_json_is_int(count_holder)) || (count != wfp_impl_json_get_int(count_holder))) + if ((!wfp_impl_json_is_int(count_holder)) || (count != wfp_impl_json_int_get(count_holder))) { - *result_listener << "invalid or missing count: " << wfp_impl_json_get_int(count_holder); + *result_listener << "invalid or missing count: " << wfp_impl_json_int_get(count_holder); return false; } wfp_json const * data_holder = wfp_impl_json_object_get(arg, "data"); - if ((!wfp_impl_json_is_string(data_holder)) || (0 != strcmp(data, wfp_impl_json_get_string(data_holder)))) + if ((!wfp_impl_json_is_string(data_holder)) || (0 != strcmp(data, wfp_impl_json_string_get(data_holder)))) { - *result_listener << "invalid or missing data: " << wfp_impl_json_get_string(data_holder); + *result_listener << "invalid or missing data: " << wfp_impl_json_string_get(data_holder); return false; } @@ -121,7 +121,7 @@ MATCHER_P(ReaddirMatcher, contained_elements , "") wfp_json const * value = wfp_impl_json_array_get(arg, j); wfp_json const * name = wfp_impl_json_object_get(value, "name"); - found = (0 == strcmp(element, wfp_impl_json_get_string(name))); + found = (0 == strcmp(element, wfp_impl_json_string_get(name))); if (found) { break; diff --git a/test/webfuse_provider/provider/test_client.cc b/test/webfuse_provider/provider/test_client.cc index 64c7e7f..5580203 100644 --- a/test/webfuse_provider/provider/test_client.cc +++ b/test/webfuse_provider/provider/test_client.cc @@ -155,13 +155,13 @@ TEST(Client, Lookup) wfp_json const * result = wfp_impl_json_object_get(response, "result"); wfp_json const * inode = wfp_impl_json_object_get(result, "inode"); - ASSERT_EQ(42, wfp_impl_json_get_int(inode)); + ASSERT_EQ(42, wfp_impl_json_int_get(inode)); wfp_json const * mode = wfp_impl_json_object_get(result, "mode"); - ASSERT_EQ(0644, wfp_impl_json_get_int(mode)); + ASSERT_EQ(0644, wfp_impl_json_int_get(mode)); wfp_json const * type = wfp_impl_json_object_get(result, "type"); - ASSERT_STREQ("file", wfp_impl_json_get_string(type)); + ASSERT_STREQ("file", wfp_impl_json_string_get(type)); client.Disconnect(); ASSERT_EQ(std::future_status::ready, disconnected.get_future().wait_for(TIMEOUT)); @@ -203,7 +203,7 @@ TEST(Client, LookupFail) wfp_json const * error = wfp_impl_json_object_get(response, "error"); wfp_json const * code = wfp_impl_json_object_get(error, "code"); - ASSERT_NE(0, wfp_impl_json_get_int(code)); + ASSERT_NE(0, wfp_impl_json_int_get(code)); client.Disconnect(); ASSERT_EQ(std::future_status::ready, disconnected.get_future().wait_for(TIMEOUT)); @@ -245,7 +245,7 @@ TEST(Client, Open) wfp_json const * result = wfp_impl_json_object_get(response, "result"); wfp_json const * handle = wfp_impl_json_object_get(result, "handle"); - ASSERT_EQ(4711, wfp_impl_json_get_int(handle)); + ASSERT_EQ(4711, wfp_impl_json_int_get(handle)); client.Disconnect(); ASSERT_EQ(std::future_status::ready, disconnected.get_future().wait_for(TIMEOUT)); @@ -288,13 +288,13 @@ TEST(Client, Read) wfp_json const * result = wfp_impl_json_object_get(response, "result"); wfp_json const * format = wfp_impl_json_object_get(result, "format"); - ASSERT_STREQ("base64", wfp_impl_json_get_string(format)); + ASSERT_STREQ("base64", wfp_impl_json_string_get(format)); wfp_json const * count = wfp_impl_json_object_get(result, "count"); - ASSERT_EQ(1, wfp_impl_json_get_int(count)); + ASSERT_EQ(1, wfp_impl_json_int_get(count)); wfp_json const * data = wfp_impl_json_object_get(result, "data"); - ASSERT_STREQ("Kg==", wfp_impl_json_get_string(data)); + ASSERT_STREQ("Kg==", wfp_impl_json_string_get(data)); client.Disconnect(); ASSERT_EQ(std::future_status::ready, disconnected.get_future().wait_for(TIMEOUT)); diff --git a/test/webfuse_provider/provider/test_client_protocol.cc b/test/webfuse_provider/provider/test_client_protocol.cc index fa41cb4..6507359 100644 --- a/test/webfuse_provider/provider/test_client_protocol.cc +++ b/test/webfuse_provider/provider/test_client_protocol.cc @@ -109,7 +109,7 @@ public: wfp_json const * method = wfp_impl_json_object_get(request, "method"); ASSERT_TRUE(wfp_impl_json_is_string(method)); - ASSERT_STREQ("authenticate", wfp_impl_json_get_string(method)); + ASSERT_STREQ("authenticate", wfp_impl_json_string_get(method)); wfp_json const * id = wfp_impl_json_object_get(request, "id"); ASSERT_TRUE(wfp_impl_json_is_int(id)); @@ -120,21 +120,21 @@ public: wfp_json const * type = wfp_impl_json_array_get(params, 0); ASSERT_TRUE(wfp_impl_json_is_string(type)); - ASSERT_STREQ("username", wfp_impl_json_get_string(type)); + ASSERT_STREQ("username", wfp_impl_json_string_get(type)); wfp_json const * credentials = wfp_impl_json_array_get(params, 1); ASSERT_TRUE(wfp_impl_json_is_object(credentials)); wfp_json const * username = wfp_impl_json_object_get(credentials, "username"); ASSERT_TRUE(wfp_impl_json_is_string(username)); - ASSERT_STREQ(expected_username.c_str(), wfp_impl_json_get_string(username)); + ASSERT_STREQ(expected_username.c_str(), wfp_impl_json_string_get(username)); wfp_json const * password = wfp_impl_json_object_get(credentials, "password"); ASSERT_TRUE(wfp_impl_json_is_string(password)); - ASSERT_STREQ(expected_password.c_str(), wfp_impl_json_get_string(password)); + ASSERT_STREQ(expected_password.c_str(), wfp_impl_json_string_get(password)); std::ostringstream response; - response << "{\"result\": {}, \"id\": " << wfp_impl_json_get_int(id) << "}"; + response << "{\"result\": {}, \"id\": " << wfp_impl_json_int_get(id) << "}"; SendToClient(response.str()); } @@ -146,7 +146,7 @@ public: wfp_json const * method = wfp_impl_json_object_get(request, "method"); ASSERT_TRUE(wfp_impl_json_is_string(method)); - ASSERT_STREQ("add_filesystem", wfp_impl_json_get_string(method)); + ASSERT_STREQ("add_filesystem", wfp_impl_json_string_get(method)); wfp_json const * params = wfp_impl_json_object_get(request, "params"); ASSERT_TRUE(wfp_impl_json_is_array(params)); @@ -159,7 +159,7 @@ public: ASSERT_TRUE(wfp_impl_json_is_int(id)); std::ostringstream response; - response << "{\"result\": {\"id\": \"" << wfp_impl_json_get_string(filesystem) << "\"}, \"id\": " << wfp_impl_json_get_int(id) << "}"; + response << "{\"result\": {\"id\": \"" << wfp_impl_json_string_get(filesystem) << "\"}, \"id\": " << wfp_impl_json_int_get(id) << "}"; SendToClient(response.str()); } diff --git a/test/webfuse_provider/test_util/webfuse_server.cc b/test/webfuse_provider/test_util/webfuse_server.cc index 6ea9900..1b85ac8 100644 --- a/test/webfuse_provider/test_util/webfuse_server.cc +++ b/test/webfuse_provider/test_util/webfuse_server.cc @@ -205,13 +205,13 @@ public: wfp_json const * method = wfp_impl_json_object_get(message, "method"); if (wfp_impl_json_is_string(method)) { - if (0 == strcmp("add_filesystem", wfp_impl_json_get_string(method))) + if (0 == strcmp("add_filesystem", wfp_impl_json_string_get(method))) { wfp_json const * id = wfp_impl_json_object_get(message, "id"); std::ostringstream response; response << "{\"result\": {\"id\": \"" << GetFilesystem() << "\"}, " - << "\"id\": " << wfp_impl_json_get_int(id) << "}"; + << "\"id\": " << wfp_impl_json_int_get(id) << "}"; { std::unique_lock lock(mutex); write_queue.push(response.str());