diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-05 22:04:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-05 22:04:37 +0000 |
commit | fcc2a4d8d007e28143bff03d72beb1285898d829 (patch) | |
tree | ab6dbd16fae39916db35c8902351aa55b171cb02 /src/set | |
parent | 62429679c3b5b45fd1e25d19957ef2e6193b6227 (diff) | |
download | gnunet-fcc2a4d8d007e28143bff03d72beb1285898d829.tar.gz gnunet-fcc2a4d8d007e28143bff03d72beb1285898d829.zip |
-address warning, indicate not checking return value is intentional
Diffstat (limited to 'src/set')
-rw-r--r-- | src/set/gnunet-service-set_union.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 962715b83..be50ec8d6 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -74,9 +74,9 @@ enum UnionOperationPhase | |||
74 | */ | 74 | */ |
75 | PHASE_EXPECT_SE, | 75 | PHASE_EXPECT_SE, |
76 | /** | 76 | /** |
77 | * We sent the strata estimator, and expect an IBF. This phase is entered once | 77 | * We sent the strata estimator, and expect an IBF. This phase is entered once |
78 | * upon initialization and later via PHASE_EXPECT_ELEMENTS_AND_REQUESTS. | 78 | * upon initialization and later via PHASE_EXPECT_ELEMENTS_AND_REQUESTS. |
79 | * | 79 | * |
80 | * After receiving the complete IBF, we enter PHASE_EXPECT_ELEMENTS | 80 | * After receiving the complete IBF, we enter PHASE_EXPECT_ELEMENTS |
81 | */ | 81 | */ |
82 | PHASE_EXPECT_IBF, | 82 | PHASE_EXPECT_IBF, |
@@ -87,7 +87,7 @@ enum UnionOperationPhase | |||
87 | /** | 87 | /** |
88 | * We are sending request and elements, | 88 | * We are sending request and elements, |
89 | * and thus only expect elements from the other peer. | 89 | * and thus only expect elements from the other peer. |
90 | * | 90 | * |
91 | * We are currently decoding an IBF until it can no longer be decoded, | 91 | * We are currently decoding an IBF until it can no longer be decoded, |
92 | * we currently send requests and expect elements | 92 | * we currently send requests and expect elements |
93 | * The remote peer is in PHASE_EXPECT_ELEMENTS_AND_REQUESTS | 93 | * The remote peer is in PHASE_EXPECT_ELEMENTS_AND_REQUESTS |
@@ -96,13 +96,13 @@ enum UnionOperationPhase | |||
96 | /** | 96 | /** |
97 | * We are expecting elements and requests, and send | 97 | * We are expecting elements and requests, and send |
98 | * requested elements back to the other peer. | 98 | * requested elements back to the other peer. |
99 | * | 99 | * |
100 | * We are in this phase if we have SENT an IBF for the remote peer to decode. | 100 | * We are in this phase if we have SENT an IBF for the remote peer to decode. |
101 | * We expect requests, send elements or could receive an new IBF, which takes | 101 | * We expect requests, send elements or could receive an new IBF, which takes |
102 | * us via PHASE_EXPECT_IBF to phase PHASE_EXPECT_ELEMENTS | 102 | * us via PHASE_EXPECT_IBF to phase PHASE_EXPECT_ELEMENTS |
103 | * | 103 | * |
104 | * The remote peer is thus in: | 104 | * The remote peer is thus in: |
105 | * PHASE_EXPECT_ELEMENTS | 105 | * PHASE_EXPECT_ELEMENTS |
106 | */ | 106 | */ |
107 | PHASE_EXPECT_ELEMENTS_AND_REQUESTS, | 107 | PHASE_EXPECT_ELEMENTS_AND_REQUESTS, |
108 | /** | 108 | /** |
@@ -257,7 +257,7 @@ destroy_key_to_element_iter (void *cls, | |||
257 | 257 | ||
258 | /** | 258 | /** |
259 | * Destroy the union operation. Only things specific to the union operation are destroyed. | 259 | * Destroy the union operation. Only things specific to the union operation are destroyed. |
260 | * | 260 | * |
261 | * @param op union operation to destroy | 261 | * @param op union operation to destroy |
262 | */ | 262 | */ |
263 | static void | 263 | static void |
@@ -760,8 +760,9 @@ send_elements_for_key (struct Operation *op, struct IBF_Key ibf_key) | |||
760 | 760 | ||
761 | send_cls.ibf_key = ibf_key; | 761 | send_cls.ibf_key = ibf_key; |
762 | send_cls.op = op; | 762 | send_cls.op = op; |
763 | GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element, (uint32_t) ibf_key.key_val, | 763 | (void) GNUNET_CONTAINER_multihashmap32_get_multiple (op->state->key_to_element, |
764 | &send_element_iterator, &send_cls); | 764 | (uint32_t) ibf_key.key_val, |
765 | &send_element_iterator, &send_cls); | ||
765 | } | 766 | } |
766 | 767 | ||
767 | 768 | ||
@@ -1060,7 +1061,7 @@ finish_and_destroy (struct Operation *op) | |||
1060 | if (GNUNET_SET_RESULT_FULL == op->spec->result_mode) | 1061 | if (GNUNET_SET_RESULT_FULL == op->spec->result_mode) |
1061 | { | 1062 | { |
1062 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending full result set\n"); | 1063 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending full result set\n"); |
1063 | GNUNET_assert (NULL == op->state->full_result_iter); | 1064 | GNUNET_assert (NULL == op->state->full_result_iter); |
1064 | op->state->full_result_iter = | 1065 | op->state->full_result_iter = |
1065 | GNUNET_CONTAINER_multihashmap32_iterator_create (op->state->key_to_element); | 1066 | GNUNET_CONTAINER_multihashmap32_iterator_create (op->state->key_to_element); |
1066 | send_remaining_elements (op); | 1067 | send_remaining_elements (op); |
@@ -1225,10 +1226,10 @@ union_accept (struct Operation *op) | |||
1225 | 1226 | ||
1226 | /** | 1227 | /** |
1227 | * Create a new set supporting the union operation | 1228 | * Create a new set supporting the union operation |
1228 | * | 1229 | * |
1229 | * We maintain one strata estimator per set and then manipulate it over the | 1230 | * We maintain one strata estimator per set and then manipulate it over the |
1230 | * lifetime of the set, as recreating a strata estimator would be expensive. | 1231 | * lifetime of the set, as recreating a strata estimator would be expensive. |
1231 | * | 1232 | * |
1232 | * @return the newly created set | 1233 | * @return the newly created set |
1233 | */ | 1234 | */ |
1234 | static struct SetState * | 1235 | static struct SetState * |
@@ -1328,9 +1329,9 @@ union_handle_p2p_message (struct Operation *op, | |||
1328 | } | 1329 | } |
1329 | 1330 | ||
1330 | /** | 1331 | /** |
1331 | * handler for peer-disconnects, notifies the client | 1332 | * handler for peer-disconnects, notifies the client |
1332 | * about the aborted operation in case the op was not concluded | 1333 | * about the aborted operation in case the op was not concluded |
1333 | * | 1334 | * |
1334 | * @param op the destroyed operation | 1335 | * @param op the destroyed operation |
1335 | */ | 1336 | */ |
1336 | static void | 1337 | static void |
@@ -1360,7 +1361,7 @@ union_peer_disconnect (struct Operation *op) | |||
1360 | /** | 1361 | /** |
1361 | * Get the table with implementing functions for | 1362 | * Get the table with implementing functions for |
1362 | * set union. | 1363 | * set union. |
1363 | * | 1364 | * |
1364 | * @return the operation specific VTable | 1365 | * @return the operation specific VTable |
1365 | */ | 1366 | */ |
1366 | const struct SetVT * | 1367 | const struct SetVT * |