pkev: data at every level

2 files changed, 22 insertions, 22 deletions

diff --git a/test/pkev.c b/test/pkev.c
index a738e70..55c3f85 100644
--- a/test/pkev.c
+++ b/test/pkev.c
@@ -15,13 +15,13 @@ struct ev ev_one = {0};
 struct ev ev_two = {0};
 
 void
-handle_ev_one(void *)
+handle_ev_one(void *, void *, void *)
 {
 	ev_one.handled = true;
 }
 
 void
-handle_ev_two(void *)
+handle_ev_two(void *, void *, void *)
 {
 	ev_two.handled = true;
 }
@@ -66,10 +66,10 @@ int main(int argc, char *argv[])
 	// register, emit, catch
 	{
 		const pk_ev_mgr_id_T evmgr = test_setup();
-		ev_one.evid = pk_ev_register_ev(evmgr);
-		ev_two.evid = pk_ev_register_ev(evmgr);
-		pk_ev_register_cb(evmgr, ev_one.evid, handle_ev_one);
-		pk_ev_register_cb(evmgr, ev_two.evid, handle_ev_two);
+		ev_one.evid = pk_ev_register_ev(evmgr, NULL);
+		ev_two.evid = pk_ev_register_ev(evmgr, NULL);
+		pk_ev_register_cb(evmgr, ev_one.evid, handle_ev_one, NULL);
+		pk_ev_register_cb(evmgr, ev_two.evid, handle_ev_two, NULL);
 		pk_ev_emit(evmgr, ev_one.evid, NULL);
 		pk_ev_emit(evmgr, ev_two.evid, NULL);
 		PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled);
@@ -81,10 +81,10 @@ int main(int argc, char *argv[])
 	{
 		thrd_t t1, t2;
 		const pk_ev_mgr_id_T evmgr = test_setup();
-		ev_one.evid = pk_ev_register_ev(evmgr);
-		ev_two.evid = pk_ev_register_ev(evmgr);
-		pk_ev_register_cb(evmgr, ev_one.evid, handle_ev_one);
-		pk_ev_register_cb(evmgr, ev_two.evid, handle_ev_two);
+		ev_one.evid = pk_ev_register_ev(evmgr, NULL);
+		ev_two.evid = pk_ev_register_ev(evmgr, NULL);
+		pk_ev_register_cb(evmgr, ev_one.evid, handle_ev_one, NULL);
+		pk_ev_register_cb(evmgr, ev_two.evid, handle_ev_two, NULL);
 		thrd_create(&t1, thrd_ev_emit_one, NULL);
 		thrd_create(&t2, thrd_ev_emit_two, NULL);
 		thrd_join(t1, &i);
diff --git a/test/pkev.cpp b/test/pkev.cpp
index 3d8745a..5842b94 100644
--- a/test/pkev.cpp
+++ b/test/pkev.cpp
@@ -38,13 +38,13 @@ struct cb_data {
 	struct ev *ev;
 };
 
-void stress_cb(void *user_data) {
+void stress_cb(void *, void *, void *user_data) {
 	struct cb_data *data = reinterpret_cast<struct cb_data*>(user_data);
 	data->ev[data->i].handled = true;
 	data->ev[data->i].count += 1;
 }
 
-void invoke_packged_task(void* ptr) {
+void invoke_packged_task(void *, void *, void* ptr) {
 	(*static_cast<std::packaged_task<void()>*>(ptr))();
 }
 
@@ -61,10 +61,10 @@ int main(int argc, char *argv[])
 		std::packaged_task<void()> handle_ev_one([](){ ev_one.handled = true; });
 		std::packaged_task<void()> handle_ev_two([](){ ev_two.handled = true; });
 		pk_ev_mgr_id_T evmgr = test_setup();
-		ev_one.evid = pk_ev_register_ev(evmgr);
-		ev_two.evid = pk_ev_register_ev(evmgr);
-		pk_ev_register_cb(evmgr, ev_one.evid, &invoke_packged_task);
-		pk_ev_register_cb(evmgr, ev_two.evid, &invoke_packged_task);
+		ev_one.evid = pk_ev_register_ev(evmgr, NULL);
+		ev_two.evid = pk_ev_register_ev(evmgr, NULL);
+		pk_ev_register_cb(evmgr, ev_one.evid, &invoke_packged_task, NULL);
+		pk_ev_register_cb(evmgr, ev_two.evid, &invoke_packged_task, NULL);
 		pk_ev_emit(evmgr, ev_one.evid, &handle_ev_one);
 		pk_ev_emit(evmgr, ev_two.evid, &handle_ev_two);
 		PK_LOGV_INF("%s: ev_one: %b, ev_two: %b\n", __FILE__, ev_one.handled, ev_two.handled);
@@ -79,10 +79,10 @@ int main(int argc, char *argv[])
 		std::packaged_task<void()> handle_ev_one([](){ ev_one.handled = true; });
 		std::packaged_task<void()> handle_ev_two([](){ ev_two.handled = true; });
 		const pk_ev_mgr_id_T evmgr = test_setup();
-		ev_one.evid = pk_ev_register_ev(evmgr);
-		ev_two.evid = pk_ev_register_ev(evmgr);
-		pk_ev_register_cb(evmgr, ev_one.evid, &invoke_packged_task);
-		pk_ev_register_cb(evmgr, ev_two.evid, &invoke_packged_task);
+		ev_one.evid = pk_ev_register_ev(evmgr, NULL);
+		ev_two.evid = pk_ev_register_ev(evmgr, NULL);
+		pk_ev_register_cb(evmgr, ev_one.evid, &invoke_packged_task, NULL);
+		pk_ev_register_cb(evmgr, ev_two.evid, &invoke_packged_task, NULL);
 		auto t1 = std::thread([&handle_ev_one]() { pk_ev_emit(ev_one.evmgr, ev_one.evid, &handle_ev_one); });
 		auto t2 = std::thread([&handle_ev_two]() { pk_ev_emit(ev_two.evmgr, ev_two.evid, &handle_ev_two); });
 		t1.join();
@@ -102,9 +102,9 @@ int main(int argc, char *argv[])
 		const pk_ev_mgr_id_T evmgr = test_setup();
 		for (i = 0; i < ev_count; ++i) {
 			evs[i].evmgr = evmgr;
-			evs[i].evid = pk_ev_register_ev(evmgr);
+			evs[i].evid = pk_ev_register_ev(evmgr, NULL);
 			for (ii = 0; ii < cb_count; ++ii) {
-				pk_ev_register_cb(evmgr, evs[i].evid, &stress_cb);
+				pk_ev_register_cb(evmgr, evs[i].evid, &stress_cb, NULL);
 			}
 		}