diff options
Diffstat (limited to 'src/include/gnunet_block_lib.h')
-rw-r--r-- | src/include/gnunet_block_lib.h | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index ae6884869..51b8254d0 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h | |||
@@ -161,9 +161,8 @@ struct GNUNET_BLOCK_Context; | |||
161 | * @param mingle_number number for hash permutation | 161 | * @param mingle_number number for hash permutation |
162 | * @param hc where to store the result. | 162 | * @param hc where to store the result. |
163 | */ | 163 | */ |
164 | void | 164 | void GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, |
165 | GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, | 165 | uint32_t mingle_number, GNUNET_HashCode * hc); |
166 | uint32_t mingle_number, GNUNET_HashCode * hc); | ||
167 | 166 | ||
168 | 167 | ||
169 | /** | 168 | /** |
@@ -203,15 +202,23 @@ void GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx); | |||
203 | * @param reply_block_size number of bytes in reply block | 202 | * @param reply_block_size number of bytes in reply block |
204 | * @return characterization of result | 203 | * @return characterization of result |
205 | */ | 204 | */ |
206 | enum GNUNET_BLOCK_EvaluationResult | 205 | enum GNUNET_BLOCK_EvaluationResult GNUNET_BLOCK_evaluate (struct |
207 | GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | 206 | GNUNET_BLOCK_Context |
208 | enum GNUNET_BLOCK_Type type, | 207 | *ctx, |
209 | const GNUNET_HashCode * query, | 208 | enum GNUNET_BLOCK_Type |
210 | struct GNUNET_CONTAINER_BloomFilter **bf, | 209 | type, |
211 | int32_t bf_mutator, | 210 | const GNUNET_HashCode |
212 | const void *xquery, | 211 | * query, |
213 | size_t xquery_size, | 212 | struct |
214 | const void *reply_block, size_t reply_block_size); | 213 | GNUNET_CONTAINER_BloomFilter |
214 | **bf, | ||
215 | int32_t bf_mutator, | ||
216 | const void *xquery, | ||
217 | size_t xquery_size, | ||
218 | const void | ||
219 | *reply_block, | ||
220 | size_t | ||
221 | reply_block_size); | ||
215 | 222 | ||
216 | 223 | ||
217 | /** | 224 | /** |
@@ -227,11 +234,9 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | |||
227 | * GNUNET_SYSERR if type not supported | 234 | * GNUNET_SYSERR if type not supported |
228 | * (or if extracting a key from a block of this type does not work) | 235 | * (or if extracting a key from a block of this type does not work) |
229 | */ | 236 | */ |
230 | int | 237 | int GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, |
231 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, | 238 | enum GNUNET_BLOCK_Type type, const void *block, |
232 | enum GNUNET_BLOCK_Type type, | 239 | size_t block_size, GNUNET_HashCode * key); |
233 | const void *block, | ||
234 | size_t block_size, GNUNET_HashCode * key); | ||
235 | 240 | ||
236 | 241 | ||
237 | #if 0 /* keep Emacsens' auto-indent happy */ | 242 | #if 0 /* keep Emacsens' auto-indent happy */ |