From 96df1d433936322b6d8a6f470c513867bb5e26e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 25 Oct 2019 11:05:35 -0400
Subject: [PATCH] c wrapper: update callback return types
---
c/opendht_c.h | 4 ++--
tools/dhtcnode.c | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/c/opendht_c.h b/c/opendht_c.h
index abc6b8cd..a78f7d33 100644
--- a/c/opendht_c.h
+++ b/c/opendht_c.h
@@ -88,8 +88,8 @@ OPENDHT_C_PUBLIC void dht_identity_delete(dht_identity*);
// callbacks
typedef bool (*dht_get_cb)(const dht_value* value, void* user_data);
typedef bool (*dht_value_cb)(const dht_value* value, bool expired, void* user_data);
-typedef bool (*dht_done_cb)(bool ok, void* user_data);
-typedef bool (*dht_shutdown_cb)(void* user_data);
+typedef void (*dht_done_cb)(bool ok, void* user_data);
+typedef void (*dht_shutdown_cb)(void* user_data);
struct OPENDHT_C_PUBLIC dht_op_token;
typedef struct dht_op_token dht_op_token;
diff --git a/tools/dhtcnode.c b/tools/dhtcnode.c
index 5446a2d8..ad72a72d 100644
--- a/tools/dhtcnode.c
+++ b/tools/dhtcnode.c
@@ -15,6 +15,7 @@ bool dht_value_callback(const dht_value* value, bool expired, void* user_data)
{
dht_data_view data = dht_value_get_data(value);
printf("Value callback %s: %.*s.\n", expired ? "expired" : "new", (int)data.size, data.data);
+ return true;
}
bool dht_get_callback(const dht_value* value, void* user_data)
@@ -22,15 +23,16 @@ bool dht_get_callback(const dht_value* value, void* user_data)
dht_runner* runner = (dht_runner*)user_data;
dht_data_view data = dht_value_get_data(value);
printf("Get callback: %.*s.\n", (int)data.size, data.data);
+ return true;
}
-bool dht_done_callback(bool ok, void* user_data)
+void dht_done_callback(bool ok, void* user_data)
{
dht_runner* runner = (dht_runner*)user_data;
printf("Done callback. %s\n", ok ? "Success !" : "Failure :-(");
}
-bool op_context_free(void* user_data)
+void op_context_free(void* user_data)
{
struct op_context* ctx = (struct op_context*)user_data;
printf("op_context_free %d.\n", ctx->d);
--
GitLab