guix-env: some update.

[oweals/gnunet.git] / src / peerinfo / test_peerinfo_api_notify_friend_only.c

diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index 8be21dd689904c9ba24d193461885df93a5299e2..e91610c2521a0a1728084d4b737ab429c19e7203 100644 (file)
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- Copyright (C) 2004, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2009 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.
  */
 
 /**
@@ -58,10 +58,10 @@ static int res_cb_wo_fo;
 
 struct GNUNET_PeerIdentity pid;
 
-struct GNUNET_SCHEDULER_Task * timeout_task;
+struct GNUNET_SCHEDULER_Task *timeout_task;
 
 static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly (void *cls)
 {
   timeout_task = NULL;
   GNUNET_break(0);
@@ -83,8 +83,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   global_ret = 255;
 }
 
+
 static void
-done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+done (void *cls)
 {
   if (NULL != pnc_w_fo)
     GNUNET_PEERINFO_notify_cancel (pnc_w_fo);
@@ -126,15 +127,18 @@ address_generator (void *cls, size_t max, void *buf)
   return ret;
 }
 
+
 static void
-process_w_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_HELLO_Message *hello, const char *err_msg)
+process_w_fo (void *cls,
+             const struct GNUNET_PeerIdentity *peer,
+             const struct GNUNET_HELLO_Message *hello,
+             const char *err_msg)
 {
-  if (err_msg != NULL )
+  if (err_msg != NULL)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
         _("Error in communication with PEERINFO service\n"));
-    GNUNET_SCHEDULER_add_now (&done, NULL );
+    GNUNET_SCHEDULER_add_now (&done, NULL);
     return;
   }
 
@@ -159,7 +163,7 @@ process_w_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
     if (0 == memcmp (&pid, peer, sizeof(pid)))
     {
       res_cb_w_fo = GNUNET_YES;
-      GNUNET_SCHEDULER_add_now (&done, NULL );
+      GNUNET_SCHEDULER_add_now (&done, NULL);
     }
     return;
   }
@@ -169,11 +173,11 @@ static void
 process_wo_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
     const struct GNUNET_HELLO_Message *hello, const char *err_msg)
 {
-  if (err_msg != NULL )
+  if (err_msg != NULL)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
         _("Error in communication with PEERINFO service\n"));
-    GNUNET_SCHEDULER_add_now (&done, NULL );
+    GNUNET_SCHEDULER_add_now (&done, NULL);
     return;
   }
 
@@ -203,20 +207,6 @@ process_wo_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 }
 
-static void
-add_peer_done (void *cls, const char *emsg)
-{
-  if (NULL == emsg)
-  {
-    return;
-  }
-  else
-  {
-    GNUNET_break(0);
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL );
-  }
-}
 
 static void
 add_peer ()
@@ -227,34 +217,37 @@ add_peer ()
   agc = 2;
   memset (&pid, 32, sizeof(pid));
   h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc,
-      GNUNET_YES);
-  GNUNET_PEERINFO_add_peer (h, h2, &add_peer_done, NULL );
+                            GNUNET_YES);
+  GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
   GNUNET_free(h2);
-
 }
 
+
 static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL );
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   mycfg = cfg;
-  pnc_w_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_YES, &process_w_fo, NULL );
-  pnc_wo_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_NO, &process_wo_fo, NULL );
+  pnc_w_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_YES, &process_w_fo, NULL);
+  pnc_wo_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_NO, &process_wo_fo, NULL);
   h = GNUNET_PEERINFO_connect (cfg);
   GNUNET_assert(NULL != h);
   add_peer ();
 }
 
+
 int
 main (int argc, char *argv[])
 {
   res_cb_w_fo = GNUNET_NO;
   res_cb_wo_fo = GNUNET_NO;
   global_ret = 3;
-  if (0
-      != GNUNET_TESTING_service_run ("test-peerinfo-api-friend-only",
-          "peerinfo", "test_peerinfo_api_data.conf", &run, NULL ))
+  if (0 != GNUNET_TESTING_service_run ("test-peerinfo-api-friend-only",
+                                      "peerinfo",
+                                      "test_peerinfo_api_data.conf",
+                                      &run, NULL))
     return 1;
   return global_ret;
 }