[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: fix redux FTBFS
From: |
gnunet |
Subject: |
[taler-anastasis] branch master updated: fix redux FTBFS |
Date: |
Sat, 13 Feb 2021 13:25:06 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 4984c5a fix redux FTBFS
4984c5a is described below
commit 4984c5adde297691c274b73dedb2df2e60682f0f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Feb 13 13:25:04 2021 +0100
fix redux FTBFS
---
src/reducer/anastasis_api_recovery_redux.c | 4 ++--
src/reducer/anastasis_api_redux.c | 21 ++++++++-------------
src/reducer/anastasis_api_redux.h | 2 +-
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/reducer/anastasis_api_recovery_redux.c
b/src/reducer/anastasis_api_recovery_redux.c
index 729e3b9..5d4b375 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -270,7 +270,7 @@ challenge_start_cb (void *cls,
{
json_t *recovery_information;
json_t *challenges;
- const struct ANASTASIS_ChallengeInformation *ci;
+ const struct ANASTASIS_ChallengeDetails *ci;
struct ChallengeState *cs = cls;
if (http_status_code != MHD_HTTP_OK)
@@ -288,7 +288,7 @@ challenge_start_cb (void *cls,
ANASTASIS_recovery_state_to_string (
ANASTASIS_RECOVERY_STATE_CHALLENGE_SOLVING));
}
- ci = ANASTASIS_get_challenge (cs->c);
+ ci = ANASTASIS_challenge_get_details (cs->c);
GNUNET_assert (NULL != ci);
recovery_information = json_object_get (cs->state,
"recovery_information");
diff --git a/src/reducer/anastasis_api_redux.c
b/src/reducer/anastasis_api_redux.c
index 2807979..ccdf905 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -923,14 +923,12 @@ policy_lookup_cb (void *cls,
for (unsigned int i = 0; i < rss->ri->cs_len; i++)
{
- const struct ANASTASIS_ChallengeInformation *ci =
- ANASTASIS_get_challenge (rss->ri->cs[i]);
+ struct ANASTASIS_Challenge *ci = rss->ri->cs[i];
bool contains = false;
+
for (unsigned int i = 0; i < rss->challenges_length; i++)
{
- if (0 ==
- GNUNET_memcmp (&rss->challenges[i].uuid,
- &ci->uuid))
+ if (rss->challenges[i] == rss->ri->cs[i])
{
contains = true;
break;
@@ -940,7 +938,7 @@ policy_lookup_cb (void *cls,
{
GNUNET_array_append (rss->challenges,
rss->challenges_length,
- *ci);
+ ci);
#if FIXME
/* should probably only serialize the uuid and
what the UI needs! */
@@ -954,20 +952,18 @@ policy_lookup_cb (void *cls,
for (unsigned int i = 0; i < ri->dps_len; i++)
{
json_t *policy = json_array ();
+
GNUNET_assert (json_is_array (policy));
- for (unsigned int j = 0; j < ri->dps[i].uuids_length; j++)
+ for (unsigned int j = 0; j < ri->dps[i]->challenges_length; j++)
{
for (unsigned int k = 0; k < rss->challenges_length; k++)
{
- if (0 ==
- GNUNET_memcmp (&ri->dps[i].uuids[j],
- &rss->challenges[k].uuid))
+ if (ri->dps[i]->challenges[j] == rss->challenges[k])
GNUNET_assert (
0 == json_array_append_new (policy,
json_integer ((json_int_t) k)));
}
}
- GNUNET_free (ri->dps[i].uuids);
if (0 < json_array_size (policy))
GNUNET_assert (
0 == json_array_append_new (policies,
@@ -1042,8 +1038,7 @@ free_enter_user_attributes (void *cls)
rss->recovery);
rss->recovery = NULL;
}
- if (NULL != rss->challenges)
- GNUNET_free (rss->challenges);
+ GNUNET_free (rss->challenges);
json_decref (rss->state);
json_decref (rss->id_data);
GNUNET_free (rss);
diff --git a/src/reducer/anastasis_api_redux.h
b/src/reducer/anastasis_api_redux.h
index 00f2c31..1c41d9f 100644
--- a/src/reducer/anastasis_api_redux.h
+++ b/src/reducer/anastasis_api_redux.h
@@ -45,7 +45,7 @@ struct RecoverSecretState
/**
* Information about the challenges.
*/
- struct ANASTASIS_ChallengeInformation *challenges;
+ struct ANASTASIS_Challenge **challenges;
/**
* Amount of challenges.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: fix redux FTBFS,
gnunet <=