plugin datastore mysql

[oweals/gnunet.git] / src / testbed / test_testbed_api_test.c

diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index 4f52d6638dbbb15a9f816afbd0912fe09bd3e568..61d3f2aba13db7af7c524a8f6e9842b8cadf6575 100644 (file)
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -1,6 +1,6 @@
 /*
   This file is part of GNUnet
-  (C) 2008--2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2008--2013 GNUnet e.V.
 
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -70,10 +70,9 @@ static int result;
  * Shutdown nicely
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   shutdown_task = NULL;
   if (NULL != abort_task)
@@ -93,7 +92,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_SCHEDULER_cancel (abort_task);                           \
       abort_task = NULL;                            \
       if (NULL == shutdown_task)                    \
-        shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL);   \
+        shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);   \
       return;                                                           \
     }                                                                   \
   } while (0)
@@ -103,16 +102,15 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * abort task to run on test timed out
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
 {
   LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
   abort_task = NULL;
   if (NULL != shutdown_task)
     GNUNET_SCHEDULER_cancel (shutdown_task);
-  do_shutdown (cls, tc);
+  do_shutdown (cls);
 }