-more style fixes

4 files changed, 26 insertions, 29 deletions

diff --git a/src/auditor/taler-helper-auditor-wire-debit.c b/src/auditor/taler-helper-auditor-wire-debit.c
index bd99aaf79..15da0784f 100644
--- a/src/auditor/taler-helper-auditor-wire-debit.c
+++ b/src/auditor/taler-helper-auditor-wire-debit.c
@@ -268,7 +268,7 @@ static struct GNUNET_CURL_Context *ctx;
 /**
  * Scheduler context for running the @e ctx.
  */
-static struct GNUNET_CURL_RescheduleContext *rc;
+static struct GNUNET_CURL_RescheduleContext *rctx;
 
 /**
  * Should we run checks that only work for exchange-internal audits?
@@ -420,10 +420,10 @@ do_shutdown (void *cls)
     GNUNET_CURL_fini (ctx);
     ctx = NULL;
   }
-  if (NULL != rc)
+  if (NULL != rctx)
   {
-    GNUNET_CURL_gnunet_rc_destroy (rc);
-    rc = NULL;
+    GNUNET_CURL_gnunet_rc_destroy (rctx);
+    rctx = NULL;
   }
   TALER_EXCHANGEDB_unload_accounts ();
   TALER_ARL_cfg = NULL;
@@ -723,27 +723,27 @@ check_rc_matches (void *cls,
                   const struct GNUNET_HashCode *key,
                   void *value)
 {
-  struct CheckMatchContext *ctx = cls;
+  struct CheckMatchContext *cmx = cls;
   struct ReserveClosure *rc = value;
 
-  if ((0 == GNUNET_memcmp (&ctx->roi->details.wtid,
+  if ((0 == GNUNET_memcmp (&cmx->roi->details.wtid,
                            &rc->wtid)) &&
       (0 == strcasecmp (rc->receiver_account,
-                        ctx->roi->details.credit_account_uri)) &&
+                        cmx->roi->details.credit_account_uri)) &&
       (0 == TALER_amount_cmp (&rc->amount,
-                              &ctx->roi->details.amount)))
+                              &cmx->roi->details.amount)))
   {
     if (! check_time_difference ("reserves_closures",
                                  rc->rowid,
                                  rc->execution_date,
-                                 ctx->roi->details.execution_date))
+                                 cmx->roi->details.execution_date))
     {
       free_rc (NULL,
                key,
                rc);
       return GNUNET_SYSERR;
     }
-    ctx->found = true;
+    cmx->found = true;
     free_rc (NULL,
              key,
              rc);
@@ -1000,7 +1000,7 @@ complain_out_not_found (void *cls,
   // struct WireAccount *wa = cls;
   struct ReserveOutInfo *roi = value;
   struct GNUNET_HashCode rkey;
-  struct CheckMatchContext ctx = {
+  struct CheckMatchContext cmx = {
     .roi = roi,
     .found = false
   };
@@ -1014,8 +1014,8 @@ complain_out_not_found (void *cls,
   GNUNET_CONTAINER_multihashmap_get_multiple (reserve_closures,
                                               &rkey,
                                               &check_rc_matches,
-                                              &ctx);
-  if (ctx.found)
+                                              &cmx);
+  if (cmx.found)
     return GNUNET_OK;
   ret = check_reported_inconsistency (roi);
   if (GNUNET_NO != ret)
@@ -1798,8 +1798,8 @@ run (void *cls,
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
   ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
-                          &rc);
-  rc = GNUNET_CURL_gnunet_rc_create (ctx);
+                          &rctx);
+  rctx = GNUNET_CURL_gnunet_rc_create (ctx);
   if (NULL == ctx)
   {
     GNUNET_break (0);
diff --git a/src/exchangedb/pg_do_age_withdraw.c b/src/exchangedb/pg_do_age_withdraw.c
index 970e65b5d..2ac4d2ede 100644
--- a/src/exchangedb/pg_do_age_withdraw.c
+++ b/src/exchangedb/pg_do_age_withdraw.c
@@ -24,7 +24,7 @@
 #include "taler_exchangedb_plugin.h"
 #include "taler_pq_lib.h"
 #include "taler_pq_lib.h"
-#include "pg_do_batch_withdraw.h"
+#include "pg_do_age_withdraw.h"
 #include "pg_helper.h"
 #include <gnunet/gnunet_time_lib.h>
 
diff --git a/src/kyclogic/plugin_kyclogic_kycaid.c b/src/kyclogic/plugin_kyclogic_kycaid.c
index 243ff7c34..3173ad823 100644
--- a/src/kyclogic/plugin_kyclogic_kycaid.c
+++ b/src/kyclogic/plugin_kyclogic_kycaid.c
@@ -893,9 +893,8 @@ webhook_conversion_cb (void *cls,
     return;
   }
   expiration = GNUNET_TIME_relative_to_absolute (wh->pd->validity);
-  resp = MHD_create_response_from_buffer (0,
-                                          "",
-                                          MHD_RESPMEM_PERSISTENT);
+  resp = MHD_create_response_from_buffer_static (0,
+                                                 "");
   wh->cb (wh->cb_cls,
           wh->process_row,
           &wh->h_payto,
@@ -953,9 +952,8 @@ handle_webhook_finished (void *cls,
                                profile_status))
           ? TALER_KYCLOGIC_STATUS_PENDING
           : TALER_KYCLOGIC_STATUS_USER_ABORTED;
-        resp = MHD_create_response_from_buffer (0,
-                                                "",
-                                                MHD_RESPMEM_PERSISTENT);
+        resp = MHD_create_response_from_buffer_static (0,
+                                                       "");
         wh->cb (wh->cb_cls,
                 wh->process_row,
                 &wh->h_payto,
@@ -1344,9 +1342,8 @@ kycaid_webhook (void *cls,
                 "Webhook called with non-completion status: %s\n",
                 type);
     wh->response_code = MHD_HTTP_NO_CONTENT;
-    wh->resp = MHD_create_response_from_buffer (0,
-                                                "",
-                                                MHD_RESPMEM_PERSISTENT);
+    wh->resp = MHD_create_response_from_buffer_static (0,
+                                                       "");
     wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
                                          wh);
     return wh;
diff --git a/src/kyclogic/taler-exchange-kyc-tester.c b/src/kyclogic/taler-exchange-kyc-tester.c
index b4d752525..14af603ab 100644
--- a/src/kyclogic/taler-exchange-kyc-tester.c
+++ b/src/kyclogic/taler-exchange-kyc-tester.c
@@ -1325,7 +1325,7 @@ exchange_serve_process_config (void)
 static void
 do_shutdown (void *cls)
 {
-  struct MHD_Daemon *mhd;
+  struct MHD_Daemon *my_mhd;
   struct ProofRequestState *rs;
 
   (void) cls;
@@ -1345,9 +1345,9 @@ do_shutdown (void *cls)
   }
   kyc_webhook_cleanup ();
   TALER_KYCLOGIC_kyc_done ();
-  mhd = TALER_MHD_daemon_stop ();
-  if (NULL != mhd)
-    MHD_stop_daemon (mhd);
+  my_mhd = TALER_MHD_daemon_stop ();
+  if (NULL != my_mhd)
+    MHD_stop_daemon (my_mhd);
   if (NULL != TEKT_curl_ctx)
   {
     GNUNET_CURL_fini (TEKT_curl_ctx);