[GNUnet-SVN] r27323 - gnunet/src/set

[gnunet]

Author: grothoff
Date: 2013-05-29 10:17:49 +0200 (Wed, 29 May 2013)
New Revision: 27323

Modified:
   gnunet/src/set/gnunet-service-set_union.c
Log:
-cleanup and some remarks

Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c   2013-05-28 10:03:21 UTC (rev 
27322)
+++ gnunet/src/set/gnunet-service-set_union.c   2013-05-29 08:17:49 UTC (rev 
27323)
@@ -825,7 +825,7 @@
   send_cls.ibf_key = ibf_key;
   send_cls.eo = eo;
   GNUNET_CONTAINER_multihashmap32_get_multiple (eo->key_to_element, (uint32_t) 
ibf_key.key_val,
-                                                send_element_iterator, 
&send_cls);
+                                                &send_element_iterator, 
&send_cls);
 }
 
 
@@ -862,13 +862,15 @@
       next_order++;
       if (next_order <= MAX_IBF_ORDER)
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "decoding failed, sending 
larger ibf (size %u)\n",
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+                   "decoding failed, sending larger ibf (size %u)\n",
                     1<<next_order);
         send_ibf (eo, next_order);
       }
       else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "set union failed: reached ibf 
limit\n");
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                   "set union failed: reached ibf limit\n");
       }
       break;
     }
@@ -1180,10 +1182,8 @@
 
   GNUNET_assert (NULL == eo->mq);
   GNUNET_assert (socket == eo->socket);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "open cb successful\n");
-
-
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+             "open cb successful\n");
   eo->mq = GNUNET_STREAM_mq_create (eo->socket, union_handlers, NULL, eo);
   /* we started the operation, thus we have to send the operation request */
   send_operation_request (eo);
@@ -1212,15 +1212,14 @@
   eo->salt = ntohs (m->salt);
   eo->app_id = m->app_id;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "evaluating union operation, (app 
%s)\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+             "evaluating union operation, (app %s)\n", 
               GNUNET_h2s (&eo->app_id));
 
   eo->socket = 
       GNUNET_STREAM_open (configuration, &eo->peer, 
GNUNET_APPLICATION_TYPE_SET,
-                          stream_open_cb, eo,
+                          &stream_open_cb, eo,
                           GNUNET_STREAM_OPTION_END);
-
-
   GNUNET_CONTAINER_DLL_insert (eo->set->state.u->ops_head,
                                eo->set->state.u->ops_tail,
                                eo);
@@ -1251,7 +1250,7 @@
   GNUNET_assert (0 != ntohl (m->request_id));
   eo->request_id = ntohl (m->request_id);
   eo->se = strata_estimator_dup (set->state.u->se);
-  eo->set = set;
+  eo->set = set; // FIXME: redundant!?
   eo->mq = incoming->mq;
   /* transfer ownership of mq and socket from incoming to eo */
   incoming->mq = NULL;