diff options
Diffstat (limited to 'src/fs/plugin_block_fs.c')
-rw-r--r-- | src/fs/plugin_block_fs.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index 029f95bc5..18aa289ef 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c | |||
@@ -43,7 +43,6 @@ | |||
43 | * | 43 | * |
44 | * @param ctx block context in which the block group is created | 44 | * @param ctx block context in which the block group is created |
45 | * @param type type of the block for which we are creating the group | 45 | * @param type type of the block for which we are creating the group |
46 | * @param nonce random value used to seed the group creation | ||
47 | * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh | 46 | * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh |
48 | * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh | 47 | * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh |
49 | * @param va variable arguments specific to @a type | 48 | * @param va variable arguments specific to @a type |
@@ -53,7 +52,6 @@ | |||
53 | static struct GNUNET_BLOCK_Group * | 52 | static struct GNUNET_BLOCK_Group * |
54 | block_plugin_fs_create_group (void *cls, | 53 | block_plugin_fs_create_group (void *cls, |
55 | enum GNUNET_BLOCK_Type type, | 54 | enum GNUNET_BLOCK_Type type, |
56 | uint32_t nonce, | ||
57 | const void *raw_data, | 55 | const void *raw_data, |
58 | size_t raw_data_size, | 56 | size_t raw_data_size, |
59 | va_list va) | 57 | va_list va) |
@@ -66,11 +64,9 @@ block_plugin_fs_create_group (void *cls, | |||
66 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: | 64 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: |
67 | GNUNET_break (NULL == va_arg (va, const char *)); | 65 | GNUNET_break (NULL == va_arg (va, const char *)); |
68 | return NULL; | 66 | return NULL; |
69 | |||
70 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: | 67 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: |
71 | GNUNET_break (NULL == va_arg (va, const char *)); | 68 | GNUNET_break (NULL == va_arg (va, const char *)); |
72 | return NULL; | 69 | return NULL; |
73 | |||
74 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: | 70 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: |
75 | guard = va_arg (va, const char *); | 71 | guard = va_arg (va, const char *); |
76 | if (0 == strcmp (guard, | 72 | if (0 == strcmp (guard, |
@@ -98,7 +94,6 @@ block_plugin_fs_create_group (void *cls, | |||
98 | size, | 94 | size, |
99 | BLOOMFILTER_K, | 95 | BLOOMFILTER_K, |
100 | type, | 96 | type, |
101 | nonce, | ||
102 | raw_data, | 97 | raw_data, |
103 | raw_data_size); | 98 | raw_data_size); |
104 | 99 | ||
@@ -218,7 +213,7 @@ block_plugin_fs_check_block (void *cls, | |||
218 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: | 213 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: |
219 | { | 214 | { |
220 | const struct UBlock *ub; | 215 | const struct UBlock *ub; |
221 | 216 | ||
222 | if (block_size < sizeof(struct UBlock)) | 217 | if (block_size < sizeof(struct UBlock)) |
223 | { | 218 | { |
224 | GNUNET_break_op (0); | 219 | GNUNET_break_op (0); |
@@ -226,8 +221,8 @@ block_plugin_fs_check_block (void *cls, | |||
226 | } | 221 | } |
227 | ub = block; | 222 | ub = block; |
228 | if (block_size != | 223 | if (block_size != |
229 | ntohl (ub->purpose.size) + | 224 | ntohl (ub->purpose.size) |
230 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature)) | 225 | + sizeof (struct GNUNET_CRYPTO_EcdsaSignature)) |
231 | { | 226 | { |
232 | GNUNET_break_op (0); | 227 | GNUNET_break_op (0); |
233 | return GNUNET_NO; | 228 | return GNUNET_NO; |