donau

commit c8094b68bceaad9eb36846a5b5ab7ea6a8f1e103
parent c7198a769483803a8437e4c5cebdf81d13d493a3
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date:   Fri,  5 Jan 2024 17:21:51 +0100

charity get

Diffstat:
M
src/donau/donau-httpd_get-charity.c
 | 
29
+++++++++++++----------------

1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/donau/donau-httpd_get-charity.c b/src/donau/donau-httpd_get-charity.c
@@ -42,10 +42,10 @@ DH_handler_charity_get (
   struct DH_RequestContext *rc,
   const char *const args[])
 {
-  unsigned long long int charity_id;
+  unsigned long long charity_id;
 
   if ( (NULL == args[0]) ||
-       (1 != sscanf(args[0], "%llu", &charity_id)))
+       (1 != sscanf (args[0], "%llu", &charity_id)))
   {
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (rc->connection,
@@ -64,20 +64,21 @@ DH_handler_charity_get (
   }
 
   {
-    json_t *charity_info;
+    const char *charity_url;
+    const char *charity_name;
     enum GNUNET_DB_QueryStatus qs;
     bool none = false;
 
     charity_info = json_array ();
     GNUNET_assert (NULL != charity_info);
     qs = DH_plugin->select_charity_info (DH_plugin->cls,
-                                         &charity_id,
-                                         charity_info);
+                                         charity_id,
+                                         charity_url,
+                                         charity_name);
     switch (qs)
     {
     case GNUNET_DB_STATUS_HARD_ERROR:
     case GNUNET_DB_STATUS_SOFT_ERROR:
-      json_decref (charity_info);
       GNUNET_break (0);
       return TALER_MHD_reply_with_error (rc->connection,
                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -98,19 +99,15 @@ DH_handler_charity_get (
       break;
     }
 
-  static struct MHD_Response *resp;
-
-  if (NULL == resp)
-  {
     resp = TALER_MHD_MAKE_JSON_PACK (
       GNUNET_JSON_pack_string ("url",
-                               qs->charity_url),
+                                charity_url),
       GNUNET_JSON_pack_string ("name",
-                               qs->charity_name));
-  }
-  return MHD_queue_response (rc->connection,
-                             MHD_HTTP_OK,
-                             resp);
+                                charity_name));
+
+    return MHD_queue_response (rc->connection,
+                               MHD_HTTP_OK,
+                               resp);
   }
 }