[GNUnet-SVN] r36496 - gnunet/src/consensus

[gnunet]

Author: bartpolot
Date: 2015-10-08 19:27:15 +0200 (Thu, 08 Oct 2015)
New Revision: 36496

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
Log:
- FTBFS

Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2015-10-08 17:27:14 UTC 
(rev 36495)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2015-10-08 17:27:15 UTC 
(rev 36496)
@@ -33,7 +33,7 @@
 #include "consensus_protocol.h"
 #include "consensus.h"
 
-
+#define GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX 1 // FIXME
 #define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX 
+ 1)
 
 
@@ -875,7 +875,7 @@
 
   setop = &task->cls.setop;
 
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "P%u: got set result for {%s}, status %u\n",
               session->local_peer_idx,
@@ -1097,7 +1097,7 @@
     if (ret != 3)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC, 
behaving like a good peer.\n",
-                  field); 
+                  field);
       goto not_evil;
     }
 
@@ -1114,7 +1114,7 @@
       }
       else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in 
EVIL_SPEC (unknown type), behaving like a good peer.\n"); 
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in 
EVIL_SPEC (unknown type), behaving like a good peer.\n");
         goto not_evil;
       }
       goto cleanup;
@@ -1317,7 +1317,7 @@
   struct DiffEntry *d = GNUNET_new (struct DiffEntry);
 
   d->changes = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-  
+
   return d;
 }
 
@@ -1329,7 +1329,7 @@
   struct DiffEntry *diff_new;
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
   struct DiffElementInfo *di;
- 
+
   diff_new = diff_create ();
 
   iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_1->changes);
@@ -2203,8 +2203,8 @@
                                           GNUNET_SET_RESULT_SYMMETRIC,
                                           set_result_cb,
                                           task);
-  
-  /* If the task hasn't been started yet, 
+
+  /* If the task hasn't been started yet,
      we wait for that until we commit. */
 
   if (GNUNET_YES == task->is_started)
@@ -2563,7 +2563,7 @@
   // XXX: introduce first step,
   // where we wait for all insert acks
   // from the set service
-  
+
   /* faster but brittle all-to-all */
 
   // XXX: Not implemented yet