From 28eab34ecea8b3677808c00cebbf4bd3227f8c68 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Mon, 22 Jun 2020 12:07:48 +0200
Subject: Use more descriptive names in struct cfg

---
 announce.c | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'announce.c')

diff --git a/announce.c b/announce.c
index 1225868..17ab2bb 100644
--- a/announce.c
+++ b/announce.c
@@ -20,51 +20,51 @@ struct announce {
 static void
 announce_cb(struct uring_task *task, int res)
 {
-	struct announce *aev = container_of(task, struct announce, task);
+	struct announce *announce = container_of(task, struct announce, task);
 	struct server *server;
 
 	assert_return(task);
 	assert_task_alive(DBG_ANN, task);
 
-	if (res != sizeof(aev->value)) {
+	if (res != sizeof(announce->value)) {
 		error("timerfd_read: %m");
 		return;
 	}
 
-	debug(DBG_ANN, "timerfd value %" PRIu64, aev->value);
+	debug(DBG_ANN, "timerfd value %" PRIu64, announce->value);
 	list_for_each_entry(server, &cfg->servers, list)
-		server_announce(server, aev->mcast_fd);
-	uring_read(&aev->task, &aev->value, sizeof(aev->value), announce_cb);
+		server_announce(server, announce->mcast_fd);
+	uring_read(&announce->task, &announce->value, sizeof(announce->value), announce_cb);
 }
 
 static void
 announce_free(struct uring_task *task)
 {
-	struct announce *aev = container_of(task, struct announce, task);
+	struct announce *announce = container_of(task, struct announce, task);
 
 	assert_return(task);
-	debug(DBG_ANN, "task %p, aev 0x%p, mcast_fd: %i",
-	      task, aev, aev->mcast_fd);
-	close(aev->mcast_fd);
-	xfree(aev);
+	debug(DBG_ANN, "task %p, announce 0x%p, mcast_fd: %i",
+	      task, announce, announce->mcast_fd);
+	close(announce->mcast_fd);
+	xfree(announce);
 }
 
 void
 announce_refdump()
 {
-	assert_return_silent(cfg->aev);
+	assert_return_silent(cfg->announce);
 
-	uring_task_refdump(&cfg->aev->task);
+	uring_task_refdump(&cfg->announce->task);
 }
 
 void
 announce_delete()
 {
-	assert_return(cfg->aev);
+	assert_return(cfg->announce);
 
-	debug(DBG_ANN, "closing fd %i", cfg->aev->task.fd);
-	uring_task_destroy(&cfg->aev->task);
-	cfg->aev = NULL;
+	debug(DBG_ANN, "closing fd %i", cfg->announce->task.fd);
+	uring_task_destroy(&cfg->announce->task);
+	cfg->announce = NULL;
 }
 
 void
@@ -81,9 +81,9 @@ announce_stop()
 		}
 	};
 
-	assert_return(cfg->aev);
+	assert_return(cfg->announce);
 
-	if (timerfd_settime(cfg->aev->task.fd, 0, &tspec, NULL) != 0)
+	if (timerfd_settime(cfg->announce->task.fd, 0, &tspec, NULL) != 0)
 		error("timerfd_settime: %m");
 }
 
@@ -101,23 +101,23 @@ announce_start()
 		}
 	};
 
-	assert_return(cfg->aev);
+	assert_return(cfg->announce);
 
-	if (timerfd_settime(cfg->aev->task.fd, 0, &tspec, NULL) != 0)
+	if (timerfd_settime(cfg->announce->task.fd, 0, &tspec, NULL) != 0)
 		error("timerfd_settime: %m");
 }
 
 void
 announce_init()
 {
-	struct announce *aev;
+	struct announce *announce;
 	int afd;
 	int sfd;
  
-	assert_return(!cfg->aev);
+	assert_return(!cfg->announce);
 
-	aev = zmalloc(sizeof(*aev));
-	if (!aev)
+	announce = zmalloc(sizeof(*announce));
+	if (!announce)
 		die("malloc: %m");
 
 	afd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
@@ -128,10 +128,10 @@ announce_init()
 	if (sfd < 0)
 		die("socket: %m");
 
-	uring_task_init(&aev->task, "announce", uring_parent(), announce_free);
-	uring_task_set_fd(&aev->task, afd);
-	aev->mcast_fd = sfd;
-	cfg->aev = aev;
-	uring_read(&aev->task, &aev->value, sizeof(aev->value), announce_cb);
+	uring_task_init(&announce->task, "announce", uring_parent(), announce_free);
+	uring_task_set_fd(&announce->task, afd);
+	announce->mcast_fd = sfd;
+	cfg->announce = announce;
+	uring_read(&announce->task, &announce->value, sizeof(announce->value), announce_cb);
 }
 
-- 
cgit v1.2.3