merchant

commit c1e45623cfb2a13d49f4a65a930413ae04b65098
parent cd2a811845569941abe08d34cbdb83b54b9ffe20
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 23 Mar 2025 12:23:47 +0100

fix #9648

Diffstat:
M
src/backend/taler-merchant-depositcheck.c
 | 
19
+++++++++++++++++--
M
src/backend/taler-merchant-httpd_private-post-orders.c
 | 
6
+++---

2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/backend/taler-merchant-depositcheck.c b/src/backend/taler-merchant-depositcheck.c
@@ -769,7 +769,21 @@ start_worker (const char *base_url)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Launching worker for exchange `%s' using `%s`\n",
               base_url,
-              cfg_filename);
+              NULL == cfg_filename
+              ? "<default>"
+              : cfg_filename);
+  if (NULL == cfg_filename)
+    return GNUNET_OS_start_process (
+      GNUNET_OS_INHERIT_STD_ALL,
+      NULL,
+      NULL,
+      NULL,
+      "taler-merchant-depositcheck",
+      "taler-merchant-depositcheck",
+      "-e", base_url,
+      "-L", "INFO",
+      test_mode ? "-t" : NULL,
+      NULL);
   return GNUNET_OS_start_process (
     GNUNET_OS_INHERIT_STD_ALL,
     NULL,
@@ -992,7 +1006,8 @@ run (void *cls,
   (void) args;
 
   cfg = c;
-  cfg_filename = GNUNET_strdup (cfgfile);
+  if (NULL != cfgfile)
+    cfg_filename = GNUNET_strdup (cfgfile);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Running with configuration %s\n",
               cfgfile);
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -78,7 +78,7 @@
  * refuses a forced download.
  */
 #define MAX_KEYS_WAIT \
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 2500)
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 2500)
 
 /**
  * Generate the base URL for the given merchant instance.
@@ -1534,8 +1534,8 @@ add_input_token_family (struct OrderContext *oc,
   struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
   struct GNUNET_TIME_Timestamp end = oc->parse_order.pay_deadline;
   enum GNUNET_DB_QueryStatus qs;
-  enum TALER_ErrorCode ec;
-  unsigned int http_status;
+  enum TALER_ErrorCode ec = TALER_EC_INVALID; /* make compiler happy */
+  unsigned int http_status = 0; /* make compiler happy */
 
   qs = TMH_db->lookup_token_family_keys (TMH_db->cls,
                                          oc->hc->instance->settings.id,