From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 12 Nov 2010 10:45:23 +0000 (+0100)
Subject: Fix various compile warnings
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;ds=sidebyside;h=HEAD;p=splice.git

Fix various compile warnings

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/nettest/fillfile.c b/nettest/fillfile.c
index 002f3a6..d87404f 100644
--- a/nettest/fillfile.c
+++ b/nettest/fillfile.c
@@ -69,12 +69,18 @@ static int fill_file(int fd)
 	unsigned long long fs = (unsigned long long) file_size * 1024 * 1024ULL;
 
 	while (fs) {
+		int ret;
+
 		if (fs < msg_size)
 			break;
 
 		fill_buf(m, msg_size);
-		write(fd, m, msg_size);
-		fs -= msg_size;
+		ret = write(fd, m, msg_size);
+		if (ret < 0) {
+			perror("write");
+			return -1;
+		}
+		fs -= ret;
 	}
 
 	close(fd);
diff --git a/nettest/xmit.c b/nettest/xmit.c
index 0b7976f..adb0352 100644
--- a/nettest/xmit.c
+++ b/nettest/xmit.c
@@ -158,7 +158,7 @@ static int vmsplice_in(void *buf, int pipefd, unsigned int len)
  * Keep four pipes of buffers, that should be enough to ensure that
  * we don't reuse
  */
-static void setup_buffers(void)
+static int setup_buffers(void)
 {
 	int i;
 
@@ -166,8 +166,14 @@ static void setup_buffers(void)
 
 	buffers = malloc(sizeof(void *) * nr_bufs);
 
-	for (i = 0; i < nr_bufs; i++)
-		posix_memalign(&buffers[i], 4096, msg_size);
+	for (i = 0; i < nr_bufs; i++) {
+		if (posix_memalign(&buffers[i], 4096, msg_size)) {
+			printf("posix_memalign: %s\n", strerror(errno));
+			return -1;
+		}
+	}
+
+	return 0;
 }
 
 static void free_buffers(void)
@@ -188,7 +194,8 @@ static int splice_send_loop(int fd)
 	if (pipe(pipes) < 0)
 		return error("pipe");
 
-	setup_buffers();
+	if (setup_buffers())
+		return -1;
 
 	while (packets--) {
 		m = buffers[cur_buf];
diff --git a/splice-bench.c b/splice-bench.c
index c4f6950..b21319d 100644
--- a/splice-bench.c
+++ b/splice-bench.c
@@ -161,7 +161,8 @@ static int server(int offset)
 	int sk, opt;
 
 	bind_to_cpu(offset);
-	nice(-20);
+	if (nice(-20) < 0)
+		perror("nice");
 
 	sk = socket(PF_INET, SOCK_STREAM, 0);
 	if (sk < 0)
@@ -420,7 +421,8 @@ static int client(int offset)
 	char fname[64];
 
 	bind_to_cpu(offset);
-	nice(-20);
+	if (nice(-20) < 0)
+		perror("nice");
 
 	if (!write_to_null)
 		out_fd = client_open_net(offset);
diff --git a/splice-test4c.c b/splice-test4c.c
index 1d10602..fc5617a 100644
--- a/splice-test4c.c
+++ b/splice-test4c.c
@@ -146,8 +146,10 @@ static int child(void)
 		return error("connect");
 
 	start_timing("Empty buffer");
-	for (i = 0; i < NR; i++)
-		write(sk, buffer, BUFSIZE);
+	for (i = 0; i < NR; i++) {
+		if (write(sk, buffer, BUFSIZE) != BUFSIZE)
+			return error("empty buffer write");
+	}
 	end_timing(NR*BUFSIZE, &r1);
 
 	fd = open("largefile", O_RDONLY);
@@ -158,7 +160,8 @@ static int child(void)
 	for (i = 0; i < NR; i++) {
 		if (read(fd, buffer, BUFSIZE) != BUFSIZE)
 			return error("largefile read");
-		write(sk, buffer, BUFSIZE);
+		if (write(sk, buffer, BUFSIZE) != BUFSIZE)
+			return error("largefile write");
 	}
 	end_timing(NR*BUFSIZE, &r2);
 	close(fd);
@@ -297,7 +300,7 @@ static void setup_shared_var(void)
 	BUG_ON(fd == -1);
 	close(fd);
 
-	fd = open(".tmp_mmap", O_RDWR|O_CREAT|O_TRUNC);
+	fd = open(".tmp_mmap", O_RDWR|O_CREAT|O_TRUNC, 0644);
 	BUG_ON(fd == -1);
 	ret = write(fd, zerobuff, 4096);
 	BUG_ON(ret != 4096);
@@ -349,7 +352,8 @@ static void lowprio_cycle_soak_loop(void)
 	 * We are a nice +19 SCHED_BATCH task:
 	 */
 	BUG_ON(sched_setscheduler(0, SCHED_BATCH, &p) != 0);
-	nice(40);
+	if (nice(40) < 0)
+		perror("nice");
 
 	rdtscll(t0);
 	while (cycles >= 0) {
@@ -375,7 +379,9 @@ int main(__attribute__((__unused__)) int argc, __attribute__((__unused__)) char
 		exit(0);
 	}
 
-	nice(-20);
+	if (nice(-20) < 0)
+		perror("nice");
+
 	child();
 	kill(pid, SIGHUP);
 	exit(0);