[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -more FTBFS
From: |
gnunet |
Subject: |
[gnunet] branch master updated: -more FTBFS |
Date: |
Wed, 29 Dec 2021 00:15:40 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new fd620976c -more FTBFS
fd620976c is described below
commit fd620976c140d5df43cf174a54a9f88c4808cad3
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Wed Dec 29 00:15:37 2021 +0100
-more FTBFS
---
src/fs/plugin_block_fs.c | 8 ++++----
src/gns/plugin_block_gns.c | 13 ++++++-------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index 0df434a34..43380b3b6 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -321,13 +321,13 @@ block_plugin_fs_check_block (void *cls,
{
const struct UBlock *ub;
- if (reply_block_size < sizeof(struct UBlock))
+ if (block_size < sizeof(struct UBlock))
{
GNUNET_break_op (0);
return GNUNET_NO;
}
- ub = reply_block;
- if (reply_block_size !=
+ ub = block;
+ if (block_size !=
ntohl (ub->purpose.size) +
sizeof (struct GNUNET_CRYPTO_EcdsaSignature))
{
@@ -390,7 +390,7 @@ block_plugin_fs_check_reply (void *cls,
reply_block_size,
&chash);
if (GNUNET_YES ==
- GNUNET_BLOCK_GROUP_bf_test_and_set (bg,
+ GNUNET_BLOCK_GROUP_bf_test_and_set (group,
&chash))
return GNUNET_BLOCK_REPLY_OK_DUPLICATE;
return GNUNET_BLOCK_REPLY_OK_MORE;
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 083ea7cc4..407754a8c 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -255,8 +255,7 @@ block_plugin_gns_check_block (void *cls,
const void *block,
size_t block_size)
{
- const struct GNUNET_GNSRECORD_Block *block;
- struct GNUNET_HashCode h;
+ const struct GNUNET_GNSRECORD_Block *gblock;
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
return GNUNET_SYSERR;
@@ -265,14 +264,14 @@ block_plugin_gns_check_block (void *cls,
GNUNET_break_op (0);
return GNUNET_NO;
}
- block = reply_block;
- if (GNUNET_GNSRECORD_block_get_size (block) > block_size)
+ gblock = block;
+ if (GNUNET_GNSRECORD_block_get_size (gblock) > block_size)
{
GNUNET_break_op (0);
return GNUNET_NO;
}
if (GNUNET_OK !=
- GNUNET_GNSRECORD_block_verify (block))
+ GNUNET_GNSRECORD_block_verify (gblock))
{
GNUNET_break_op (0);
return GNUNET_NO;
@@ -316,7 +315,7 @@ block_plugin_gns_check_reply (void *cls,
if (reply_block_size < sizeof(struct GNUNET_GNSRECORD_Block))
{
GNUNET_break_op (0);
- return GNUNET_BLOCK_REPLY_RESULT_INVALID;
+ return GNUNET_BLOCK_REPLY_INVALID;
}
block = reply_block;
if (GNUNET_GNSRECORD_block_get_size (block) > reply_block_size)
@@ -328,7 +327,7 @@ block_plugin_gns_check_reply (void *cls,
reply_block_size,
&chash);
if (GNUNET_YES ==
- GNUNET_BLOCK_GROUP_bf_test_and_set (bg,
+ GNUNET_BLOCK_GROUP_bf_test_and_set (group,
&chash))
return GNUNET_BLOCK_REPLY_OK_DUPLICATE;
return GNUNET_BLOCK_REPLY_OK_MORE;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -more FTBFS,
gnunet <=