diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-08-29 23:45:37 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-08-29 23:45:37 +0200 |
commit | 83f3b73bd59bca3025eb5999d29ee8a254d6472a (patch) | |
tree | 5dd21c9c6e784ac78389b8d923b3802462b1bf88 /src/consensus/gnunet-service-consensus.c | |
parent | fb6e2fdd289b77acb7b9f9726f9a1e1c79a22103 (diff) | |
download | gnunet-83f3b73bd59bca3025eb5999d29ee8a254d6472a.tar.gz gnunet-83f3b73bd59bca3025eb5999d29ee8a254d6472a.zip |
-fix bad indent
Diffstat (limited to 'src/consensus/gnunet-service-consensus.c')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 587e3685f..371b7f67f 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -1244,8 +1244,8 @@ struct Evilness | |||
1244 | 1244 | ||
1245 | 1245 | ||
1246 | static int | 1246 | static int |
1247 | parse_evilness_cram_subtype (const char *evil_subtype_str, struct | 1247 | parse_evilness_cram_subtype (const char *evil_subtype_str, |
1248 | Evilness *evil) | 1248 | struct Evilness *evil) |
1249 | { | 1249 | { |
1250 | if (0 == strcmp ("replace", evil_subtype_str)) | 1250 | if (0 == strcmp ("replace", evil_subtype_str)) |
1251 | { | 1251 | { |
@@ -2245,11 +2245,8 @@ task_start_reconcile (struct TaskEntry *task) | |||
2245 | "P%u: Looking up set {%s} to run remote union\n", | 2245 | "P%u: Looking up set {%s} to run remote union\n", |
2246 | session->local_peer_idx, | 2246 | session->local_peer_idx, |
2247 | debug_str_set_key (&setop->input_set)); | 2247 | debug_str_set_key (&setop->input_set)); |
2248 | |||
2249 | rcm.header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT); | 2248 | rcm.header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT); |
2250 | rcm.header.size = htons (sizeof(struct | 2249 | rcm.header.size = htons (sizeof(rcm)); |
2251 | GNUNET_CONSENSUS_RoundContextMessage)); | ||
2252 | |||
2253 | rcm.kind = htons (task->key.kind); | 2250 | rcm.kind = htons (task->key.kind); |
2254 | rcm.peer1 = htons (task->key.peer1); | 2251 | rcm.peer1 = htons (task->key.peer1); |
2255 | rcm.peer2 = htons (task->key.peer2); | 2252 | rcm.peer2 = htons (task->key.peer2); |
@@ -2260,8 +2257,9 @@ task_start_reconcile (struct TaskEntry *task) | |||
2260 | GNUNET_assert (NULL == setop->op); | 2257 | GNUNET_assert (NULL == setop->op); |
2261 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2258 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2262 | "P%u: initiating set op with P%u, our set is %s\n", | 2259 | "P%u: initiating set op with P%u, our set is %s\n", |
2263 | session->local_peer_idx, task->key.peer2, debug_str_set_key ( | 2260 | session->local_peer_idx, |
2264 | &setop->input_set)); | 2261 | task->key.peer2, |
2262 | debug_str_set_key (&setop->input_set)); | ||
2265 | 2263 | ||
2266 | struct GNUNET_SET_Option opts[] = { | 2264 | struct GNUNET_SET_Option opts[] = { |
2267 | { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } }, | 2265 | { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } }, |
@@ -2744,7 +2742,6 @@ put_task (struct GNUNET_CONTAINER_MultiHashMap *taskmap, | |||
2744 | struct Step *s; | 2742 | struct Step *s; |
2745 | 2743 | ||
2746 | GNUNET_assert (NULL != t->step); | 2744 | GNUNET_assert (NULL != t->step); |
2747 | |||
2748 | t = GNUNET_memdup (t, sizeof(struct TaskEntry)); | 2745 | t = GNUNET_memdup (t, sizeof(struct TaskEntry)); |
2749 | s = t->step; | 2746 | s = t->step; |
2750 | if (s->tasks_len == s->tasks_cap) | 2747 | if (s->tasks_len == s->tasks_cap) |
@@ -2765,9 +2762,13 @@ put_task (struct GNUNET_CONTAINER_MultiHashMap *taskmap, | |||
2765 | s->tasks[s->tasks_len] = t; | 2762 | s->tasks[s->tasks_len] = t; |
2766 | s->tasks_len++; | 2763 | s->tasks_len++; |
2767 | 2764 | ||
2768 | GNUNET_CRYPTO_hash (&t->key, sizeof(struct TaskKey), &round_hash); | 2765 | GNUNET_CRYPTO_hash (&t->key, |
2766 | sizeof(struct TaskKey), | ||
2767 | &round_hash); | ||
2769 | GNUNET_assert (GNUNET_OK == | 2768 | GNUNET_assert (GNUNET_OK == |
2770 | GNUNET_CONTAINER_multihashmap_put (taskmap, &round_hash, t, | 2769 | GNUNET_CONTAINER_multihashmap_put (taskmap, |
2770 | &round_hash, | ||
2771 | t, | ||
2771 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 2772 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
2772 | } | 2773 | } |
2773 | 2774 | ||