[taler-merchant] branch master updated: fix return value from main() when run with -h/-v

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 579938a  fix return value from main() when run with -h/-v
579938a is described below

commit 579938a29e1d1d4ada49ca4c1a8b0d18878974a9
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Nov 6 10:11:08 2020 +0100

    fix return value from main() when run with -h/-v
---
 src/backend/taler-merchant-httpd.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 75ff246..0ae3b4c 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1819,6 +1819,7 @@ int
 main (int argc,
       char *const *argv)
 {
+  enum GNUNET_GenericReturnValue res;
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_flag ('C',
                                "connection-close",
@@ -1828,11 +1829,15 @@ main (int argc,
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
   };
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv,
-                          "taler-merchant-httpd",
-                          "Taler merchant's HTTP backend interface",
-                          options, &run, NULL))
+
+  res = GNUNET_PROGRAM_run (argc, argv,
+                            "taler-merchant-httpd",
+                            "Taler merchant's HTTP backend interface",
+                            options,
+                            &run, NULL);
+  if (GNUNET_SYSERR == res)
     return 3;
+  if (GNUNET_NO == res)
+    return 0;
   return (GNUNET_OK == result) ? 0 : 1;
 }

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