summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-08-06 16:36:58 +0200
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-08-06 16:36:58 +0200
commitfcaa5854af792cad00c36ed1fd1c4e7fc2602f65 (patch)
tree6fe3f9257e27a6000a71eb1d6158ef192bbd78c5
parent070a1c2e37fe8930bad59cbd06d6a0f55a8364f0 (diff)
remove jsonapi dep from copying
-rw-r--r--src/rest/Makefile.am4
-rw-r--r--src/rest/plugin_rest_copying.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am
index 848b7101c..ce0454d53 100644
--- 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 f6a085c03..668dc5d38 100644
--- 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);