merchant

commit 91c676ddc756cdebd374a9c4fe3e40afba643a00
parent 55414c617e1ea4e656dac48e88f99eb560f54abd
Author: Florian Dold <florian.dold@gmail.com>
Date:   Wed, 29 Jul 2020 23:03:27 +0530

fix session ID (bogus trailing slash), formatting

Diffstat:
M
src/backend/taler-merchant-httpd_get-orders-ID.c
 | 
33
++++++++++++++++++++-------------

1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -662,23 +662,30 @@ TMH_make_taler_pay_uri (struct MHD_Connection *con,
   GNUNET_assert (NULL != instance_id);
   GNUNET_assert (NULL != order_id);
 
-  GNUNET_buffer_write_str (&buf, "taler");
+  GNUNET_buffer_write_str (&buf,
+                           "taler");
   if (GNUNET_NO == TALER_mhd_is_https (con))
-    GNUNET_buffer_write_str (&buf, "+http");
-  GNUNET_buffer_write_str (&buf, "://pay/");
-  GNUNET_buffer_write_str (&buf, host);
+    GNUNET_buffer_write_str (&buf,
+                             "+http");
+  GNUNET_buffer_write_str (&buf,
+                           "://pay/");
+  GNUNET_buffer_write_str (&buf,
+                           host);
   if (NULL != uri_path)
-    GNUNET_buffer_write_path (&buf, uri_path);
-  if (0 != strcmp ("default", instance_id))
+    GNUNET_buffer_write_path (&buf,
+                              uri_path);
+  if (0 != strcmp ("default",
+                   instance_id))
   {
-    GNUNET_buffer_write_path (&buf, "instances");
-    GNUNET_buffer_write_path (&buf, instance_id);
+    GNUNET_buffer_write_path (&buf,
+                              "instances");
+    GNUNET_buffer_write_path (&buf,
+                              instance_id);
   }
-  GNUNET_buffer_write_path (&buf, order_id);
-  if (NULL != session_id)
-    GNUNET_buffer_write_path (&buf, session_id);
-  /* ensure final slash */
-  GNUNET_buffer_write_path (&buf, "");
+  GNUNET_buffer_write_path (&buf,
+                            order_id);
+  GNUNET_buffer_write_path (&buf,
+                            (session_id == NULL) ? "" : session_id);
 
   return GNUNET_buffer_reap_str (&buf);
 }