diff options
Diffstat (limited to 'src/include/gnunet_block_lib.h')
-rw-r--r-- | src/include/gnunet_block_lib.h | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 51b8254d0..66b2490c0 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h | |||
@@ -161,8 +161,9 @@ 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 GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, | 164 | void |
165 | uint32_t mingle_number, GNUNET_HashCode * hc); | 165 | GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, uint32_t mingle_number, |
166 | GNUNET_HashCode * hc); | ||
166 | 167 | ||
167 | 168 | ||
168 | /** | 169 | /** |
@@ -171,9 +172,8 @@ void GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, | |||
171 | * @param cfg configuration to use | 172 | * @param cfg configuration to use |
172 | * @return NULL on error | 173 | * @return NULL on error |
173 | */ | 174 | */ |
174 | struct GNUNET_BLOCK_Context *GNUNET_BLOCK_context_create (const struct | 175 | struct GNUNET_BLOCK_Context * |
175 | GNUNET_CONFIGURATION_Handle | 176 | GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg); |
176 | *cfg); | ||
177 | 177 | ||
178 | 178 | ||
179 | /** | 179 | /** |
@@ -181,7 +181,8 @@ struct GNUNET_BLOCK_Context *GNUNET_BLOCK_context_create (const struct | |||
181 | * | 181 | * |
182 | * @param ctx context to destroy | 182 | * @param ctx context to destroy |
183 | */ | 183 | */ |
184 | void GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx); | 184 | void |
185 | GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx); | ||
185 | 186 | ||
186 | 187 | ||
187 | /** | 188 | /** |
@@ -202,23 +203,14 @@ void GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx); | |||
202 | * @param reply_block_size number of bytes in reply block | 203 | * @param reply_block_size number of bytes in reply block |
203 | * @return characterization of result | 204 | * @return characterization of result |
204 | */ | 205 | */ |
205 | enum GNUNET_BLOCK_EvaluationResult GNUNET_BLOCK_evaluate (struct | 206 | enum GNUNET_BLOCK_EvaluationResult |
206 | GNUNET_BLOCK_Context | 207 | GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, |
207 | *ctx, | 208 | enum GNUNET_BLOCK_Type type, |
208 | enum GNUNET_BLOCK_Type | 209 | const GNUNET_HashCode * query, |
209 | type, | 210 | struct GNUNET_CONTAINER_BloomFilter **bf, |
210 | const GNUNET_HashCode | 211 | int32_t bf_mutator, const void *xquery, |
211 | * query, | 212 | size_t xquery_size, const void *reply_block, |
212 | struct | 213 | 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); | ||
222 | 214 | ||
223 | 215 | ||
224 | /** | 216 | /** |
@@ -234,9 +226,10 @@ enum GNUNET_BLOCK_EvaluationResult GNUNET_BLOCK_evaluate (struct | |||
234 | * GNUNET_SYSERR if type not supported | 226 | * GNUNET_SYSERR if type not supported |
235 | * (or if extracting a key from a block of this type does not work) | 227 | * (or if extracting a key from a block of this type does not work) |
236 | */ | 228 | */ |
237 | int GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, | 229 | int |
238 | enum GNUNET_BLOCK_Type type, const void *block, | 230 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, |
239 | size_t block_size, GNUNET_HashCode * key); | 231 | enum GNUNET_BLOCK_Type type, const void *block, |
232 | size_t block_size, GNUNET_HashCode * key); | ||
240 | 233 | ||
241 | 234 | ||
242 | #if 0 /* keep Emacsens' auto-indent happy */ | 235 | #if 0 /* keep Emacsens' auto-indent happy */ |