6 files changed, 15 insertions, 10 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 644626dd0..bab29b097 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -251,6 +251,8 @@ tunnel_context_destroy (struct TunnelContext *tc)
  * another peer.
  *
  * @param cls the incoming socket
+ * @param tunnel the tunnel that sent the message
+ * @param tunnel_ctx the tunnel context
  * @param mh the message
  */
 static int
@@ -524,7 +526,6 @@ handle_client_evaluate (void *cls,
     return;
   }
 
-
   switch (set->operation)
   {
     case GNUNET_SET_OPERATION_INTERSECTION:
@@ -694,6 +695,8 @@ tunnel_new_cb (void *cls,
   struct Incoming *incoming;
   struct TunnelContext *tc;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "new incoming tunnel\n");
+
   GNUNET_assert (port == GNUNET_APPLICATION_TYPE_SET);
   tc = GNUNET_new (struct TunnelContext);
   incoming = GNUNET_new (struct Incoming);
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index 937bc9adc..d60b5f477 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -257,7 +257,7 @@ _GSS_union_set_create (void);
  * a remote peer.
  *
  * @param m the evaluate request message from the client
- * @parem set the set to evaluate the operation with
+ * @param set the set to evaluate the operation with
  */
 void
 _GSS_union_evaluate (struct GNUNET_SET_EvaluateMessage *m, struct Set *set);
@@ -287,7 +287,7 @@ _GSS_union_remove (struct GNUNET_SET_ElementMessage *m, struct Set *set);
 /**
  * Destroy a set that supports the union operation
  *
- * @param the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
+ * @param set the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
  */
 void
 _GSS_union_set_destroy (struct Set *set);
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 411959329..fe3ba56ea 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -1287,7 +1287,7 @@ _GSS_intersection_add (struct GNUNET_SET_ElementMessage *m, struct Set *set)
 /**
  * Destroy a set that supports the union operation
  *
- * @param the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
+ * @param set the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
  */
 void
 _GSS_union_set_destroy (struct Set *set)
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 294fa3304..670626cd4 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -493,7 +493,8 @@ send_operation_request (struct UnionEvaluateOperation *eo)
   struct GNUNET_MQ_Envelope *mqm;
   struct OperationRequestMessage *msg;
 
-  mqm = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, eo->context_msg);
+  mqm = GNUNET_MQ_msg_nested_mh (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST,
+                                 eo->context_msg);
 
   if (NULL == mqm)
   {
@@ -1287,7 +1288,7 @@ _GSS_union_add (struct GNUNET_SET_ElementMessage *m, struct Set *set)
 /**
  * Destroy a set that supports the union operation
  *
- * @param the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
+ * @param set the set to destroy, must be of type GNUNET_SET_OPERATION_UNION
  */
 void
 _GSS_union_set_destroy (struct Set *set)
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 0a2c2779b..814c9e436 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -38,7 +38,7 @@ static unsigned int num_c = 20;
 
 static unsigned int salt = 42;
 
-static char* op_str = "union";
+static char *op_str = "union";
 
 const static struct GNUNET_CONFIGURATION_Handle *config;
 
@@ -157,6 +157,7 @@ set_listen_cb (void *cls,
                struct GNUNET_SET_Request *request)
 {
   GNUNET_assert (NULL == set_oh2);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set listen cb called\n");
   set_oh2 = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED,
                                set_result_cb_2, NULL);
   GNUNET_SET_commit (set_oh2, set_b);
diff --git a/src/set/set_api.c b/src/set/set_api.c
index e1b6132cb..370846bae 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -400,14 +400,14 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh)
  * @param result_mode specified how results will be returned,
  *        see 'GNUNET_SET_ResultMode'.
  * @param result_cb callback for the results
- * @param cls closure for result_cb
+ * @param result_cls closure for result_cb
  * @return a handle to cancel the operation
  */
 struct GNUNET_SET_OperationHandle *
 GNUNET_SET_accept (struct GNUNET_SET_Request *request,
                    enum GNUNET_SET_ResultMode result_mode,
                    GNUNET_SET_ResultIterator result_cb,
-                   void *cls)
+                   void *result_cls)
 {
   struct GNUNET_MQ_Envelope *mqm;
   struct GNUNET_SET_OperationHandle *oh;
@@ -418,7 +418,7 @@ GNUNET_SET_accept (struct GNUNET_SET_Request *request,
 
   oh = GNUNET_new (struct GNUNET_SET_OperationHandle);
   oh->result_cb = result_cb;
-  oh->result_cls = cls;
+  oh->result_cls = result_cls;
 
   mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_ACCEPT);
   msg->accept_reject_id = htonl (request->accept_id);