X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Faio%2Flio_listio.c;h=07145dd41656f85592954384a6c1d5252b2218f8;hp=8c851ca3bb66aa179e22bef89c0abaf62118ba69;hb=8600849d74ddd1fca8eba467af5c04c18731ba49;hpb=144c951b0df6be51a67c9f4d5d3626c22a947f16

diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c
index 8c851ca3..07145dd4 100644
--- a/src/aio/lio_listio.c
+++ b/src/aio/lio_listio.c
@@ -1,5 +1,8 @@
 #include <aio.h>
 #include <errno.h>
+#include <limits.h>
+#include <unistd.h>
+#include <string.h>
 #include "pthread_impl.h"
 
 struct lio_state {
@@ -10,7 +13,7 @@ struct lio_state {
 
 static int lio_wait(struct lio_state *st)
 {
-	int i, err, got_err;
+	int i, err, got_err = 0;
 	int cnt = st->cnt;
 	struct aiocb **cbs = st->cbs;
 
@@ -64,7 +67,7 @@ static void *wait_thread(void *p)
 	return 0;
 }
 
-int lio_listio(int mode, struct aiocb *const cbs[], int cnt, struct sigevent *sev)
+int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, struct sigevent *restrict sev)
 {
 	int i, ret;
 	struct lio_state *st=0;
@@ -81,7 +84,7 @@ int lio_listio(int mode, struct aiocb *const cbs[], int cnt, struct sigevent *se
 		}
 		st->cnt = cnt;
 		st->sev = sev;
-		memcpy(st->cbs, cbs, cnt*sizeof *cbs);
+		memcpy(st->cbs, (void*) cbs, cnt*sizeof *cbs);
 	}
 
 	for (i=0; i<cnt; i++) {
@@ -106,7 +109,7 @@ int lio_listio(int mode, struct aiocb *const cbs[], int cnt, struct sigevent *se
 	if (mode == LIO_WAIT) {
 		ret = lio_wait(st);
 		free(st);
-		return 0;
+		return ret;
 	}
 
 	if (st) {