[GNUnet-SVN] r27357 - in gnunet/src: consensus include

[gnunet]

Author: grothoff
Date: 2013-06-03 15:08:11 +0200 (Mon, 03 Jun 2013)
New Revision: 27357

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
   gnunet/src/include/gnunet_set_service.h
Log:
-notes

Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2013-06-03 11:05:00 UTC 
(rev 27356)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2013-06-03 13:08:11 UTC 
(rev 27357)
@@ -35,7 +35,7 @@
 #include "consensus.h"
 
 
-/*
+/**
  * Log macro that prefixes the local peer and the peer we are in contact with.
  */
 #define LOG_PP(kind, cpi, m,...) GNUNET_log (kind, "P%d for P%d: " m, \
@@ -362,8 +362,10 @@
   if (NULL == session->shuffle)
     session->shuffle = GNUNET_malloc (session->num_peers * sizeof 
(*session->shuffle));
 
-  GNUNET_CRYPTO_kdf (randomness, sizeof (randomness), &session->exp_round, 
sizeof (uint32_t),
-                     &session->global_id, sizeof (struct GNUNET_HashCode));
+  GNUNET_CRYPTO_kdf (randomness, sizeof (randomness), 
+                    &session->exp_round, sizeof (uint32_t),
+                     &session->global_id, sizeof (struct GNUNET_HashCode),
+                    NULL);
 
   for (i = 0; i < session->num_peers; i++)
     session->shuffle[i] = i;

Modified: gnunet/src/include/gnunet_set_service.h
===================================================================
--- gnunet/src/include/gnunet_set_service.h     2013-06-03 11:05:00 UTC (rev 
27356)
+++ gnunet/src/include/gnunet_set_service.h     2013-06-03 13:08:11 UTC (rev 
27357)
@@ -273,7 +273,7 @@
  * @param result_cls closure for result_cb
  * @return a handle to cancel the operation
  */
-struct GNUNET_SET_OperationHandle *
+struct GNUNET_SET_OperationHandle * // FIXME: rename to _connect?
 GNUNET_SET_evaluate (const struct GNUNET_PeerIdentity *other_peer,
                      const struct GNUNET_HashCode *app_id,
                      const struct GNUNET_MessageHeader *context_msg,
@@ -344,7 +344,7 @@
  * @param oh handle to the set operation 
  * @param set the set to use for the operation
  */
-void
+void // FIXME: rename to _commit
 GNUNET_SET_conclude (struct GNUNET_SET_OperationHandle *oh,
                     struct GNUNET_SET_Handle *set);