aboutsummaryrefslogtreecommitdiff
path: root/src/block
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-06-12 19:07:40 +0000
committerChristian Grothoff <christian@grothoff.org>2012-06-12 19:07:40 +0000
commit6c471eeb15e27f8226492b4860a3c2acb94c5f25 (patch)
treea3a9dcba12ee5356c03056c10b7aba5367b2ef34 /src/block
parent16bcbbea7133fd2265d46bd2ae1dc70e8c9ba96f (diff)
downloadgnunet-6c471eeb15e27f8226492b4860a3c2acb94c5f25.tar.gz
gnunet-6c471eeb15e27f8226492b4860a3c2acb94c5f25.zip
-consistently use struct GNUNET_HashCode
Diffstat (limited to 'src/block')
-rw-r--r--src/block/block.c14
-rw-r--r--src/block/plugin_block_template.c4
-rw-r--r--src/block/plugin_block_test.c8
-rw-r--r--src/block/test_block.c2
4 files changed, 14 insertions, 14 deletions
diff --git a/src/block/block.c b/src/block/block.c
index 51dab783d..344038d6e 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -78,10 +78,10 @@ struct GNUNET_BLOCK_Context
78 * @param hc where to store the result. 78 * @param hc where to store the result.
79 */ 79 */
80void 80void
81GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, uint32_t mingle_number, 81GNUNET_BLOCK_mingle_hash (const struct GNUNET_HashCode * in, uint32_t mingle_number,
82 GNUNET_HashCode * hc) 82 struct GNUNET_HashCode * hc)
83{ 83{
84 GNUNET_HashCode m; 84 struct GNUNET_HashCode m;
85 85
86 GNUNET_CRYPTO_hash (&mingle_number, sizeof (uint32_t), &m); 86 GNUNET_CRYPTO_hash (&mingle_number, sizeof (uint32_t), &m);
87 GNUNET_CRYPTO_hash_xor (&m, in, hc); 87 GNUNET_CRYPTO_hash_xor (&m, in, hc);
@@ -204,7 +204,7 @@ find_plugin (struct GNUNET_BLOCK_Context *ctx, enum GNUNET_BLOCK_Type type)
204enum GNUNET_BLOCK_EvaluationResult 204enum GNUNET_BLOCK_EvaluationResult
205GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, 205GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
206 enum GNUNET_BLOCK_Type type, 206 enum GNUNET_BLOCK_Type type,
207 const GNUNET_HashCode * query, 207 const struct GNUNET_HashCode * query,
208 struct GNUNET_CONTAINER_BloomFilter **bf, 208 struct GNUNET_CONTAINER_BloomFilter **bf,
209 int32_t bf_mutator, const void *xquery, 209 int32_t bf_mutator, const void *xquery,
210 size_t xquery_size, const void *reply_block, 210 size_t xquery_size, const void *reply_block,
@@ -233,7 +233,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
233int 233int
234GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, 234GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx,
235 enum GNUNET_BLOCK_Type type, const void *block, 235 enum GNUNET_BLOCK_Type type, const void *block,
236 size_t block_size, GNUNET_HashCode * key) 236 size_t block_size, struct GNUNET_HashCode * key)
237{ 237{
238 struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type); 238 struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type);
239 239
@@ -285,11 +285,11 @@ compute_bloomfilter_size (unsigned int entry_count)
285 */ 285 */
286struct GNUNET_CONTAINER_BloomFilter * 286struct GNUNET_CONTAINER_BloomFilter *
287GNUNET_BLOCK_construct_bloomfilter (int32_t bf_mutator, 287GNUNET_BLOCK_construct_bloomfilter (int32_t bf_mutator,
288 const GNUNET_HashCode * seen_results, 288 const struct GNUNET_HashCode * seen_results,
289 unsigned int seen_results_count) 289 unsigned int seen_results_count)
290{ 290{
291 struct GNUNET_CONTAINER_BloomFilter *bf; 291 struct GNUNET_CONTAINER_BloomFilter *bf;
292 GNUNET_HashCode mhash; 292 struct GNUNET_HashCode mhash;
293 unsigned int i; 293 unsigned int i;
294 size_t nsize; 294 size_t nsize;
295 295
diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c
index ca5b8744f..1675fdb1c 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -47,7 +47,7 @@
47 */ 47 */
48static enum GNUNET_BLOCK_EvaluationResult 48static enum GNUNET_BLOCK_EvaluationResult
49block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type, 49block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
50 const GNUNET_HashCode * query, 50 const struct GNUNET_HashCode * query,
51 struct GNUNET_CONTAINER_BloomFilter **bf, 51 struct GNUNET_CONTAINER_BloomFilter **bf,
52 int32_t bf_mutator, const void *xquery, 52 int32_t bf_mutator, const void *xquery,
53 size_t xquery_size, const void *reply_block, 53 size_t xquery_size, const void *reply_block,
@@ -92,7 +92,7 @@ block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
92static int 92static int
93block_plugin_template_get_key (void *cls, enum GNUNET_BLOCK_Type type, 93block_plugin_template_get_key (void *cls, enum GNUNET_BLOCK_Type type,
94 const void *block, size_t block_size, 94 const void *block, size_t block_size,
95 GNUNET_HashCode * key) 95 struct GNUNET_HashCode * key)
96{ 96{
97 return GNUNET_SYSERR; 97 return GNUNET_SYSERR;
98} 98}
diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c
index 81e80e3ad..e6b4f4960 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -54,14 +54,14 @@
54 */ 54 */
55static enum GNUNET_BLOCK_EvaluationResult 55static enum GNUNET_BLOCK_EvaluationResult
56block_plugin_test_evaluate (void *cls, enum GNUNET_BLOCK_Type type, 56block_plugin_test_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
57 const GNUNET_HashCode * query, 57 const struct GNUNET_HashCode * query,
58 struct GNUNET_CONTAINER_BloomFilter **bf, 58 struct GNUNET_CONTAINER_BloomFilter **bf,
59 int32_t bf_mutator, const void *xquery, 59 int32_t bf_mutator, const void *xquery,
60 size_t xquery_size, const void *reply_block, 60 size_t xquery_size, const void *reply_block,
61 size_t reply_block_size) 61 size_t reply_block_size)
62{ 62{
63 GNUNET_HashCode chash; 63 struct GNUNET_HashCode chash;
64 GNUNET_HashCode mhash; 64 struct GNUNET_HashCode mhash;
65 65
66 if (type != GNUNET_BLOCK_TYPE_TEST) 66 if (type != GNUNET_BLOCK_TYPE_TEST)
67 return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED; 67 return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
@@ -106,7 +106,7 @@ block_plugin_test_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
106static int 106static int
107block_plugin_test_get_key (void *cls, enum GNUNET_BLOCK_Type type, 107block_plugin_test_get_key (void *cls, enum GNUNET_BLOCK_Type type,
108 const void *block, size_t block_size, 108 const void *block, size_t block_size,
109 GNUNET_HashCode * key) 109 struct GNUNET_HashCode * key)
110{ 110{
111 /* always fails since there is no fixed relationship between 111 /* always fails since there is no fixed relationship between
112 * keys and values for test values */ 112 * keys and values for test values */
diff --git a/src/block/test_block.c b/src/block/test_block.c
index e57b891ad..5e2b34696 100644
--- a/src/block/test_block.c
+++ b/src/block/test_block.c
@@ -32,7 +32,7 @@
32static int 32static int
33test_fs (struct GNUNET_BLOCK_Context *ctx) 33test_fs (struct GNUNET_BLOCK_Context *ctx)
34{ 34{
35 GNUNET_HashCode key; 35 struct GNUNET_HashCode key;
36 char block[4]; 36 char block[4];
37 37
38 memset (block, 1, sizeof (block)); 38 memset (block, 1, sizeof (block));