[PATCH] Cleanups/dead code removal

diff --git a/splice-bench.c b/splice-bench.c
index 8f808a11aee262a04bd5bee8fc08e9230b32fcc0..9ceae5048da5eeb48a763666e61547ea56474fb2 100644 (file)
--- a/splice-bench.c
+++ b/splice-bench.c
@@ -28,7 +28,7 @@ static int write_to_null;
 static int same_file;
 static int splice_size = SPLICE_SIZE;
 static char *filename = "splice-file";
-static int max_client_run = 15;
+static unsigned int max_client_run = 15;
 static int run_rw = 1;
 static int run_splice = 1;
 static int run_mmap = 1;

diff --git a/splice-test4c.c b/splice-test4c.c
index 38f5810aa3b9abfc07853aa2628aad8eb0b07c90..3d1a867ddfc035e974df5842859c477ec82badd8 100644 (file)
--- a/splice-test4c.c
+++ b/splice-test4c.c
@@ -25,7 +25,7 @@
 #define TARGET_HOSTNAME "localhost"
 
 #define BYTES (128*1024*1024UL)
-#define BUFSIZE (64*1024)
+#define BUFSIZE (64*1024U)
 
 #define NR (BYTES/BUFSIZE)
 
@@ -112,7 +112,7 @@ static void calibrate_loops(void)
        printf("%Ld cycles/sec\n", cycles_per_sec);
 }
 
-static int child(struct sockaddr *addr, int len)
+static int child(void)
 {
        static char buffer[BUFSIZE];
        int sk;
@@ -121,7 +121,8 @@ static int child(struct sockaddr *addr, int len)
        struct sockaddr_in s_to;
        struct hostent *hp;
        double r1, r2, r3, r4, r5;
-       int i, pipefd[2];
+       unsigned int i;
+       int pipefd[2];
        loff_t off = 0;
 
        r1 = r2 = r3 = r4 = r5 = 0;
@@ -141,7 +142,7 @@ static int child(struct sockaddr *addr, int len)
        fprintf(stdout, "BUFSIZE = %d\n", BUFSIZE);
        fflush(stdout);
 
-       if (connect(sk, (struct sockaddr *)&s_to, len) < 0)
+       if (connect(sk, (struct sockaddr *)&s_to, sizeof(s_to)) < 0)
                return error("connect");
 
        start_timing("Empty buffer");
@@ -166,7 +167,7 @@ static int child(struct sockaddr *addr, int len)
        start_timing("sendfile");
 sendfile_again:
        sk = socket(PF_INET, SOCK_STREAM, 0);
-       if (connect(sk, (struct sockaddr *)&s_to, len) < 0)
+       if (connect(sk, (struct sockaddr *)&s_to, sizeof(s_to)) < 0)
                return error("connect");
 
        fd = open("largefile", O_RDONLY);
@@ -188,7 +189,7 @@ sendfile_again:
        start_timing("splice-pipe");
 splice_pipe_again:
        sk = socket(PF_INET, SOCK_STREAM, 0);
-       if (connect(sk, (struct sockaddr *)&s_to, len) < 0)
+       if (connect(sk, (struct sockaddr *)&s_to, sizeof(s_to)) < 0)
                return error("connect");
 
        fd = open("largefile", O_RDONLY);
@@ -229,7 +230,7 @@ splice_pipe_again:
        start_timing("splice");
 splice_again:
        sk = socket(PF_INET, SOCK_STREAM, 0);
-       if (connect(sk, (struct sockaddr *)&s_to, len) < 0)
+       if (connect(sk, (struct sockaddr *)&s_to, sizeof(s_to)) < 0)
                return error("connect");
 
        fd = open("largefile", O_RDONLY);
@@ -353,36 +354,22 @@ static void lowprio_cycle_soak_loop(void)
        }
 }
 
-int main(int argc, char **argv)
+int main(__attribute__((__unused__)) int argc, __attribute__((__unused__)) char **argv)
 {
-       unsigned int sk, len;
-       struct sockaddr addr;
        pid_t pid;
 
        setup_shared_var();
 
        signal(SIGCHLD, SIG_IGN);
-       sk = socket(PF_INET, SOCK_STREAM, 0);
-       if (sk < 0) {
-               perror("socket");
-               exit(1);
-       }
-       if (listen(sk, 1) < 0) {
-               perror("listen");
-               exit(1);
-       }
-       len = sizeof(addr);
-       if (getsockname(sk, &addr, &len) < 0) {
-               perror("getsockname");
-               exit(1);
-       }
+
        pid = fork();
        if (!pid) {
                lowprio_cycle_soak_loop();
                exit(0);
        }
+
        nice(-20);
-       child(&addr, len);
+       child();
        kill(pid, SIGHUP);
        exit(0);
 }

diff --git a/splice-test4s.c b/splice-test4s.c
index 925df5dcd13ffa707aa77d2b897ddc071b49b814..0f42b0fed6d9be143a4313ad8392e7759d3d93ee 100644 (file)
--- a/splice-test4s.c
+++ b/splice-test4s.c
@@ -48,11 +48,12 @@ again:
        goto again;
 }
 
-int main(int argc, char **argv)
+int main(__attribute__((__unused__)) int argc, __attribute__((__unused__)) char **argv)
 {
-       unsigned int sk, len;
-       struct sockaddr addr;
        struct sockaddr_in saddr_in;
+       struct sockaddr addr;
+       unsigned int len;
+       int sk;
 
        signal(SIGCHLD, SIG_IGN);
        sk = socket(PF_INET, SOCK_STREAM, 0);

diff --git a/vmsplice.c b/vmsplice.c
index 0382f46444de05c8059b479fe26f8f17efedb033..03e259257d26b81d8902b37a655ea2286a8dccbc 100644 (file)
--- a/vmsplice.c
+++ b/vmsplice.c
@@ -50,7 +50,7 @@ int do_vmsplice(int fd, void *b1, void *b2, int len)
                        return error("vmsplice");
 
                len -= written;
-               if (written >= iov[idx].iov_len) {
+               if ((size_t) written >= iov[idx].iov_len) {
                        int extra = written - iov[idx].iov_len;
 
                        idx++;