1 files changed, 28 insertions, 34 deletions

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index b01b897d8..339d347f8 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1119,15 +1119,16 @@ estimate_best_mode_of_operation (uint64_t avg_element_size,
     ibf_bucket_count = IBF_MIN_SIZE;
   }
   uint64_t ibf_message_count = ceil ( ((float) ibf_bucket_count)
-                                      / MAX_BUCKETS_PER_MESSAGE);
+                                      / ((float) MAX_BUCKETS_PER_MESSAGE));
 
   uint64_t estimated_counter_size = ceil (
-    MIN (2 * log2l ((float) local_set_size / ibf_bucket_count), log2l (
-           local_set_size)));
+    MIN (2 * log2l (((float) local_set_size)
+                    / ((float) ibf_bucket_count)),
+         log2l (local_set_size)));
 
   long double counter_bytes = (float) estimated_counter_size / 8;
 
-  uint64_t ibf_bytes = ceil ((sizeof(struct IBFMessage) * ibf_message_count)
+  uint64_t ibf_bytes = ceil ((sizeof (struct IBFMessage) * ibf_message_count)
                              * 1.2   \
                              + (ibf_bucket_count * sizeof(struct IBF_Key)) * 1.2   \
                              + (ibf_bucket_count * sizeof(struct IBF_KeyHash))
@@ -1135,18 +1136,18 @@ estimate_best_mode_of_operation (uint64_t avg_element_size,
                              + (ibf_bucket_count * counter_bytes) * 1.2);
 
   /* Estimate full byte count for differential sync */
-  uint64_t element_size = (avg_element_size + sizeof(struct
-                                                     GNUNET_SETU_ElementMessage))   \
+  uint64_t element_size = (avg_element_size
+                           + sizeof (struct GNUNET_SETU_ElementMessage))   \
                           * estimated_total_diff;
   uint64_t done_size = sizeof_done_header;
-  uint64_t inquery_size = (sizeof(struct IBF_Key) + sizeof(struct
-                                                           InquiryMessage))
+  uint64_t inquery_size = (sizeof (struct IBF_Key)
+                           + sizeof (struct InquiryMessage))
                           * estimated_total_diff;
   uint64_t demand_size =
     (sizeof(struct GNUNET_HashCode) + sizeof(struct GNUNET_MessageHeader))
     * estimated_total_diff;
-  uint64_t offer_size = (sizeof(struct GNUNET_HashCode) + sizeof(struct
-                                                                 GNUNET_MessageHeader))
+  uint64_t offer_size = (sizeof (struct GNUNET_HashCode)
+                         + sizeof (struct GNUNET_MessageHeader))
                         * estimated_total_diff;
 
   uint64_t total_bytes_diff = (element_size + done_size + inquery_size
@@ -1183,12 +1184,13 @@ estimate_best_mode_of_operation (uint64_t avg_element_size,
  * @param allowed_phases
  * @param size_phases
  * @param op
- * @return GNUNET_YES if message permitted in phase and GNUNET_NO if not permitted in given
+ * @return #GNUNET_YES if message permitted in phase and #GNUNET_NO if not permitted in given
  * phase
  */
-static int
-check_valid_phase (const uint8_t allowed_phases[], size_t size_phases, struct
-                   Operation *op)
+static enum GNUNET_GenericReturnValue
+check_valid_phase (const uint8_t allowed_phases[],
+                   size_t size_phases,
+                   struct Operation *op)
 {
   /**
    * Iterate over allowed phases
@@ -2146,11 +2148,15 @@ send_ibf (struct Operation *op,
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "sending ibf of size %u\n",
-       1 << ibf_size);
+       (unsigned int) ibf_size);
 
   {
     char name[64];
-    GNUNET_snprintf (name, sizeof(name), "# sent IBF (order %u)", ibf_size);
+
+    GNUNET_snprintf (name,
+                     sizeof(name),
+                     "# sent IBF (order %u)",
+                     ibf_size);
     GNUNET_STATISTICS_update (_GSS_statistics, name, 1, GNUNET_NO);
   }
 
@@ -4111,26 +4117,20 @@ handle_union_p2p_offer (void *cls,
     perf_store.demand.sent += 1;
     perf_store.demand.sent_var_bytes += sizeof(struct GNUNET_HashCode);
 #endif
-    ev = GNUNET_MQ_msg_header_extra (demands,
-                                     sizeof(struct GNUNET_HashCode),
-                                     GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND);
     /* Save send demand message for message control */
     if (GNUNET_YES !=
         update_message_control_flow (
           op->message_control_flow,
           MSG_CFS_SENT,
           hash,
-          DEMAND_MESSAGE)
-        )
+          DEMAND_MESSAGE))
     {
-      // GNUNET_free (ev);
       LOG (GNUNET_ERROR_TYPE_ERROR,
            "Double demand message sent found!\n");
       GNUNET_break (0);
       fail_union_operation (op);
       return;
     }
-    ;
 
     /* Mark offer as received received */
     if (GNUNET_YES !=
@@ -4138,37 +4138,31 @@ handle_union_p2p_offer (void *cls,
           op->message_control_flow,
           MSG_CFS_RECEIVED,
           hash,
-          OFFER_MESSAGE)
-        )
+          OFFER_MESSAGE))
     {
-      // GNUNET_free (ev);
       LOG (GNUNET_ERROR_TYPE_ERROR,
            "Double offer message received found!\n");
       GNUNET_break (0);
       fail_union_operation (op);
       return;
     }
-    ;
-
     /* Mark element to be expected to received */
     if (GNUNET_YES !=
         update_message_control_flow (
           op->message_control_flow,
           MSG_CFS_EXPECTED,
           hash,
-          ELEMENT_MESSAGE)
-        )
+          ELEMENT_MESSAGE))
     {
-      // GNUNET_free (ev);
       LOG (GNUNET_ERROR_TYPE_ERROR,
            "Element already expected!\n");
       GNUNET_break (0);
       fail_union_operation (op);
       return;
     }
-    ;
-
-
+    ev = GNUNET_MQ_msg_header_extra (demands,
+                                     sizeof(struct GNUNET_HashCode),
+                                     GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND);
     GNUNET_memcpy (&demands[1],
                    hash,
                    sizeof(struct GNUNET_HashCode));