[taler-merchant] branch master updated: fix session ID (bogus trailing slash), formatting

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 91c676d  fix session ID (bogus trailing slash), formatting
91c676d is described below

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

    fix session ID (bogus trailing slash), formatting
---
 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
index 471c2ba..a6912b7 100644
--- 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);
 }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.