commit 4c16d76d90f7caeacf4df9e6f4eb30d39e76f3f9
parent 42d1ac6d2138cfba3381fcc9453c8ade881ea811
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Sun, 16 Aug 2026 22:16:31 +0200
do not typedef same name in two different ways
Diffstat:
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/exchangedb/iterate_aml_history_above_serial_id.c b/src/exchangedb/iterate_aml_history_above_serial_id.c
@@ -31,7 +31,7 @@ struct AmlDecisionContext
/**
* Function to call for each decision.
*/
- TALER_EXCHANGEDB_AmlDecisionCallback cb;
+ TALER_EXCHANGEDB_AmlHistoryDecisionCallback cb;
/**
* Closure for @e cb.
@@ -166,8 +166,8 @@ enum GNUNET_DB_QueryStatus
TALER_EXCHANGEDB_iterate_aml_history_above_serial_id (
struct TALER_EXCHANGEDB_PostgresContext *pg,
uint64_t serial_id,
- TALER_EXCHANGEDB_AmlDecisionCallback cb,
- TALER_EXCHANGEDB_AML_DECISION_RESULT_CLOSURE *cb_cls)
+ TALER_EXCHANGEDB_AmlHistoryDecisionCallback cb,
+ TALER_EXCHANGEDB_AML_HISTORY_DECISION_RESULT_CLOSURE *cb_cls)
{
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&serial_id),
diff --git a/src/include/exchange-database/iterate_aml_history_above_serial_id.h b/src/include/exchange-database/iterate_aml_history_above_serial_id.h
@@ -26,11 +26,11 @@
#include "exchangedb_lib.h"
-#ifndef TALER_EXCHANGEDB_AML_DECISION_RESULT_CLOSURE
+#ifndef TALER_EXCHANGEDB_AML_HISTORY_DECISION_RESULT_CLOSURE
/**
- * Type of the closure for #TALER_EXCHANGEDB_AmlDecisionCallback.
+ * Type of the closure for #TALER_EXCHANGEDB_AmlHistoryDecisionCallback.
*/
-#define TALER_EXCHANGEDB_AML_DECISION_RESULT_CLOSURE void
+#define TALER_EXCHANGEDB_AML_HISTORY_DECISION_RESULT_CLOSURE void
#endif
/* Callback typedefs */
@@ -60,8 +60,8 @@
* @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
*/
typedef enum GNUNET_GenericReturnValue
-(*TALER_EXCHANGEDB_AmlDecisionCallback)(
- TALER_EXCHANGEDB_AML_DECISION_RESULT_CLOSURE *cls,
+(*TALER_EXCHANGEDB_AmlHistoryDecisionCallback)(
+ TALER_EXCHANGEDB_AML_HISTORY_DECISION_RESULT_CLOSURE *cls,
uint64_t rowid,
const struct TALER_NormalizedPaytoHashP *h_payto,
const char *justification,
@@ -80,6 +80,8 @@ typedef enum GNUNET_GenericReturnValue
* Select AML decisions from aml_history above @a serial_id in monotonically
* increasing order, joined with everything else the officer signed over.
*
+ * Primary test table: `aml_history` (see test_aml_history.c).
+ *
* @param pg the database context
* @param serial_id lowest serial ID to include (the row itself is returned,
* so callers resuming from a progress point pass last seen + 1)
@@ -91,7 +93,7 @@ enum GNUNET_DB_QueryStatus
TALER_EXCHANGEDB_iterate_aml_history_above_serial_id (
struct TALER_EXCHANGEDB_PostgresContext *pg,
uint64_t serial_id,
- TALER_EXCHANGEDB_AmlDecisionCallback cb,
- TALER_EXCHANGEDB_AML_DECISION_RESULT_CLOSURE *cb_cls);
+ TALER_EXCHANGEDB_AmlHistoryDecisionCallback cb,
+ TALER_EXCHANGEDB_AML_HISTORY_DECISION_RESULT_CLOSURE *cb_cls);
#endif