Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2024-10-27 20:44:10 +00:00
Code Issues Releases Wiki Activity

removed unused code; fixed memory leak

Browse Source
This commit is contained in:
Falk Werner 2020-07-10 23:27:33 +02:00
parent 6155b03cf8
commit da74c9cdbc
4 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/webfuse_provider/impl/jsonrpc/request.c
View File

@ -1,14 +1,6 @@
#include "webfuse_provider/impl/jsonrpc/request.h" #include "webfuse_provider/impl/jsonrpc/request.h"
#include "webfuse_provider/impl/jsonrpc/error.h"
#include <stdlib.h> #include <stdlib.h>
struct wfp_jsonrpc_request
{
int id;
wfp_jsonrpc_send_fn * send;
void * user_data;
};
bool bool
wfp_jsonrpc_is_request( wfp_jsonrpc_is_request(
json_t * message) json_t * message)
@ -20,18 +12,3 @@ wfp_jsonrpc_is_request(
return (json_is_integer(id) && json_is_string(method) && return (json_is_integer(id) && json_is_string(method) &&
(json_is_array(params) || json_is_object(params))); (json_is_array(params) || json_is_object(params)));
} }
void
wfp_jsonrpc_request_dispose(
struct wfp_jsonrpc_request * request)
{
free(request);
}
void *
wfp_jsonrpc_request_get_userdata(
struct wfp_jsonrpc_request * request)
{
return request->user_data;
}

15
lib/webfuse_provider/impl/jsonrpc/request.h
View File

@ -2,34 +2,19 @@
#define WFP_JSONRPC_REQUEST_H #define WFP_JSONRPC_REQUEST_H
#ifndef __cplusplus #ifndef __cplusplus
#include <stdarg.h>
#include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#else
#include <cstdarg>
#include <cstddef>
using std::size_t;
#endif #endif
#include <jansson.h> #include <jansson.h>
#include "webfuse_provider/impl/jsonrpc/send_fn.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
struct wfp_jsonrpc_request;
extern bool wfp_jsonrpc_is_request( extern bool wfp_jsonrpc_is_request(
json_t * message); json_t * message);
extern void wfp_jsonrpc_request_dispose(
struct wfp_jsonrpc_request * request);
extern void * wfp_jsonrpc_request_get_userdata(
struct wfp_jsonrpc_request * request);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

5
test/webfuse_provider/jsonrpc/test_proxy.cc
View File

@ -5,6 +5,8 @@
#include "webfuse_provider/jsonrpc/mock_timer.hpp" #include "webfuse_provider/jsonrpc/mock_timer.hpp"
#include <libwebsockets.h>
#include <thread> #include <thread>
#include <chrono> #include <chrono>
@ -48,6 +50,9 @@ namespace
SendContext * context = reinterpret_cast<SendContext*>(user_data); SendContext * context = reinterpret_cast<SendContext*>(user_data);
context->is_called = true; context->is_called = true;
context->response = request; context->response = request;
char * raw_data = request - LWS_PRE;
free(raw_data);
} }
struct FinishedContext struct FinishedContext

22
test/webfuse_provider/jsonrpc/test_request.cc
View File

@ -1,25 +1,5 @@
#include <gtest/gtest.h>
#include "webfuse_provider/impl/jsonrpc/request.h" #include "webfuse_provider/impl/jsonrpc/request.h"
#include "webfuse_provider/status.h" #include <gtest/gtest.h>
namespace
{
struct Context
{
json_t * response;
};
void jsonrpc_send(
json_t * request,
void * user_data)
{
Context * context = reinterpret_cast<Context*>(user_data);
context->response = request;
json_incref(request);
}
}
TEST(wfp_jsonrpc_request, is_request_object_params) TEST(wfp_jsonrpc_request, is_request_object_params)
{ {