[taler-anastasis] 02/08: fixes

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit ba4c24b780527915e8feb4617a7d0f7917f1edaf
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Tue Oct 6 16:55:22 2020 +0200

    fixes
---
 src/lib/anastasis_api_backup_redux.c   | 28 ++++++++++++++--------------
 src/lib/anastasis_api_recovery_redux.c | 13 ++++++++++++-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/lib/anastasis_api_backup_redux.c 
b/src/lib/anastasis_api_backup_redux.c
index b06f257..8fc4e09 100644
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@ -42,6 +42,17 @@ typedef void
                    void *cb_cls);
 
 
+static void
+set_state (json_t *state,
+           const char *new_backup_state)
+{
+  GNUNET_assert (0 ==
+                 json_object_set_new (state,
+                                      "backup_state",
+                                      json_string (new_backup_state)));
+}
+
+
 /**
  * Returns an initial ANASTASIS backup state.
  *
@@ -84,7 +95,7 @@ ANASTASIS_backup_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg)
   }
 
   initial_state = json_pack ("{s:s, s:o}",
-                             "backup-state", "ContinentSelectionState",
+                             "backup_state", "ContinentSelectionState",
                              "continents", continents);
   GNUNET_assert (NULL != initial_state);
   return initial_state;
@@ -164,17 +175,6 @@ add_authentication (const json_t *state,
 }
 
 
-static void
-set_state (json_t *state,
-           const char *new_backup_state)
-{
-  GNUNET_assert (0 ==
-                 json_object_set_new (state,
-                                      "backup-state",
-                                      json_string (new_backup_state)));
-}
-
-
 struct PolicyBuilder
 {
   json_t *providers;
@@ -228,7 +228,7 @@ provider_candidate (struct PolicyBuilder *pb,
                                                     "method"));
   method_providers = json_object_get (pb->providers,
                                       method_name);
-  num_prov = json_array_size (method_providers);
+  int num_prov = json_array_size (method_providers);
   for (unsigned int j = 0; j<num_prov; j++)
   {
     prov_sel[i] = j;
@@ -259,7 +259,7 @@ go_with (struct PolicyBuilder *pb,
                       prov_sel,
                       0);
 
-  for (unsigned int i = 0; i<pb->req_methods)
+  for (unsigned int i = 0; i<pb->req_methods; i++)
   {
     json_t *provider_obj = json_array_get (method_providers,
                                            best_sel[i]);
diff --git a/src/lib/anastasis_api_recovery_redux.c 
b/src/lib/anastasis_api_recovery_redux.c
index 459168a..ace589d 100644
--- a/src/lib/anastasis_api_recovery_redux.c
+++ b/src/lib/anastasis_api_recovery_redux.c
@@ -41,6 +41,17 @@ typedef void
                    void *cb_cls);
 
 
+static void
+set_state (json_t *state,
+           const char *new_recovery_state)
+{
+  GNUNET_assert (0 ==
+                 json_object_set_new (state,
+                                      "recovery_state",
+                                      json_string (new_recovery_state)));
+}
+
+
 /**
  * Returns an initial ANASTASIS recovery state.
  *
@@ -83,7 +94,7 @@ ANASTASIS_recovery_start (const struct 
GNUNET_CONFIGURATION_Handle *cfg)
   }
 
   initial_state = json_pack ("{s:s, s:o}",
-                             "recovery-state", "ReduxInitialRecoveryState",
+                             "recovery_state", "ContinentSelectionState",
                              "continents", continents);
   return initial_state;
 }

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