From 2daaf1531092836c12b32c1c05261f598575fbb3 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 30 Jul 2021 13:42:07 +0200
Subject: -fix minor enum confusions

---
 src/reducer/anastasis_api_recovery_redux.c   | 8 ++++----
 src/restclient/anastasis_api_config.c        | 9 ++++-----
 src/restclient/anastasis_api_policy_lookup.c | 4 ++--
 src/restclient/anastasis_api_truth_store.c   | 2 +-
 src/stasis/plugin_anastasis_postgres.c       | 8 ++++++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c
index 8a900ec..77f5847 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -251,7 +251,7 @@ update_state_by_error (json_t *state,
                                       "error_code",
                                       json_integer (rc)));
   set_state (state,
-             ANASTASIS_GENERIC_STATE_ERROR);
+             ANASTASIS_RECOVERY_STATE_ERROR);
   return ec;
 }
 
@@ -437,7 +437,7 @@ answer_feedback_cb (
       {
         GNUNET_break (0);
         set_state (sctx->state,
-                   ANASTASIS_GENERIC_STATE_ERROR);
+                   ANASTASIS_RECOVERY_STATE_ERROR);
         sctx->cb (sctx->cb_cls,
                   TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                   sctx->state);
@@ -2212,7 +2212,7 @@ policy_lookup_cb (void *cls,
       json_decref (challenges);
       json_decref (policies);
       set_state (rss->state,
-                 ANASTASIS_GENERIC_STATE_ERROR);
+                 ANASTASIS_RECOVERY_STATE_ERROR);
       ANASTASIS_redux_fail_ (rss->cb,
                              rss->cb_cls,
                              TALER_EC_ANASTASIS_REDUCER_STATE_INVALID,
@@ -2256,7 +2256,7 @@ policy_lookup_cb (void *cls,
     {
       GNUNET_break (0);
       set_state (rss->state,
-                 ANASTASIS_GENERIC_STATE_ERROR);
+                 ANASTASIS_RECOVERY_STATE_ERROR);
       rss->cb (rss->cb_cls,
                TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
                rss->state);
diff --git a/src/restclient/anastasis_api_config.c b/src/restclient/anastasis_api_config.c
index cf0846b..8a479f4 100644
--- a/src/restclient/anastasis_api_config.c
+++ b/src/restclient/anastasis_api_config.c
@@ -285,11 +285,10 @@ ANASTASIS_get_config (struct GNUNET_CURL_Context *ctx,
     CURL *eh;
 
     eh = ANASTASIS_curl_easy_get_ (co->url);
-    co->job = GNUNET_CURL_job_add2 (ctx,
-                                    eh,
-                                    GNUNET_NO,
-                                    &handle_config_finished,
-                                    co);
+    co->job = GNUNET_CURL_job_add (ctx,
+                                   eh,
+                                   &handle_config_finished,
+                                   co);
   }
   if (NULL == co->job)
   {
diff --git a/src/restclient/anastasis_api_policy_lookup.c b/src/restclient/anastasis_api_policy_lookup.c
index 1af95d7..e7c6e33 100644
--- a/src/restclient/anastasis_api_policy_lookup.c
+++ b/src/restclient/anastasis_api_policy_lookup.c
@@ -295,7 +295,7 @@ ANASTASIS_policy_lookup (
   plo->cb_cls = cb_cls;
   plo->job = GNUNET_CURL_job_add_raw (ctx,
                                       eh,
-                                      GNUNET_NO,
+                                      NULL,
                                       &handle_policy_lookup_finished,
                                       plo);
   return plo;
@@ -349,7 +349,7 @@ ANASTASIS_policy_lookup_version (
   plo->cb_cls = cb_cls;
   plo->job = GNUNET_CURL_job_add_raw (ctx,
                                       eh,
-                                      GNUNET_NO,
+                                      NULL,
                                       &handle_policy_lookup_finished,
                                       plo);
   return plo;
diff --git a/src/restclient/anastasis_api_truth_store.c b/src/restclient/anastasis_api_truth_store.c
index ebd7d10..ef6a642 100644
--- a/src/restclient/anastasis_api_truth_store.c
+++ b/src/restclient/anastasis_api_truth_store.c
@@ -347,7 +347,7 @@ ANASTASIS_truth_store (
                                    tso));
   tso->job = GNUNET_CURL_job_add_raw (ctx,
                                       eh,
-                                      GNUNET_NO,
+                                      NULL,
                                       &handle_truth_store_finished,
                                       tso);
   return tso;
diff --git a/src/stasis/plugin_anastasis_postgres.c b/src/stasis/plugin_anastasis_postgres.c
index 4aba97c..4d95c8f 100644
--- a/src/stasis/plugin_anastasis_postgres.c
+++ b/src/stasis/plugin_anastasis_postgres.c
@@ -329,6 +329,7 @@ postgres_store_recovery_document (
       switch (qs)
       {
       case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
         rollback (pg);
         return ANASTASIS_DB_STORE_STATUS_HARD_ERROR;
       case GNUNET_DB_STATUS_SOFT_ERROR:
@@ -348,8 +349,9 @@ postgres_store_recovery_document (
         (*version)++;
         break;
       default:
+        GNUNET_break (0);
         rollback (pg);
-        return qs;
+        return ANASTASIS_DB_STORE_STATUS_HARD_ERROR;
       }
     }
 
@@ -441,6 +443,7 @@ postgres_store_recovery_document (
         switch (qs)
         {
         case GNUNET_DB_STATUS_HARD_ERROR:
+          GNUNET_break (0);
           rollback (pg);
           return ANASTASIS_DB_STORE_STATUS_HARD_ERROR;
         case GNUNET_DB_STATUS_SOFT_ERROR:
@@ -452,8 +455,9 @@ postgres_store_recovery_document (
         case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
           break;
         default:
+          GNUNET_break (0);
           rollback (pg);
-          return qs;
+          return ANASTASIS_DB_STORE_STATUS_HARD_ERROR;
         }
       }
     }
-- 
cgit v1.2.3