From 0ba4f18ea6981b4d2b4eded11b2da4b2a2192d5b Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sun, 21 Jun 2020 21:39:15 +0200 Subject: Finish up the assert conversion --- announce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'announce.c') diff --git a/announce.c b/announce.c index ba98fef..9195cd2 100644 --- a/announce.c +++ b/announce.c @@ -30,7 +30,7 @@ mcast_sent(struct cfg *cfg, struct uring_task *task, int res) { struct server *server = container_of(task->tbuf, struct server, mcast_buf); - assert_return(task && task->tbuf); + assert_return(cfg && task && task->tbuf); if (res < 0) error("failure %i", res); @@ -110,7 +110,7 @@ announce_free(struct uring_task *task) void announce_refdump(struct announce *aev) { - assert_return(aev); + assert_return_silent(aev); uring_task_refdump(&aev->task); uring_task_refdump(&aev->mcast_task); @@ -188,10 +188,10 @@ announce_init(struct cfg *cfg) if (sfd < 0) die("socket: %m"); - uring_task_init(&aev->task, "aev", uring_parent(cfg), announce_free); + uring_task_init(cfg, &aev->task, "aev", uring_parent(cfg), announce_free); uring_task_set_fd(&aev->task, afd); - uring_task_init(&aev->mcast_task, "aev_mcast", &aev->task, mcast_free); + uring_task_init(cfg, &aev->mcast_task, "aev_mcast", &aev->task, mcast_free); uring_task_set_fd(&aev->mcast_task, sfd); saddr_set_ipv4(&aev->mcast_task.saddr, cinet_addr(224,0,2,60), htons(4445)); -- cgit v1.2.3