remove jsonapi dep from copying

diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index 848b7101ca6655631ec2216137ef677a36a252a9..ce0454d5387808c68c2a1f4864a6db6fa48c964c 100644 (file)
--- a/src/rest/Makefile.am
+++ b/src/rest/Makefile.am
@@ -35,10 +35,8 @@ libgnunet_plugin_rest_copying_la_SOURCES = \
   plugin_rest_copying.c
 libgnunet_plugin_rest_copying_la_LIBADD = \
        $(top_builddir)/src/rest/libgnunetrest.la \
-       $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
-  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
+  $(LTLIBINTL) -lmicrohttpd
 libgnunet_plugin_rest_copying_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 

diff --git a/src/rest/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
index f6a085c03ebef92f24ecbbc5705cc8d4182b973e..668dc5d38ae3b160ac9c55572ec14de326be10bc 100644 (file)
--- a/src/rest/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
@@ -24,9 +24,7 @@
 
 #include "platform.h"
 #include "gnunet_rest_plugin.h"
-#include <gnunet_jsonapi_util.h>
 #include <gnunet_rest_lib.h>
-#include <jansson.h>
 
 #define GNUNET_REST_API_NS_COPYING "/copying"
 
@@ -173,10 +171,10 @@ rest_copying_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
   handle->proc = proc;
   handle->rest_handle = conndata_handle;
 
-  if (GNUNET_NO == GNUNET_JSONAPI_handle_request (conndata_handle,
-                                                  handlers,
-                                                  &err,
-                                                  handle))
+  if (GNUNET_NO == GNUNET_REST_handle_request (conndata_handle,
+                                               handlers,
+                                               &err,
+                                               handle))
   {
     handle->response_code = err.error_code;
     GNUNET_SCHEDULER_add_now (&do_error, handle);