[taler-sync] 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 sync.

The following commit(s) were added to refs/heads/master by this push:
     new f6a332e  fix ftbfs
f6a332e is described below

commit f6a332e0057a1e6dfabd2c2a3a187c145e9f8948
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Nov 17 17:04:12 2019 +0100

    fix ftbfs
---
 src/sync/sync-httpd.c        | 32 +++++++++++++++-----------------
 src/sync/sync-httpd.h        |  6 +++---
 src/sync/sync-httpd_backup.c |  4 +++-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sync/sync-httpd.c b/src/sync/sync-httpd.c
index a0bd692..b5121c4 100644
--- a/src/sync/sync-httpd.c
+++ b/src/sync/sync-httpd.c
@@ -109,20 +109,20 @@ struct TALER_Amount SH_annual_fee;
 /**
  * Our Taler backend to process payments.
  */
-char *MH_backend_url;
+char *SH_backend_url;
 
 /**
  * Our own base URL
  */
-char *MH_my_base_url;
+char *SH_my_base_url;
 
 /**
  * Our context for making HTTP requests.
  */
-struct GNUNET_CURL_Context *MH_ctx;
+struct GNUNET_CURL_Context *SH_ctx;
 
 /**
- * Reschedule context for #MH_ctx.
+ * Reschedule context for #SH_ctx.
  */
 static struct GNUNET_CURL_RescheduleContext *rc;
 
@@ -327,7 +327,6 @@ url_handler (void *cls,
       hc = *con_cls;
       if (NULL != hc)
       {
-        hc->rh = rh;
         /* Store the async context ID, so we can restore it if
          * we get another callack for this request. */
         hc->async_scope_id = aid;
@@ -420,8 +419,7 @@ handle_mhd_completion_callback (void *cls,
   if (NULL == hc)
     return;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Finished handling request for `%s' with status %d\n",
-              hc->rh->url,
+              "Finished handling request with status %d\n",
               (int) toe);
   hc->cc (hc);
   *con_cls = NULL;
@@ -517,7 +515,7 @@ check_payment_cb (void *cls,
     enum SYNC_DB_QueryStatus qs;
 
     qs = db->increment_lifetime_TR (db->cls,
-                                    &pc->account,
+                                    &pc->account_pub,
                                     pc->order_id,
                                     GNUNET_TIME_UNIT_YEARS); /* always annual 
*/
     GNUNET_break (0 > qs);
@@ -556,8 +554,8 @@ check_on_payments_cb (void *cls,
   GNUNET_CONTAINER_DLL_insert (pc_head,
                                pc_tail,
                                pc);
-  pc->cpo = TALER_MERCHANT_check_payment (MH_ctx,
-                                          MH_backend_url,
+  pc->cpo = TALER_MERCHANT_check_payment (SH_ctx,
+                                          SH_backend_url,
                                           order_id,
                                           NULL /* our payments are NOT 
session-bound */,
                                           CHECK_BACKEND_PAYMENT_TIMEOUT,
@@ -673,7 +671,7 @@ run (void *cls,
       GNUNET_CONFIGURATION_get_value_string (config,
                                              "sync",
                                              "PAYMENT_BACKEND_URL",
-                                             &MH_backend_url))
+                                             &SH_backend_url))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "sync",
@@ -685,7 +683,7 @@ run (void *cls,
       GNUNET_CONFIGURATION_get_value_string (config,
                                              "sync",
                                              "BASE_URL",
-                                             &MH_my_url))
+                                             &SH_my_base_url))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "sync",
@@ -695,9 +693,9 @@ run (void *cls,
   }
 
   /* setup HTTP client event loop */
-  MH_ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+  SH_ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
                              &rc);
-  rc = GNUNET_CURL_gnunet_rc_create (MH_ctx);
+  rc = GNUNET_CURL_gnunet_rc_create (SH_ctx);
 
 
   if (NULL ==
@@ -714,9 +712,9 @@ run (void *cls,
        all payments that happened in the meantime */
     enum SYNC_DB_QueryStatus qs;
 
-    db->lookup_pending_payments_TR (db->cls,
-                                    &check_on_payments_cb,
-                                    NULL);
+    qs = db->lookup_pending_payments_TR (db->cls,
+                                         &check_on_payments_cb,
+                                         NULL);
     GNUNET_break (qs >= 0);
   }
 
diff --git a/src/sync/sync-httpd.h b/src/sync/sync-httpd.h
index c000075..a922991 100644
--- a/src/sync/sync-httpd.h
+++ b/src/sync/sync-httpd.h
@@ -144,17 +144,17 @@ extern struct TALER_Amount SH_annual_fee;
 /**
  * Our Taler backend to process payments.
  */
-extern char *MH_backend_url;
+extern char *SH_backend_url;
 
 /**
  * Our own base URL
  */
-extern char *MH_my_base_url;
+extern char *SH_my_base_url;
 
 /**
  * Our context for making HTTP requests.
  */
-extern struct GNUNET_CURL_Context *MH_ctx;
+extern struct GNUNET_CURL_Context *SH_ctx;
 
 /**
  * Kick MHD to run now, to be called after MHD_resume_connection().
diff --git a/src/sync/sync-httpd_backup.c b/src/sync/sync-httpd_backup.c
index 65506da..208aa12 100644
--- a/src/sync/sync-httpd_backup.c
+++ b/src/sync/sync-httpd_backup.c
@@ -96,12 +96,14 @@ sync_handler_backup_get (struct MHD_Connection *connection,
         {
           GNUNET_break_op (0);
           return SH_RESPONSE_reply_bad_request (connection,
-                                                TALER_EC_SYNC_IF_NONE_MATCH,
+                                                
TALER_EC_SYNC_BAD_IF_NONE_MATCH,
                                                 "Etag does not include a 
base32-encoded SHA-512 hash");
         }
         if (0 == GNUNET_memcmp (&inm_h,
                                 &backup_hash))
         {
+          struct MHD_Response *resp;
+
           resp = MHD_create_response_from_buffer (0,
                                                   NULL,
                                                   MHD_RESPMEM_PERSISTENT);

-- 
To stop receiving notification emails like this one, please contact
address@hidden.