From f1d3364313e41eb82165e758717ed86b5b8261fb Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 21 Mar 2020 19:25:53 +0100
Subject: code cleanup, deduplication, DCE

---
 src/auditor/taler-auditor-httpd_mhd.c | 67 ++++++-----------------------------
 1 file changed, 11 insertions(+), 56 deletions(-)

(limited to 'src/auditor/taler-auditor-httpd_mhd.c')

diff --git a/src/auditor/taler-auditor-httpd_mhd.c b/src/auditor/taler-auditor-httpd_mhd.c
index 8d0496645..2a350fd09 100644
--- a/src/auditor/taler-auditor-httpd_mhd.c
+++ b/src/auditor/taler-auditor-httpd_mhd.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2019 Taler Systems SA
+  Copyright (C) 2014-2020 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
@@ -16,7 +16,7 @@
 
 /**
  * @file taler-auditor-httpd_mhd.c
- * @brief helpers for MHD interaction; these are TALER_AUDITOR_handler_ functions
+ * @brief helpers for MHD interaction; these are TALER_MHD_handler_ functions
  *        that generate simple MHD replies that do not require any real operations
  *        to be performed (error handling, static pages, etc.)
  * @author Florian Dold
@@ -50,32 +50,16 @@ TAH_MHD_handler_static_response (struct TAH_RequestHandler *rh,
                                  const char *upload_data,
                                  size_t *upload_data_size)
 {
-  struct MHD_Response *response;
-  int ret;
+  size_t dlen;
 
-  (void) connection_cls;
-  (void) upload_data;
-  (void) upload_data_size;
-  if (0 == rh->data_size)
-    rh->data_size = strlen ((const char *) rh->data);
-  response = MHD_create_response_from_buffer (rh->data_size,
-                                              (void *) rh->data,
-                                              MHD_RESPMEM_PERSISTENT);
-  if (NULL == response)
-  {
-    GNUNET_break (0);
-    return MHD_NO;
-  }
-  TALER_MHD_add_global_headers (response);
-  if (NULL != rh->mime_type)
-    (void) MHD_add_response_header (response,
-                                    MHD_HTTP_HEADER_CONTENT_TYPE,
-                                    rh->mime_type);
-  ret = MHD_queue_response (connection,
-                            rh->response_code,
-                            response);
-  MHD_destroy_response (response);
-  return ret;
+  dlen = (0 == rh->data_size)
+         ? strlen ((const char *) rh->data)
+         : rh->data_size;
+  return TALER_MHD_reply_static (connection,
+                                 rh->response_code,
+                                 rh->mime_type,
+                                 rh->data,
+                                 dlen);
 }
 
 
@@ -106,33 +90,4 @@ TAH_MHD_handler_agpl_redirect (struct TAH_RequestHandler *rh,
 }
 
 
-/**
- * Function to call to handle the request by building a JSON
- * reply with an error message from @a rh.
- *
- * @param rh context of the handler
- * @param connection the MHD connection to handle
- * @param[in,out] connection_cls the connection's closure (can be updated)
- * @param upload_data upload data
- * @param[in,out] upload_data_size number of bytes (left) in @a upload_data
- * @return MHD result code
- */
-int
-TAH_MHD_handler_send_json_pack_error (struct TAH_RequestHandler *rh,
-                                      struct MHD_Connection *connection,
-                                      void **connection_cls,
-                                      const char *upload_data,
-                                      size_t *upload_data_size)
-{
-  (void) connection_cls;
-  (void) upload_data;
-  (void) upload_data_size;
-  return TALER_MHD_reply_json_pack (connection,
-                                    rh->response_code,
-                                    "{s:s}",
-                                    "error",
-                                    rh->data);
-}
-
-
 /* end of taler-auditor-httpd_mhd.c */
-- 
cgit v1.2.3