commit 812ae1178386f8f14c0e31d1b9c57f2b1488fdfc
parent 0001edb08ada408b41353b5b005f7fd095683ccf
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 2 May 2026 22:06:54 +0200
improve type-safety by using the CLOSURE macros as intended
Diffstat:
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/sync/sync-httpd2_backup-post.c b/src/sync/sync-httpd2_backup-post.c
@@ -19,6 +19,9 @@
* @author Christian Grothoff
*/
#include "platform.h"
+struct BackupContext;
+#define TALER_MERCHANT_POST_PRIVATE_ORDERS_RESULT_CLOSURE struct BackupContext
+#define TALER_MERCHANT_GET_PRIVATE_ORDER_RESULT_CLOSURE struct BackupContext
#include "sync-httpd2.h"
#include <gnunet/gnunet_util_lib.h>
#include "sync-httpd2_backup.h"
@@ -283,10 +286,9 @@ make_payment_request (const char *order_id,
*/
static void
proposal_cb (
- void *cls,
+ struct BackupContext *bc,
const struct TALER_MERCHANT_PostPrivateOrdersResponse *por)
{
- struct BackupContext *bc = cls;
enum SYNC_DB_QueryStatus qs;
bc->po = NULL;
@@ -387,10 +389,9 @@ ongoing_payment_cb (void *cls,
*/
static void
check_payment_cb (
- void *cls,
+ struct BackupContext *bc,
const struct TALER_MERCHANT_GetPrivateOrderResponse *osr)
{
- struct BackupContext *bc = cls;
const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
/* refunds are not supported, verify */
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
@@ -19,6 +19,9 @@
* @author Christian Grothoff
*/
#include "platform.h"
+struct BackupContext;
+#define TALER_MERCHANT_POST_PRIVATE_ORDERS_RESULT_CLOSURE struct BackupContext
+#define TALER_MERCHANT_GET_PRIVATE_ORDER_RESULT_CLOSURE struct BackupContext
#include "sync-httpd.h"
#include <gnunet/gnunet_util_lib.h>
#include "sync-httpd_backup.h"
@@ -310,10 +313,9 @@ make_payment_request (const char *order_id,
*/
static void
proposal_cb (
- void *cls,
+ struct BackupContext *bc,
const struct TALER_MERCHANT_PostPrivateOrdersResponse *por)
{
- struct BackupContext *bc = cls;
enum SYNC_DB_QueryStatus qs;
bc->po = NULL;
@@ -415,10 +417,9 @@ ongoing_payment_cb (void *cls,
* @param osr order status
*/
static void
-check_payment_cb (void *cls,
+check_payment_cb (struct BackupContext *bc,
const struct TALER_MERCHANT_GetPrivateOrderResponse *osr)
{
- struct BackupContext *bc = cls;
const struct TALER_MERCHANT_HttpResponse *hr = &osr->hr;
/* refunds are not supported, verify */