commit b25b49b1e65c7cce38814e04ddc36ac08c9a55ff
parent dbe8375ad9521036c43f3641dc10ed96e1ebba68
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Thu, 29 Jan 2026 18:02:18 +0900
rename for consistency
Diffstat:
7 files changed, 145 insertions(+), 145 deletions(-)
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
@@ -95,8 +95,8 @@ taler_merchant_httpd_SOURCES = \
taler-merchant-httpd_helper.h \
taler-merchant-httpd_mhd.c \
taler-merchant-httpd_mhd.h \
- taler-merchant-httpd_terms.c \
- taler-merchant-httpd_terms.h \
+ taler-merchant-httpd_get-terms.c \
+ taler-merchant-httpd_get-terms.h \
taler-merchant-httpd_mfa.c \
taler-merchant-httpd_mfa.h \
taler-merchant-httpd_private-delete-account-ID.c \
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -41,7 +41,7 @@
#include "taler-merchant-httpd_get-sessions-ID.h"
#include "taler-merchant-httpd_exchanges.h"
#include "taler-merchant-httpd_spa.h"
-#include "taler-merchant-httpd_terms.h"
+#include "taler-merchant-httpd_get-terms.h"
#include "taler-merchant-httpd_private-get-instances-ID-kyc.h"
#include "taler-merchant-httpd_private-get-statistics-report-transactions.h"
#include "taler-merchant-httpd_private-post-donau-instance.h"
diff --git a/src/backend/taler-merchant-httpd_dispatcher.c b/src/backend/taler-merchant-httpd_dispatcher.c
@@ -102,7 +102,7 @@
#include "taler-merchant-httpd_post-orders-ID-refund.h"
#include "taler-merchant-httpd_spa.h"
#include "taler-merchant-httpd_statics.h"
-#include "taler-merchant-httpd_terms.h"
+#include "taler-merchant-httpd_get-terms.h"
#include "taler-merchant-httpd_post-reports-ID.h"
#include "taler-merchant-httpd_private-delete-report-ID.h"
#include "taler-merchant-httpd_private-get-report-ID.h"
diff --git a/src/backend/taler-merchant-httpd_get-terms.c b/src/backend/taler-merchant-httpd_get-terms.c
@@ -0,0 +1,79 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2019, 2021, 2025 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
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-merchant-httpd_terms.c
+ * @brief Handle /terms requests to return the terms of service
+ * @author Christian Grothoff
+ */
+#include "taler-merchant-httpd_get-terms.h"
+
+/**
+ * Our terms of service.
+ */
+static struct TALER_MHD_Legal *tos;
+
+
+/**
+ * Our privacy policy.
+ */
+static struct TALER_MHD_Legal *pp;
+
+
+MHD_RESULT
+TMH_handler_terms (const struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ struct TMH_HandlerContext *rc)
+{
+ (void) rh;
+ (void) rc;
+ return TALER_MHD_reply_legal (connection,
+ tos);
+}
+
+
+MHD_RESULT
+TMH_handler_privacy (const struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ struct TMH_HandlerContext *rc)
+{
+ (void) rh;
+ (void) rc;
+ return TALER_MHD_reply_legal (connection,
+ pp);
+}
+
+
+void
+TMH_load_terms (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ tos = TALER_MHD_legal_load (cfg,
+ "merchant",
+ "TERMS_DIR",
+ "TERMS_ETAG");
+ if (NULL == tos)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Terms of service not configured\n");
+ pp = TALER_MHD_legal_load (cfg,
+ "merchant",
+ "PRIVACY_DIR",
+ "PRIVACY_ETAG");
+ if (NULL == pp)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Privacy policy not configured\n");
+}
+
+
+/* end of taler-merchant-httpd_terms.c */
diff --git a/src/backend/taler-merchant-httpd_get-terms.h b/src/backend/taler-merchant-httpd_get-terms.h
@@ -0,0 +1,62 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2019, 2021, 2025 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
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-merchant-httpd_terms.h
+ * @brief Handle /terms requests to return the terms of service
+ * @author Christian Grothoff
+ */
+#ifndef TALER_MERCHANT_HTTPD_GET_TERMS_H
+#define TALER_MERCHANT_HTTPD_GET_TERMS_H
+
+#include "taler-merchant-httpd.h"
+
+/**
+ * Handle a "/terms" request.
+ *
+ * @param rh this struct
+ * @param connection the MHD connection to handle
+ * @param[in,out] hc context with further information about the request
+ * @return MHD result code
+ */
+MHD_RESULT
+TMH_handler_terms (const struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ struct TMH_HandlerContext *rc);
+
+
+/**
+ * Handle a "/privacy" request.
+ *
+ * @param rc request context
+ * @param args array of additional options (must be empty for this function)
+ * @return MHD result code
+ */
+MHD_RESULT
+TMH_handler_privacy (const struct TMH_RequestHandler *rh,
+ struct MHD_Connection *connection,
+ struct TMH_HandlerContext *rc);
+
+
+/**
+ * Load our terms of service as per configuration.
+ *
+ * @param cfg configuration to process
+ */
+void
+TMH_load_terms (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+
+#endif
diff --git a/src/backend/taler-merchant-httpd_terms.c b/src/backend/taler-merchant-httpd_terms.c
@@ -1,79 +0,0 @@
-/*
- This file is part of TALER
- Copyright (C) 2019, 2021, 2025 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
- Foundation; either version 3, or (at your option) any later version.
-
- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License along with
- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-merchant-httpd_terms.c
- * @brief Handle /terms requests to return the terms of service
- * @author Christian Grothoff
- */
-#include "taler-merchant-httpd_terms.h"
-
-/**
- * Our terms of service.
- */
-static struct TALER_MHD_Legal *tos;
-
-
-/**
- * Our privacy policy.
- */
-static struct TALER_MHD_Legal *pp;
-
-
-MHD_RESULT
-TMH_handler_terms (const struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- struct TMH_HandlerContext *rc)
-{
- (void) rh;
- (void) rc;
- return TALER_MHD_reply_legal (connection,
- tos);
-}
-
-
-MHD_RESULT
-TMH_handler_privacy (const struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- struct TMH_HandlerContext *rc)
-{
- (void) rh;
- (void) rc;
- return TALER_MHD_reply_legal (connection,
- pp);
-}
-
-
-void
-TMH_load_terms (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- tos = TALER_MHD_legal_load (cfg,
- "merchant",
- "TERMS_DIR",
- "TERMS_ETAG");
- if (NULL == tos)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Terms of service not configured\n");
- pp = TALER_MHD_legal_load (cfg,
- "merchant",
- "PRIVACY_DIR",
- "PRIVACY_ETAG");
- if (NULL == pp)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Privacy policy not configured\n");
-}
-
-
-/* end of taler-merchant-httpd_terms.c */
diff --git a/src/backend/taler-merchant-httpd_terms.h b/src/backend/taler-merchant-httpd_terms.h
@@ -1,62 +0,0 @@
-/*
- This file is part of TALER
- Copyright (C) 2019, 2021, 2025 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
- Foundation; either version 3, or (at your option) any later version.
-
- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License along with
- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-merchant-httpd_terms.h
- * @brief Handle /terms requests to return the terms of service
- * @author Christian Grothoff
- */
-#ifndef TALER_MERCHANT_HTTPD_TERMS_H
-#define TALER_MERCHANT_HTTPD_TERMS_H
-
-#include "taler-merchant-httpd.h"
-
-/**
- * Handle a "/terms" request.
- *
- * @param rh this struct
- * @param connection the MHD connection to handle
- * @param[in,out] hc context with further information about the request
- * @return MHD result code
- */
-MHD_RESULT
-TMH_handler_terms (const struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- struct TMH_HandlerContext *rc);
-
-
-/**
- * Handle a "/privacy" request.
- *
- * @param rc request context
- * @param args array of additional options (must be empty for this function)
- * @return MHD result code
- */
-MHD_RESULT
-TMH_handler_privacy (const struct TMH_RequestHandler *rh,
- struct MHD_Connection *connection,
- struct TMH_HandlerContext *rc);
-
-
-/**
- * Load our terms of service as per configuration.
- *
- * @param cfg configuration to process
- */
-void
-TMH_load_terms (const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-#endif
