[taler-anastasis] branch master updated: fix FTBFS

[gnunet]

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 cc43297  fix FTBFS
cc43297 is described below

commit cc43297b412cf8256ffd5a29ebdef4c6e624eb23
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 14 15:52:57 2020 +0200

    fix FTBFS
---
 src/cli/anastasis-cli-redux.c          | 25 +++++++++++--------------
 src/lib/anastasis_api_backup_redux.c   | 14 +++++++-------
 src/lib/anastasis_api_recovery_redux.c |  1 +
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/cli/anastasis-cli-redux.c b/src/cli/anastasis-cli-redux.c
index e9434eb..9b2c4d3 100644
--- a/src/cli/anastasis-cli-redux.c
+++ b/src/cli/anastasis-cli-redux.c
@@ -84,6 +84,7 @@ persist_new_state ()
   return json_dump_file (new_state, path_new_state, JSON_COMPACT);
 }
 
+
 /**
  * Function called with the results of #ANASTASIS_backup_action
  * or #ANASTASIS_recovery_action.
@@ -106,6 +107,7 @@ action_cb (void *cls,
   GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * @brief Shutdown the application.
  *
@@ -260,19 +262,13 @@ run (void *cls,
                           &rc);
   rc = GNUNET_CURL_gnunet_rc_create (ctx);
 
-  if (b_flag)
-    ANASTASIS_backup_action (prev_state,
-                             action,
-                             arguments,
-                             &action_cb,
-                             cls);
-
-  if (r_flag)
-    ANASTASIS_recovery_action (prev_state,
-                               action,
-                               arguments,
-                               &action_cb,
-                               cls);
+  // FIXME: return value in global, shutdown handler to clean up, yada yada
+  ANASTASIS_redux_action (prev_state,
+                          action,
+                          arguments,
+                          ctx,
+                          &action_cb,
+                          cls);
 }
 
 
@@ -311,4 +307,5 @@ main (int argc,
   return (GNUNET_OK == ret) ? 0 : 1;
 }
 
-/* end of anastasis-cli-redux.c */
\ No newline at end of file
+
+/* end of anastasis-cli-redux.c */
diff --git a/src/lib/anastasis_api_backup_redux.c 
b/src/lib/anastasis_api_backup_redux.c
index 9cfde59..203d39f 100644
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@ -190,6 +190,8 @@ struct PolicyBuilder
 
   unsigned int best_diversity;
   struct TALER_Amount best_cost;
+
+  const char *currency;
 };
 
 
@@ -202,7 +204,7 @@ eval_provider_selection (struct PolicyBuilder *pb,
   struct TALER_Amount curr_cost;
 
   GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_get_zero (currency,
+                 TALER_amount_get_zero (pb->currency,
                                         &curr_cost));
 
   // calculate cost
@@ -322,7 +324,7 @@ go_with (struct PolicyBuilder *pb,
                       0);
 
   GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_get_zero (currency,
+                 TALER_amount_get_zero (pb->currency,
                                         &recovery_cost));
 
   json_t *method_arr = json_array ();
@@ -404,6 +406,8 @@ done_authentication (json_t *state,
 {
   struct PolicyBuilder pb;
 
+  pb.currency = json_string_value (json_object_get (state,
+                                                    "currency"));
   pb.providers = json_object_get (state,
                                   "authentication_providers");
   pb.methods = json_object_get (state,
@@ -430,14 +434,10 @@ done_authentication (json_t *state,
   {
     unsigned int m_idx[pb.req_methods];
 
+    /* select req_methods from num_methods. */
     method_candidate (&pb,
                       m_idx,
                       0);
-    bool feasible = false;
-
-    // select req_methods from num_methods.
-
-
   }
   GNUNET_assert (0 == json_object_set_new (state,
                                            "policies",
diff --git a/src/lib/anastasis_api_recovery_redux.c 
b/src/lib/anastasis_api_recovery_redux.c
index 63b8d60..8a31adc 100644
--- a/src/lib/anastasis_api_recovery_redux.c
+++ b/src/lib/anastasis_api_recovery_redux.c
@@ -200,4 +200,5 @@ ANASTASIS_recovery_action_ (struct GNUNET_CURL_Context *ctx,
   cb (cb_cls,
       ANASTASIS_EC_INVALID, // FIXME: Define correct error code
       NULL);
+  return NULL;
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.