1 files changed, 7 insertions, 6 deletions

diff --git a/ot_mutex.c b/ot_mutex.c
index 9aa476d..2a8cbf5 100644
--- a/ot_mutex.c
+++ b/ot_mutex.c
@@ -62,7 +62,7 @@ size_t mutex_get_torrent_count(void) { return g_torrent_count; }
 struct ot_task {
   ot_taskid       taskid;
   ot_tasktype     tasktype;
-  int64           sock;
+  int64_t         sock;
   size_t          iovec_entries;
   struct iovec   *iovec;
   struct ot_task *next;
@@ -73,7 +73,7 @@ static struct ot_task *tasklist;
 static pthread_mutex_t tasklist_mutex;
 static pthread_cond_t  tasklist_being_filled;
 
-int mutex_workqueue_pushtask(int64 sock, ot_tasktype tasktype) {
+int mutex_workqueue_pushtask(int64_t sock, ot_tasktype tasktype) {
   struct ot_task **tmptask, *task;
 
   task = malloc(sizeof(struct ot_task));
@@ -102,7 +102,7 @@ int mutex_workqueue_pushtask(int64 sock, ot_tasktype tasktype) {
   return 0;
 }
 
-void mutex_workqueue_canceltask(int64 sock) {
+void mutex_workqueue_canceltask(int64_t sock) {
   struct ot_task **task;
 
   /* Want exclusive access to tasklist */
@@ -114,9 +114,10 @@ void mutex_workqueue_canceltask(int64 sock) {
       struct ot_task *ptask = *task;
       size_t                   i;
 
-      /* Free task's iovec */
+      /* Free task's iovec, the buffers it points at and the vector itself */
       for (i = 0; i < (*task)->iovec_entries; ++i)
         free(iovec[i].iov_base);
+      free(iovec);
 
       *task = (*task)->next;
       free(ptask);
@@ -226,9 +227,9 @@ int mutex_workqueue_pushchunked(ot_taskid taskid, struct iovec *iovec) {
   return task ? 0 : -1;
 }
 
-int64 mutex_workqueue_popresult(size_t *iovec_entries, struct iovec **iovec, int *is_partial) {
+int64_t mutex_workqueue_popresult(size_t *iovec_entries, struct iovec **iovec, int *is_partial) {
   struct ot_task **task;
-  int64            sock = -1;
+  int64_t sock = -1;
 
   *is_partial = 0;