From da74c9cdbc68e096de9c66112679ad9d9009a52d Mon Sep 17 00:00:00 2001
From: Falk Werner <falk.werner@gmx.net>
Date: Fri, 10 Jul 2020 23:27:33 +0200
Subject: [PATCH] removed unused code; fixed memory leak

---
 lib/webfuse_provider/impl/jsonrpc/request.c   | 23 -------------------
 lib/webfuse_provider/impl/jsonrpc/request.h   | 15 ------------
 test/webfuse_provider/jsonrpc/test_proxy.cc   |  5 ++++
 test/webfuse_provider/jsonrpc/test_request.cc | 22 +-----------------
 4 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/lib/webfuse_provider/impl/jsonrpc/request.c b/lib/webfuse_provider/impl/jsonrpc/request.c
index 2ac4db1..8caf7a1 100644
--- a/lib/webfuse_provider/impl/jsonrpc/request.c
+++ b/lib/webfuse_provider/impl/jsonrpc/request.c
@@ -1,14 +1,6 @@
 #include "webfuse_provider/impl/jsonrpc/request.h"
-#include "webfuse_provider/impl/jsonrpc/error.h"
 #include <stdlib.h>
 
-struct wfp_jsonrpc_request
-{
-    int id;
-    wfp_jsonrpc_send_fn * send;
-    void * user_data;
-};
-
 bool
 wfp_jsonrpc_is_request(
     json_t * message)
@@ -20,18 +12,3 @@ wfp_jsonrpc_is_request(
     return (json_is_integer(id) && json_is_string(method) &&
             (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;
-}
diff --git a/lib/webfuse_provider/impl/jsonrpc/request.h b/lib/webfuse_provider/impl/jsonrpc/request.h
index 11514ee..5a33986 100644
--- a/lib/webfuse_provider/impl/jsonrpc/request.h
+++ b/lib/webfuse_provider/impl/jsonrpc/request.h
@@ -2,34 +2,19 @@
 #define WFP_JSONRPC_REQUEST_H
 
 #ifndef __cplusplus
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdbool.h>
-#else
-#include <cstdarg>
-#include <cstddef>
-using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "webfuse_provider/impl/jsonrpc/send_fn.h"
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct wfp_jsonrpc_request;
-
 extern bool wfp_jsonrpc_is_request(
     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
 }
 #endif
diff --git a/test/webfuse_provider/jsonrpc/test_proxy.cc b/test/webfuse_provider/jsonrpc/test_proxy.cc
index 8065c21..8dcf6ea 100644
--- a/test/webfuse_provider/jsonrpc/test_proxy.cc
+++ b/test/webfuse_provider/jsonrpc/test_proxy.cc
@@ -5,6 +5,8 @@
 
 #include "webfuse_provider/jsonrpc/mock_timer.hpp"
 
+#include <libwebsockets.h>
+
 #include <thread>
 #include <chrono>
 
@@ -48,6 +50,9 @@ namespace
         SendContext * context = reinterpret_cast<SendContext*>(user_data);
         context->is_called = true;
         context->response = request;
+
+        char * raw_data = request - LWS_PRE;
+        free(raw_data);
     }
 
     struct FinishedContext
diff --git a/test/webfuse_provider/jsonrpc/test_request.cc b/test/webfuse_provider/jsonrpc/test_request.cc
index 4ce0fab..d2ab05a 100644
--- a/test/webfuse_provider/jsonrpc/test_request.cc
+++ b/test/webfuse_provider/jsonrpc/test_request.cc
@@ -1,25 +1,5 @@
-#include <gtest/gtest.h>
 #include "webfuse_provider/impl/jsonrpc/request.h"
-#include "webfuse_provider/status.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);
-}
-
-}
+#include <gtest/gtest.h>
 
 TEST(wfp_jsonrpc_request, is_request_object_params)
 {