merchant

commit c0a8da8c7812509d4f185056af070e5ae93ac999
parent ddc5a9c665246a7b4d3bd05942fcbd7f31de7045
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 10 Apr 2016 00:58:42 +0200

changing code to meet latest change in GNUNET_SCHEDULER API

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
13
+++++--------
M
src/backend/taler-merchant-httpd_exchanges.c
 | 
8
++------

2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -227,11 +227,9 @@ url_handler (void *cls,
  * quit)
  *
  * @param cls NULL
- * @param tc scheduler task context
  */
 static void
-do_shutdown (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   if (NULL != mhd_task)
   {
@@ -302,11 +300,9 @@ prepare_daemon (void);
  * and schedule the next run.
  *
  * @param cls the `struct MHD_Daemon` of the HTTP server to run
- * @param tc scheduler context
  */
 static void
-run_daemon (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_daemon (void *cls)
 {
   mhd_task = NULL;
   GNUNET_assert (MHD_YES == MHD_run (mhd));
@@ -324,7 +320,7 @@ void
 TMH_trigger_daemon ()
 {
   GNUNET_SCHEDULER_cancel (mhd_task);
-  run_daemon (NULL, NULL);
+  run_daemon (NULL);
 }
 
 
@@ -433,7 +429,8 @@ prepare_daemon ()
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
   GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding run_daemon select task\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Adding run_daemon select task\n");
   ret =
       GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
 				   tv, wrs, wws,
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
@@ -216,11 +216,9 @@ keys_mgmt_cb (void *cls,
  * Task that runs the exchange's event loop using the GNUnet scheduler.
  *
  * @param cls a `struct Exchange *`
- * @param tc scheduler context (unused)
  */
 static void
-context_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+context_task (void *cls)
 {
   long timeout;
   int max_fd;
@@ -279,11 +277,9 @@ context_task (void *cls,
  * Task to return find operation result asynchronously to caller.
  *
  * @param cls a `struct TMH_EXCHANGES_FindOperation`
- * @param tc unused
  */
 static void
-return_result (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+return_result (void *cls)
 {
   struct TMH_EXCHANGES_FindOperation *fo = cls;
   struct Exchange *exchange = fo->my_exchange;