update clang-format

diff --git a/contrib/conf/editors/clang-format b/contrib/conf/editors/clang-format
index f891f01464fd2542ed3c576b83d7946bd05ba5d4..ff9333612c791c6073c439b09c2e7f6e3ffa0d83 100644 (file)
--- a/contrib/conf/editors/clang-format
+++ b/contrib/conf/editors/clang-format
@@ -8,6 +8,7 @@ AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
@@ -49,12 +50,12 @@ ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
+ExperimentalAutoDetectBinPacking: true
 FixNamespaceComments: true
 ForEachMacros:   
   - foreach
@@ -97,6 +98,7 @@ ReflowComments:  true
 SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: true
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCpp11BracedList: false
@@ -115,7 +117,7 @@ Standard:        Cpp11
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
-TabWidth:        8
+TabWidth:        2
 UseTab:          Never
 ...
 

diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index bb4cd671655c5c5875d108535c1535ec5a7d0e2f..9d4bcd967487362f2a69acd9e87587bba36ae593 100644 (file)
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -563,15 +563,17 @@ issue_ticket_result_cb (void *cls,
   struct TicketIssueOperation *tio = cls;
   if (GNUNET_OK != success) {
     send_ticket_result (tio->client, tio->r_id, NULL, GNUNET_SYSERR);
-    GNUNET_CONTAINER_DLL_remove (
-        tio->client->issue_op_head, tio->client->issue_op_tail, tio);
+    GNUNET_CONTAINER_DLL_remove (tio->client->issue_op_head,
+                                 tio->client->issue_op_tail,
+                                 tio);
     GNUNET_free (tio);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error issuing ticket: %s\n", emsg);
     return;
   }
   send_ticket_result (tio->client, tio->r_id, ticket, GNUNET_SYSERR);
-  GNUNET_CONTAINER_DLL_remove (
-      tio->client->issue_op_head, tio->client->issue_op_tail, tio);
+  GNUNET_CONTAINER_DLL_remove (tio->client->issue_op_head,
+                               tio->client->issue_op_tail,
+                               tio);
   GNUNET_free (tio);
 }
 
@@ -602,8 +604,11 @@ handle_issue_ticket_message (void *cls, const struct IssueTicketMessage *im)
   tio->r_id = ntohl (im->id);
   tio->client = idp;
   GNUNET_CONTAINER_DLL_insert (idp->issue_op_head, idp->issue_op_tail, tio);
-  RECLAIM_TICKETS_issue (
-      &im->identity, attrs, &im->rp, &issue_ticket_result_cb, tio);
+  RECLAIM_TICKETS_issue (&im->identity,
+                         attrs,
+                         &im->rp,
+                         &issue_ticket_result_cb,
+                         tio);
   GNUNET_SERVICE_client_continue (idp->client);
   GNUNET_RECLAIM_ATTRIBUTE_list_destroy (attrs);
 }
@@ -624,8 +629,9 @@ revoke_result_cb (void *cls, int32_t success)
   trm->id = htonl (rop->r_id);
   trm->success = htonl (success);
   GNUNET_MQ_send (rop->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (
-      rop->client->revoke_op_head, rop->client->revoke_op_tail, rop);
+  GNUNET_CONTAINER_DLL_remove (rop->client->revoke_op_head,
+                               rop->client->revoke_op_tail,
+                               rop);
   GNUNET_free (rop);
 }
 
@@ -656,7 +662,7 @@ handle_revoke_ticket_message (void *cls, const struct RevokeTicketMessage *rm)
   rop->client = idp;
   GNUNET_CONTAINER_DLL_insert (idp->revoke_op_head, idp->revoke_op_tail, rop);
   rop->rh
-      = RECLAIM_TICKETS_revoke (ticket, &rm->identity, &revoke_result_cb, rop);
+    = RECLAIM_TICKETS_revoke (ticket, &rm->identity, &revoke_result_cb, rop);
   GNUNET_SERVICE_client_continue (idp->client);
 }
 
@@ -689,8 +695,9 @@ consume_result_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error consuming ticket: %s\n", emsg);
   }
   attrs_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (attrs);
-  env = GNUNET_MQ_msg_extra (
-      crm, attrs_len, GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT);
+  env = GNUNET_MQ_msg_extra (crm,
+                             attrs_len,
+                             GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT);
   crm->id = htonl (cop->r_id);
   crm->attrs_len = htons (attrs_len);
   crm->identity = *identity;
@@ -698,8 +705,9 @@ consume_result_cb (void *cls,
   data_tmp = (char *)&crm[1];
   GNUNET_RECLAIM_ATTRIBUTE_list_serialize (attrs, data_tmp);
   GNUNET_MQ_send (cop->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (
-      cop->client->consume_op_head, cop->client->consume_op_tail, cop);
+  GNUNET_CONTAINER_DLL_remove (cop->client->consume_op_head,
+                               cop->client->consume_op_tail,
+                               cop);
   GNUNET_free (cop);
 }
 
@@ -714,8 +722,8 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
   cop->r_id = ntohl (cm->id);
   cop->client = idp;
   ticket = (struct GNUNET_RECLAIM_Ticket *)&cm[1];
-  cop->ch = RECLAIM_TICKETS_consume (
-      &cm->identity, ticket, &consume_result_cb, cop);
+  cop->ch
+    = RECLAIM_TICKETS_consume (&cm->identity, ticket, &consume_result_cb, cop);
   GNUNET_CONTAINER_DLL_insert (idp->consume_op_head, idp->consume_op_tail, cop);
   GNUNET_SERVICE_client_continue (idp->client);
 }
@@ -747,12 +755,14 @@ attr_store_cont (void *cls, int32_t success, const char *emsg)
   struct SuccessResultMessage *acr_msg;
 
   ash->ns_qe = NULL;
-  GNUNET_CONTAINER_DLL_remove (
-      ash->client->store_op_head, ash->client->store_op_tail, ash);
+  GNUNET_CONTAINER_DLL_remove (ash->client->store_op_head,
+                               ash->client->store_op_tail,
+                               ash);
 
   if (GNUNET_SYSERR == success) {
-    GNUNET_log (
-        GNUNET_ERROR_TYPE_ERROR, "Failed to store attribute %s\n", emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to store attribute %s\n",
+                emsg);
     cleanup_as_handle (ash);
     GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     return;
@@ -786,10 +796,10 @@ attr_store_task (void *cls)
   // Give the ash a new id if unset
   if (0 == ash->claim->id)
     ash->claim->id
-        = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX);
+      = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX);
   GNUNET_RECLAIM_ATTRIBUTE_serialize (ash->claim, buf);
-  label = GNUNET_STRINGS_data_to_string_alloc (&ash->claim->id,
-                                               sizeof (uint64_t));
+  label
+    = GNUNET_STRINGS_data_to_string_alloc (&ash->claim->id, sizeof (uint64_t));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypting with label %s\n", label);
 
   rd[0].data_size = buf_size;
@@ -797,8 +807,13 @@ attr_store_task (void *cls)
   rd[0].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR;
   rd[0].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
   rd[0].expiration_time = ash->exp.rel_value_us;
-  ash->ns_qe = GNUNET_NAMESTORE_records_store (
-      nsh, &ash->identity, label, 1, rd, &attr_store_cont, ash);
+  ash->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
+                                               &ash->identity,
+                                               label,
+                                               1,
+                                               rd,
+                                               &attr_store_cont,
+                                               ash);
   GNUNET_free (buf);
 }
 
@@ -855,8 +870,9 @@ cleanup_adh (struct AttributeDeleteHandle *adh)
   if (NULL != adh->claim)
     GNUNET_free (adh->claim);
   while (NULL != (le = adh->tickets_to_update_head)) {
-    GNUNET_CONTAINER_DLL_remove (
-        adh->tickets_to_update_head, adh->tickets_to_update_tail, le);
+    GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
+                                 adh->tickets_to_update_tail,
+                                 le);
     if (NULL != le->label)
       GNUNET_free (le->label);
     if (NULL != le->data)
@@ -873,8 +889,9 @@ send_delete_response (struct AttributeDeleteHandle *adh, int32_t success)
   struct GNUNET_MQ_Envelope *env;
   struct SuccessResultMessage *acr_msg;
 
-  GNUNET_CONTAINER_DLL_remove (
-      adh->client->delete_op_head, adh->client->delete_op_tail, adh);
+  GNUNET_CONTAINER_DLL_remove (adh->client->delete_op_head,
+                               adh->client->delete_op_tail,
+                               adh);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending SUCCESS_RESPONSE message\n");
   env = GNUNET_MQ_msg (acr_msg, GNUNET_MESSAGE_TYPE_RECLAIM_SUCCESS_RESPONSE);
@@ -913,8 +930,9 @@ ticket_iter (void *cls,
     le->rd_count = rd_count;
     le->label = GNUNET_strdup (label);
     GNUNET_GNSRECORD_records_serialize (rd_count, rd, le->data_size, le->data);
-    GNUNET_CONTAINER_DLL_insert (
-        adh->tickets_to_update_head, adh->tickets_to_update_tail, le);
+    GNUNET_CONTAINER_DLL_insert (adh->tickets_to_update_head,
+                                 adh->tickets_to_update_tail,
+                                 le);
   }
   GNUNET_NAMESTORE_zone_iterator_next (adh->ns_it, 1);
 }
@@ -948,12 +966,15 @@ update_tickets (void *cls)
               "Updating %s\n",
               adh->tickets_to_update_head->label);
   le = adh->tickets_to_update_head;
-  GNUNET_CONTAINER_DLL_remove (
-      adh->tickets_to_update_head, adh->tickets_to_update_tail, le);
+  GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
+                               adh->tickets_to_update_tail,
+                               le);
   struct GNUNET_GNSRECORD_Data rd[le->rd_count];
   struct GNUNET_GNSRECORD_Data rd_new[le->rd_count - 1];
-  GNUNET_GNSRECORD_records_deserialize (
-      le->data_size, le->data, le->rd_count, rd);
+  GNUNET_GNSRECORD_records_deserialize (le->data_size,
+                                        le->data,
+                                        le->rd_count,
+                                        rd);
   int j = 0;
   for (int i = 0; i < le->rd_count; i++) {
     if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type)
@@ -962,8 +983,13 @@ update_tickets (void *cls)
     rd_new[j] = rd[i];
     j++;
   }
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (
-      nsh, &adh->identity, le->label, j, rd_new, &ticket_updated, adh);
+  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
+                                               &adh->identity,
+                                               le->label,
+                                               j,
+                                               rd_new,
+                                               &ticket_updated,
+                                               adh);
   GNUNET_free (le->label);
   GNUNET_free (le->data);
   GNUNET_free (le);
@@ -984,8 +1010,9 @@ ticket_iter_err (void *cls)
 {
   struct AttributeDeleteHandle *adh = cls;
   adh->ns_it = NULL;
-  GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR, "Namestore error on delete %s\n", adh->label);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Namestore error on delete %s\n",
+              adh->label);
   send_delete_response (adh, GNUNET_SYSERR);
   cleanup_adh (adh);
 }
@@ -1012,8 +1039,9 @@ attr_delete_cont (void *cls, int32_t success, const char *emsg)
   struct AttributeDeleteHandle *adh = cls;
   adh->ns_qe = NULL;
   if (GNUNET_SYSERR == success) {
-    GNUNET_log (
-        GNUNET_ERROR_TYPE_ERROR, "Error deleting attribute %s\n", adh->label);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error deleting attribute %s\n",
+                adh->label);
     send_delete_response (adh, GNUNET_SYSERR);
     cleanup_adh (adh);
     return;
@@ -1054,13 +1082,18 @@ handle_attribute_delete_message (void *cls,
 
   adh->r_id = ntohl (dam->id);
   adh->identity = dam->identity;
-  adh->label = GNUNET_STRINGS_data_to_string_alloc (&adh->claim->id,
-                                                    sizeof (uint64_t));
+  adh->label
+    = GNUNET_STRINGS_data_to_string_alloc (&adh->claim->id, sizeof (uint64_t));
   GNUNET_SERVICE_client_continue (idp->client);
   adh->client = idp;
   GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh);
-  adh->ns_qe = GNUNET_NAMESTORE_records_store (
-      nsh, &adh->identity, adh->label, 0, NULL, &attr_delete_cont, adh);
+  adh->ns_qe = GNUNET_NAMESTORE_records_store (nsh,
+                                               &adh->identity,
+                                               adh->label,
+                                               0,
+                                               NULL,
+                                               &attr_delete_cont,
+                                               adh);
 }
 
 
@@ -1079,8 +1112,9 @@ attr_iter_error (void *cls)
 {
   struct AttributeIterator *ai = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to iterate over attributes\n");
-  GNUNET_CONTAINER_DLL_remove (
-      ai->client->attr_iter_head, ai->client->attr_iter_tail, ai);
+  GNUNET_CONTAINER_DLL_remove (ai->client->attr_iter_head,
+                               ai->client->attr_iter_tail,
+                               ai);
   cleanup_attribute_iter_handle (ai);
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
@@ -1096,8 +1130,9 @@ attr_iter_finished (void *cls)
   arm->id = htonl (ai->request_id);
   arm->attr_len = htons (0);
   GNUNET_MQ_send (ai->client->mq, env);
-  GNUNET_CONTAINER_DLL_remove (
-      ai->client->attr_iter_head, ai->client->attr_iter_tail, ai);
+  GNUNET_CONTAINER_DLL_remove (ai->client->attr_iter_head,
+                               ai->client->attr_iter_tail,
+                               ai);
   cleanup_attribute_iter_handle (ai);
 }
 
@@ -1123,8 +1158,9 @@ attr_iter_cb (void *cls,
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n", label);
-  env = GNUNET_MQ_msg_extra (
-      arm, rd->data_size, GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT);
+  env = GNUNET_MQ_msg_extra (arm,
+                             rd->data_size,
+                             GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT);
   arm->id = htonl (ai->request_id);
   arm->attr_len = htons (rd->data_size);
   GNUNET_CRYPTO_ecdsa_key_get_public (zone, &arm->identity);
@@ -1221,8 +1257,9 @@ ticket_iter_cb (void *cls, struct GNUNET_RECLAIM_Ticket *ticket)
   if (NULL == ticket) {
     /* send empty response to indicate end of list */
     env = GNUNET_MQ_msg (trm, GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT);
-    GNUNET_CONTAINER_DLL_remove (
-        ti->client->ticket_iter_head, ti->client->ticket_iter_tail, ti);
+    GNUNET_CONTAINER_DLL_remove (ti->client->ticket_iter_head,
+                                 ti->client->ticket_iter_tail,
+                                 ti);
   } else {
     env = GNUNET_MQ_msg_extra (trm,
                                sizeof (struct GNUNET_RECLAIM_Ticket),
@@ -1237,7 +1274,7 @@ ticket_iter_cb (void *cls, struct GNUNET_RECLAIM_Ticket *ticket)
 
 static void
 handle_ticket_iteration_start (
-    void *cls, const struct TicketIterationStartMessage *tis_msg)
+  void *cls, const struct TicketIterationStartMessage *tis_msg)
 {
   struct IdpClient *client = cls;
   struct TicketIteration *ti;
@@ -1248,10 +1285,11 @@ handle_ticket_iteration_start (
   ti->r_id = ntohl (tis_msg->id);
   ti->client = client;
 
-  GNUNET_CONTAINER_DLL_insert (
-      client->ticket_iter_head, client->ticket_iter_tail, ti);
-  ti->iter = RECLAIM_TICKETS_iteration_start (
-      &tis_msg->identity, &ticket_iter_cb, ti);
+  GNUNET_CONTAINER_DLL_insert (client->ticket_iter_head,
+                               client->ticket_iter_tail,
+                               ti);
+  ti->iter
+    = RECLAIM_TICKETS_iteration_start (&tis_msg->identity, &ticket_iter_cb, ti);
   GNUNET_SERVICE_client_continue (client->client);
 }
 
@@ -1276,8 +1314,9 @@ handle_ticket_iteration_stop (void *cls,
     return;
   }
   RECLAIM_TICKETS_iteration_stop (ti->iter);
-  GNUNET_CONTAINER_DLL_remove (
-      client->ticket_iter_head, client->ticket_iter_tail, ti);
+  GNUNET_CONTAINER_DLL_remove (client->ticket_iter_head,
+                               client->ticket_iter_tail,
+                               ti);
   GNUNET_free (ti);
   GNUNET_SERVICE_client_continue (client->client);
 }
@@ -1339,10 +1378,11 @@ run (void *cls,
                                               "reclaim",
                                               "TOKEN_EXPIRATION_INTERVAL",
                                               &token_expiration_interval)) {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Time window for zone iteration: %s\n",
-                GNUNET_STRINGS_relative_time_to_string (
-                    token_expiration_interval, GNUNET_YES));
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_DEBUG,
+      "Time window for zone iteration: %s\n",
+      GNUNET_STRINGS_relative_time_to_string (token_expiration_interval,
+                                              GNUNET_YES));
   } else {
     token_expiration_interval = DEFAULT_TOKEN_EXPIRATION_INTERVAL;
   }
@@ -1380,8 +1420,9 @@ client_disconnect_cb (void *cls,
     GNUNET_free (iss);
   }
   while (NULL != (ct = idp->consume_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (
-        idp->consume_op_head, idp->consume_op_tail, ct);
+    GNUNET_CONTAINER_DLL_remove (idp->consume_op_head,
+                                 idp->consume_op_tail,
+                                 ct);
     if (NULL != ct->ch)
       RECLAIM_TICKETS_consume_cancel (ct->ch);
     GNUNET_free (ct);
@@ -1406,8 +1447,9 @@ client_disconnect_cb (void *cls,
     GNUNET_free (rop);
   }
   while (NULL != (ti = idp->ticket_iter_head)) {
-    GNUNET_CONTAINER_DLL_remove (
-        idp->ticket_iter_head, idp->ticket_iter_tail, ti);
+    GNUNET_CONTAINER_DLL_remove (idp->ticket_iter_head,
+                                 idp->ticket_iter_tail,
+                                 ti);
     GNUNET_free (ti);
   }
   GNUNET_free (idp);
@@ -1438,58 +1480,56 @@ client_connect_cb (void *cls,
  * Define "main" method using service macro.
  */
 GNUNET_SERVICE_MAIN (
-    "reclaim",
-    GNUNET_SERVICE_OPTION_NONE,
-    &run,
-    &client_connect_cb,
-    &client_disconnect_cb,
-    NULL,
-    GNUNET_MQ_hd_var_size (attribute_store_message,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE,
-                           struct AttributeStoreMessage,
+  "reclaim",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &client_connect_cb,
+  &client_disconnect_cb,
+  NULL,
+  GNUNET_MQ_hd_var_size (attribute_store_message,
+                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE,
+                         struct AttributeStoreMessage,
+                         NULL),
+  GNUNET_MQ_hd_var_size (attribute_delete_message,
+                         GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_DELETE,
+                         struct AttributeDeleteMessage,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (
+    iteration_start,
+    GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START,
+    struct AttributeIterationStartMessage,
+    NULL),
+  GNUNET_MQ_hd_fixed_size (iteration_next,
+                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT,
+                           struct AttributeIterationNextMessage,
                            NULL),
-    GNUNET_MQ_hd_var_size (attribute_delete_message,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_DELETE,
-                           struct AttributeDeleteMessage,
+  GNUNET_MQ_hd_fixed_size (iteration_stop,
+                           GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP,
+                           struct AttributeIterationStopMessage,
                            NULL),
-    GNUNET_MQ_hd_fixed_size (
-        iteration_start,
-        GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START,
-        struct AttributeIterationStartMessage,
-        NULL),
-    GNUNET_MQ_hd_fixed_size (
-        iteration_next,
-        GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT,
-        struct AttributeIterationNextMessage,
-        NULL),
-    GNUNET_MQ_hd_fixed_size (
-        iteration_stop,
-        GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP,
-        struct AttributeIterationStopMessage,
-        NULL),
-    GNUNET_MQ_hd_var_size (issue_ticket_message,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET,
-                           struct IssueTicketMessage,
+  GNUNET_MQ_hd_var_size (issue_ticket_message,
+                         GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET,
+                         struct IssueTicketMessage,
+                         NULL),
+  GNUNET_MQ_hd_var_size (consume_ticket_message,
+                         GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET,
+                         struct ConsumeTicketMessage,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (ticket_iteration_start,
+                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START,
+                           struct TicketIterationStartMessage,
                            NULL),
-    GNUNET_MQ_hd_var_size (consume_ticket_message,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET,
-                           struct ConsumeTicketMessage,
+  GNUNET_MQ_hd_fixed_size (ticket_iteration_next,
+                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT,
+                           struct TicketIterationNextMessage,
                            NULL),
-    GNUNET_MQ_hd_fixed_size (ticket_iteration_start,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START,
-                             struct TicketIterationStartMessage,
-                             NULL),
-    GNUNET_MQ_hd_fixed_size (ticket_iteration_next,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT,
-                             struct TicketIterationNextMessage,
-                             NULL),
-    GNUNET_MQ_hd_fixed_size (ticket_iteration_stop,
-                             GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP,
-                             struct TicketIterationStopMessage,
-                             NULL),
-    GNUNET_MQ_hd_var_size (revoke_ticket_message,
-                           GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET,
-                           struct RevokeTicketMessage,
+  GNUNET_MQ_hd_fixed_size (ticket_iteration_stop,
+                           GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP,
+                           struct TicketIterationStopMessage,
                            NULL),
-    GNUNET_MQ_handler_end ());
+  GNUNET_MQ_hd_var_size (revoke_ticket_message,
+                         GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET,
+                         struct RevokeTicketMessage,
+                         NULL),
+  GNUNET_MQ_handler_end ());
 /* end of gnunet-service-reclaim.c */