Some callback naming consistency

1 files changed, 17 insertions, 14 deletions

diff --git a/uring.h b/uring.h
index f543c87..35cdec4 100644
--- a/uring.h
+++ b/uring.h
@@ -26,43 +26,46 @@ void uring_task_init(struct uring_task *task, const char *name,
 
 void uring_close(struct cfg *cfg, struct uring_task *task, int fd);
 
-void uring_tbuf_write(struct cfg *cfg, struct uring_task *task, callback_t callback);
+void uring_tbuf_write(struct cfg *cfg, struct uring_task *task,
+		      utask_cb_t final_cb);
 
 void uring_write(struct cfg *cfg, struct uring_task *task, void *buf,
-		 size_t len, callback_t callback);
+		 size_t len, utask_cb_t cb);
 
 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);
 
 void uring_tbuf_read_until_eof(struct cfg *cfg, struct uring_task *task,
-			       callback_t callback);
+			       utask_cb_t final_cb);
 
-void uring_tbuf_read(struct cfg *cfg, struct uring_task *task, callback_t callback);
+void uring_tbuf_read(struct cfg *cfg, struct uring_task *task,
+		     utask_cb_t final_cb);
 
 void uring_read_offset(struct cfg *cfg, struct uring_task *task, void *buf,
-		       size_t len, off_t offset, callback_t callback);
+		       size_t len, off_t offset, utask_cb_t cb);
 
 static inline void
-uring_read(struct cfg *cfg, struct uring_task *task, void *buf, size_t len, callback_t callback)
+uring_read(struct cfg *cfg, struct uring_task *task, void *buf, size_t len,
+	   utask_cb_t cb)
 {
-	uring_read_offset(cfg, task, buf, len, 0, callback);
+	uring_read_offset(cfg, task, buf, len, 0, cb);
 }
 
 void uring_openat(struct cfg *cfg, struct uring_task *task, const char *path,
-		  callback_t callback);
+		  utask_cb_t cb);
 
-void uring_tbuf_recvmsg(struct cfg *cfg, struct uring_task *task, callback_t callback);
+void uring_tbuf_recvmsg(struct cfg *cfg, struct uring_task *task, utask_cb_t cb);
 
-void uring_tbuf_sendmsg(struct cfg *cfg, struct uring_task *task, callback_t callback);
+void uring_tbuf_sendmsg(struct cfg *cfg, struct uring_task *task, utask_cb_t cb);
 
 void uring_connect(struct cfg *cfg, struct uring_task *task,
-		   struct saddr *saddr, callback_t callback);
+		   struct saddr *saddr, utask_cb_t cb);
 
 void uring_accept(struct cfg *cfg, struct uring_task *task,
-		  struct saddr *saddr, callback_t callback);
+		  struct saddr *saddr, utask_cb_t cb);
 
 void uring_poll(struct cfg *cfg, struct uring_task *task, short poll_mask,
-		callback_t callback);
+		utask_cb_t cb);
 
 void uring_poll_cancel(struct cfg *cfg, struct uring_task *task);