Fix perf_crypto_rsa.c after various changes

[oweals/gnunet.git] / src / util / test_server_disconnect.c

diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c
index b54df48893616e365310f23525c825fc559a63f6..f59fa547f213fa1beeaf1205926c0f4a6d15cc01 100644 (file)
--- a/src/util/test_server_disconnect.c
+++ b/src/util/test_server_disconnect.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 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,19 +14,15 @@
 
      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.
 */
 /**
  * @file util/test_server_disconnect.c
  * @brief tests for server.c,  specifically GNUNET_SERVER_client_disconnect
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
 
 #define PORT 12435
@@ -45,7 +41,7 @@ static int ok;
 
 
 static void
-finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+finish_up (void *cls)
 {
   GNUNET_assert (ok == 5);
   ok = 0;
@@ -56,9 +52,10 @@ finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-notify_disconnect (void *cls, struct GNUNET_SERVER_Client *clientarg)
+notify_disconnect (void *cls,
+                   struct GNUNET_SERVER_Client *clientarg)
 {
-  if (clientarg == NULL)
+  if (NULL == clientarg)
     return;
   GNUNET_assert (ok == 4);
   ok = 5;
@@ -67,7 +64,7 @@ notify_disconnect (void *cls, struct GNUNET_SERVER_Client *clientarg)
 
 
 static void
-server_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_disconnect (void *cls)
 {
   struct GNUNET_SERVER_Client *argclient = cls;
 
@@ -79,7 +76,8 @@ server_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-recv_cb (void *cls, struct GNUNET_SERVER_Client *client,
+recv_cb (void *cls,
+        struct GNUNET_SERVER_Client *client,
          const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (ok == 2);
@@ -114,7 +112,7 @@ transmit_initial_message (void *cls, size_t size, void *buf)
 
 
 static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
 {
   struct sockaddr_in sa;
   struct sockaddr *sap[2];