From c405a7d93341d2c13167e8ab834c68f7b035a8bb Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Sat, 20 Jun 2020 10:56:23 +0200
Subject: Some callback naming consistency

---
 uring.c | 84 ++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'uring.c')

diff --git a/uring.c b/uring.c
index cc2b02d..e1fad53 100644
--- a/uring.c
+++ b/uring.c
@@ -259,7 +259,7 @@ uring_tbuf_write_cb(struct cfg *cfg, struct uring_task *task, int res)
 {
 	int r;
 
-	if (!task || !task->tbuf || !task->final_callback)
+	if (!task || !task->tbuf || !task->final_cb)
 		die("missing parameters");
 
 	debug(DBG_UR, "task %s (%p), fd %i, refcount %u\n",
@@ -283,12 +283,11 @@ uring_tbuf_write_cb(struct cfg *cfg, struct uring_task *task, int res)
 	return;
 
 finished:
-	task->final_callback(cfg, task, r);
-	return;
+	task->final_cb(cfg, task, r);
 }
 
 void
-uring_tbuf_write(struct cfg *cfg, struct uring_task *task, callback_t callback)
+uring_tbuf_write(struct cfg *cfg, struct uring_task *task, utask_cb_t final_cb)
 {
 	if (!task || task->fd < 0 || !task->tbuf || task->tbuf->len < 0) {
 		error("invalid parameters\n");
@@ -299,12 +298,12 @@ uring_tbuf_write(struct cfg *cfg, struct uring_task *task, callback_t callback)
 	      task->name, task, task->fd, task->refcount);
 
 	task->tbuf->done = 0;
-	task->final_callback = callback;
+	task->final_cb = final_cb;
 	uring_write(cfg, task, &task->tbuf->buf, task->tbuf->len, uring_tbuf_write_cb);
 }
 
 void
-uring_write(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, callback_t callback)
+uring_write(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -317,7 +316,7 @@ uring_write(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, cal
 	      task->name, task, task->fd, task->refcount);
 
        	sqe = get_sqe(cfg, task);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_write(sqe, task->fd, buf, len, 0);
 	io_uring_sqe_set_data(sqe, task);
 }
@@ -327,7 +326,7 @@ uring_tbuf_read_until_cb(struct cfg *cfg, struct uring_task *task, int res)
 {
 	int r;
 
-	if (!task || !task->tbuf || !task->final_callback || !task->complete_callback) {
+	if (!task || !task->tbuf || !task->final_cb || !task->is_complete_cb) {
 		error("invalid parameters\n");
 		return;
 	}
@@ -341,7 +340,7 @@ uring_tbuf_read_until_cb(struct cfg *cfg, struct uring_task *task, int res)
 	}
 
 	task->tbuf->len += res;
-	r = task->complete_callback(cfg, task, res);
+	r = task->is_complete_cb(cfg, task, res);
 	if (r < 0) {
 		r = res;
 		goto finished;
@@ -362,15 +361,14 @@ uring_tbuf_read_until_cb(struct cfg *cfg, struct uring_task *task, int res)
 	return;
 
 finished:
-	task->final_callback(cfg, task, r);
-	return;
+	task->final_cb(cfg, task, r);
 }
 
 void
 uring_tbuf_read_until(struct cfg *cfg, struct uring_task *task,
-		      rcallback_t complete, callback_t callback)
+		      rutask_cb_t is_complete_cb, utask_cb_t final_cb)
 {
-	if (!task || task->fd < 0 || !task->tbuf || !complete) {
+	if (!task || task->fd < 0 || !task->tbuf || !is_complete_cb || !final_cb) {
 		error("%s: invalid parameters\n", __func__);
 		return;
 	}
@@ -379,9 +377,10 @@ uring_tbuf_read_until(struct cfg *cfg, struct uring_task *task,
 	      task->name, task, task->fd, task->refcount);
 
 	task->tbuf->len = 0;
-	task->complete_callback = complete;
-	task->final_callback = callback;
-	uring_read(cfg, task, &task->tbuf->buf, sizeof(task->tbuf->buf), uring_tbuf_read_until_cb);
+	task->is_complete_cb = is_complete_cb;
+	task->final_cb = final_cb;
+	uring_read(cfg, task, &task->tbuf->buf, sizeof(task->tbuf->buf),
+		   uring_tbuf_read_until_cb);
 }
 
 static int
@@ -399,9 +398,10 @@ uring_tbuf_eof(struct cfg *cfg, struct uring_task *task, int res)
 }
 
 void
-uring_tbuf_read_until_eof(struct cfg *cfg, struct uring_task *task, callback_t callback)
+uring_tbuf_read_until_eof(struct cfg *cfg, struct uring_task *task,
+			  utask_cb_t final_cb)
 {
-	uring_tbuf_read_until(cfg, task, uring_tbuf_eof, callback);
+	uring_tbuf_read_until(cfg, task, uring_tbuf_eof, final_cb);
 }
 
 static int
@@ -414,13 +414,13 @@ uring_tbuf_have_data(struct cfg *cfg, struct uring_task *task, int res)
 }
 
 void
-uring_tbuf_read(struct cfg *cfg, struct uring_task *task, callback_t callback)
+uring_tbuf_read(struct cfg *cfg, struct uring_task *task, utask_cb_t final_cb)
 {
-	uring_tbuf_read_until(cfg, task, uring_tbuf_have_data, callback);
+	uring_tbuf_read_until(cfg, task, uring_tbuf_have_data, final_cb);
 }
 
 void
-uring_read_offset(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, off_t offset, callback_t callback)
+uring_read_offset(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, off_t offset, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -433,13 +433,13 @@ uring_read_offset(struct cfg *cfg, struct uring_task *task, void *buf, size_t le
 	      task->name, task, task->fd, task->refcount);
 
 	sqe = get_sqe(cfg, task);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_read(sqe, task->fd, buf, len, offset);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_openat(struct cfg *cfg, struct uring_task *task, const char *path, callback_t callback)
+uring_openat(struct cfg *cfg, struct uring_task *task, const char *path, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
        
@@ -447,13 +447,13 @@ uring_openat(struct cfg *cfg, struct uring_task *task, const char *path, callbac
 	      task->name, task, task->fd, task->refcount);
 
 	sqe = get_sqe(cfg, task);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_openat(sqe, AT_FDCWD, path, O_RDONLY | O_CLOEXEC, 0);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_tbuf_recvmsg(struct cfg *cfg, struct uring_task *task, callback_t callback)
+uring_tbuf_recvmsg(struct cfg *cfg, struct uring_task *task, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -470,13 +470,13 @@ uring_tbuf_recvmsg(struct cfg *cfg, struct uring_task *task, callback_t callback
 	task->tbuf->len = 0;
 	task->tbuf->iov.iov_len = sizeof(task->tbuf->buf);
 	task->tbuf->msg.msg_namelen = task->saddr.addrlen;
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_recvmsg(sqe, task->fd, &task->tbuf->msg, 0);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_tbuf_sendmsg(struct cfg *cfg, struct uring_task *task, callback_t callback)
+uring_tbuf_sendmsg(struct cfg *cfg, struct uring_task *task, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -492,13 +492,13 @@ uring_tbuf_sendmsg(struct cfg *cfg, struct uring_task *task, callback_t callback
 	task->tbuf->done = 0;
 	task->tbuf->iov.iov_len = task->tbuf->len;
 	task->tbuf->msg.msg_namelen = task->saddr.addrlen;
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_sendmsg(sqe, task->fd, &task->tbuf->msg, 0);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_connect(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, callback_t callback)
+uring_connect(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -511,13 +511,13 @@ uring_connect(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, cal
 	      task->name, task, task->fd, task->refcount);
 
 	sqe = get_sqe(cfg, task);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_connect(sqe, task->fd, (struct sockaddr *)&saddr->storage, saddr->addrlen);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_accept(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, callback_t callback)
+uring_accept(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 
@@ -531,13 +531,13 @@ uring_accept(struct cfg *cfg, struct uring_task *task, struct saddr *saddr, call
 
 	sqe = get_sqe(cfg, task);
 	saddr->addrlen = sizeof(saddr->storage);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_accept(sqe, task->fd, (struct sockaddr *)&saddr->storage, &saddr->addrlen, SOCK_CLOEXEC);
 	io_uring_sqe_set_data(sqe, task);
 }
 
 void
-uring_poll(struct cfg *cfg, struct uring_task *task, short poll_mask, callback_t callback)
+uring_poll(struct cfg *cfg, struct uring_task *task, short poll_mask, utask_cb_t cb)
 {
 	struct io_uring_sqe *sqe;
 	
@@ -550,7 +550,7 @@ uring_poll(struct cfg *cfg, struct uring_task *task, short poll_mask, callback_t
 	      task->name, task, task->fd, task->refcount);
 
 	sqe = get_sqe(cfg, task);
-	task->callback = callback;
+	task->cb = cb;
 	io_uring_prep_poll_add(sqe, task->fd, poll_mask);
 	io_uring_sqe_set_data(sqe, task);
 }
@@ -636,7 +636,7 @@ uring_print_cqe(struct cfg *cfg, const char *type, struct uring_task *task,
 	      task->name ? task->name : "<none>",
 	      task,
 	      task->fd,
-	      task->callback);
+	      task->cb);
 }
 
 void
@@ -659,7 +659,7 @@ uring_event_loop(struct cfg *cfg)
 		nr = 0;
 		io_uring_for_each_cqe(&cfg->uev->uring, head, cqe) {
 			struct uring_task *task = io_uring_cqe_get_data(cqe);
-			bool do_callback;
+			bool do_cb;
 			enum cqe_type cqe_type;
 
 			cqe_count++;
@@ -673,30 +673,30 @@ uring_event_loop(struct cfg *cfg)
 			switch (cqe_type) {
 			case CQE_TYPE_CANCEL:
 				uring_print_cqe(cfg, "cancel", task, cqe);
-				do_callback = false;
+				do_cb = false;
 				break;
 
 			case CQE_TYPE_CLOSE:
 				uring_print_cqe(cfg, "close", task, cqe);
-				do_callback = false;
+				do_cb = false;
 				break;
 
 			case CQE_TYPE_POLL_CANCEL:
 				uring_print_cqe(cfg, "poll_cancel", task, cqe);
-				do_callback = false;
+				do_cb = false;
 				break;
 
 			case CQE_TYPE_NORMAL:
 				uring_print_cqe(cfg, "standard", task, cqe);
-				do_callback = true;
+				do_cb = true;
 				break;
 
 			default:
 				die("unknown CQE type");
 			}
 
-			if (do_callback && task->callback)
-				task->callback(cfg, task, cqe->res);
+			if (do_cb && task->cb)
+				task->cb(cfg, task, cqe->res);
 
 			uring_task_put(cfg, task);
 
-- 
cgit v1.2.3