[taler-donau] branch master updated: uncomment db stuff in httpd

[gnunet]

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

johannes-casaburi pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new e37f631  uncomment db stuff in httpd
e37f631 is described below

commit e37f6310b513aa4d18b8d27f148b10beb5e1588c
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Mon Jan 8 22:03:36 2024 +0100

    uncomment db stuff in httpd
---
 src/donau/donau-httpd.c             | 24 ++++++++++++------------
 src/donau/donau-httpd_get-charity.c | 16 ++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c
index 071c9df..cb70cf8 100644
--- a/src/donau/donau-httpd.c
+++ b/src/donau/donau-httpd.c
@@ -804,11 +804,11 @@ do_shutdown (void *cls)
     MHD_stop_daemon (mhd);
     mhd = NULL;
   }
-  // if (NULL != DH_plugin)
-  // {
-  //  DONAUDB_plugin_unload (DH_plugin);
-  //  DH_plugin = NULL;
-  // }
+  if (NULL != DH_plugin)
+  {
+    DONAUDB_plugin_unload (DH_plugin);
+    DH_plugin = NULL;
+  }
   if (NULL != DH_curl_ctx)
   {
     GNUNET_CURL_fini (DH_curl_ctx);
@@ -864,13 +864,13 @@ run (void *cls,
   //   GNUNET_SCHEDULER_shutdown ();
   //   return;
   // }
-  // if (GNUNET_SYSERR ==
-  //     DH_plugin->preflight (DH_plugin->cls))
-  // {
-  //   global_ret = EXIT_FAILURE;
-  //   GNUNET_SCHEDULER_shutdown ();
-  //   return;
-  // }
+  if (GNUNET_SYSERR ==
+      DH_plugin->preflight (DH_plugin->cls))
+  {
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   // DH_load_terms (DH_cfg);
   DH_curl_ctx
diff --git a/src/donau/donau-httpd_get-charity.c 
b/src/donau/donau-httpd_get-charity.c
index 4f9852a..853c447 100644
--- a/src/donau/donau-httpd_get-charity.c
+++ b/src/donau/donau-httpd_get-charity.c
@@ -67,7 +67,6 @@ DH_handler_charity_get (
     char *charity_url;
     char *charity_name;
     enum GNUNET_DB_QueryStatus qs;
-    bool none = false;
     MHD_RESULT result;
 
     qs = DH_plugin->get_charity (DH_plugin->cls,
@@ -84,15 +83,12 @@ DH_handler_charity_get (
                                          TALER_EC_GENERIC_DB_FETCH_FAILED,
                                          NULL);
     case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      if (none)
-      {
-        return TALER_MHD_reply_static (
-          rc->connection,
-          MHD_HTTP_NO_CONTENT,
-          NULL,
-          NULL,
-          0);
-      }
+      return TALER_MHD_reply_static (
+        rc->connection,
+        MHD_HTTP_NO_CONTENT,
+        NULL,
+        NULL,
+        0);
       break;
     case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
       break;

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