From bd2a9863d8845500d265d9170ae10dec4ceff34d Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Tue, 5 Nov 2013 14:20:39 +0000 Subject: [PATCH] Clean up -Wtautological-compare -Wformat warnings. --- tools/tools/syscall_timing/syscall_timing.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/tools/syscall_timing/syscall_timing.c b/tools/tools/syscall_timing/syscall_timing.c index 175c1bc9bd6c..52d3359f17c5 100644 --- a/tools/tools/syscall_timing/syscall_timing.c +++ b/tools/tools/syscall_timing/syscall_timing.c @@ -192,7 +192,8 @@ test_pipe(uintmax_t num, uintmax_t int_arg, const char *path) uintmax_t test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path) { - uintmax_t i, so; + uintmax_t i; + int so; so = socket(int_arg, SOCK_STREAM, 0); if (so < 0) @@ -214,7 +215,8 @@ test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path) uintmax_t test_socket_dgram(uintmax_t num, uintmax_t int_arg, const char *path) { - uintmax_t i, so; + uintmax_t i; + int so; so = socket(int_arg, SOCK_DGRAM, 0); if (so < 0) @@ -408,7 +410,8 @@ test_dup(uintmax_t num, uintmax_t int_arg, const char *path) uintmax_t test_shmfd(uintmax_t num, uintmax_t int_arg, const char *path) { - uintmax_t i, shmfd; + uintmax_t i; + int shmfd; shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); if (shmfd < 0) @@ -431,7 +434,8 @@ uintmax_t test_fstat_shmfd(uintmax_t num, uintmax_t int_arg, const char *path) { struct stat sb; - uintmax_t i, shmfd; + uintmax_t i; + int shmfd; shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); if (shmfd < 0) @@ -785,7 +789,7 @@ main(int argc, char *argv[]) path); timespecsub(&ts_end, &ts_start); printf("%s\t%d\t", the_test->t_name, k); - printf("%ju.%09ju\t%d\t", (uintmax_t)ts_end.tv_sec, + printf("%ju.%09ju\t%ju\t", (uintmax_t)ts_end.tv_sec, (uintmax_t)ts_end.tv_nsec, calls); /*