From 56c230823978b32bab59b6977b005ec0670f9606 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 17 Nov 2022 16:58:57 +0100
Subject: -code cleanup

---
 src/backend/taler-merchant-httpd_post-orders-ID-pay.c         | 1 -
 src/backend/taler-merchant-httpd_private-get-orders.c         | 6 +++---
 src/backend/taler-merchant-httpd_private-patch-instances-ID.c | 4 ++++
 src/testing/testing_api_cmd_kyc_get.c                         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 53a5711f..ee748470 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -1417,7 +1417,6 @@ AGE_FAIL:
         continue;
       cdds[i] = dc->cdd;
       dc->wire_fee = *wire_fee;
-      GNUNET_assert (NULL != pc->wm);
     }
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Initiating batch deposit with %u coins\n",
diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c
index c2a17530..d4f74184 100644
--- a/src/backend/taler-merchant-httpd_private-get-orders.c
+++ b/src/backend/taler-merchant-httpd_private-get-orders.c
@@ -690,8 +690,8 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh,
     const char *date_s_str;
 
     date_s_str = MHD_lookup_connection_value (connection,
-                                               MHD_GET_ARGUMENT_KIND,
-                                               "date_s");
+                                              MHD_GET_ARGUMENT_KIND,
+                                              "date_s");
     if (NULL == date_s_str)
     {
       if (of.delta > 0)
@@ -784,7 +784,7 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh,
 
       if (1 !=
           sscanf (timeout_ms_str,
-                  "%lld%c",
+                  "%llu%c",
                   &ull,
                   &dummy))
         return TALER_MHD_reply_with_error (connection,
diff --git a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
index 188a3ee6..b8e0052d 100644
--- a/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-instances-ID.c
@@ -150,10 +150,13 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
   }
 
   if (! TMH_payto_uri_array_valid (payto_uris))
+  {
+    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
                                        NULL);
+  }
   for (unsigned int i = 0; i<MAX_RETRIES; i++)
   {
     /* Cleanup after earlier loops */
@@ -318,6 +321,7 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
                     "Adding NEW account `%s'\n",
                     ad.payto_uri);
         wm = TMH_setup_wire_account (ad.payto_uri);
+        GNUNET_assert (NULL != wm); /* checked payto_uri validity earlier */
         GNUNET_CONTAINER_DLL_insert (wm_head,
                                      wm_tail,
                                      wm);
diff --git a/src/testing/testing_api_cmd_kyc_get.c b/src/testing/testing_api_cmd_kyc_get.c
index f6f947df..16788113 100644
--- a/src/testing/testing_api_cmd_kyc_get.c
+++ b/src/testing/testing_api_cmd_kyc_get.c
@@ -161,7 +161,7 @@ kyc_get_cb (void *cls,
       }
       eq += strlen ("/kyc-proof/");
       nq = strchr (eq, '/');
-      if (NULL == eq)
+      if (NULL == nq)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "Received unexpected KYC URL `%s' (%s)\n",
-- 
cgit v1.2.3