From eb1c509ffddd13b4397a7740cfbc3da9a2e1ba00 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 16 Jan 2016 02:15:13 +0000 Subject: [PATCH] Fix warnings with gcc 5.0 reconnect.c: - Convert the K&R prototype of main to an ANSI prototype to mute a warning from gcc 4.2.1 - Close s_sock2 after finishing off the last test to plug a leak and mute a warning from gcc 5.0 about a -Wunused-but-set variable sendfile.c: - Fix a -Wunused-but-set warning with gcc 5.0 with pagesize in main(..) MFC after: 5 days Sponsored by: EMC / Isilon Storage Division --- tools/regression/sockets/reconnect/reconnect.c | 3 ++- tools/regression/sockets/sendfile/sendfile.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/regression/sockets/reconnect/reconnect.c b/tools/regression/sockets/reconnect/reconnect.c index 27f32cc8224e..985d6d709e64 100644 --- a/tools/regression/sockets/reconnect/reconnect.c +++ b/tools/regression/sockets/reconnect/reconnect.c @@ -104,7 +104,7 @@ cleanup(void) } int -main() +main(void) { int s_sock1, s_sock2, c_sock; @@ -127,6 +127,7 @@ main() connect_uds_server(c_sock, uds_name1); close(s_sock1); connect_uds_server(c_sock, uds_name2); + close(s_sock2); exit (0); } diff --git a/tools/regression/sockets/sendfile/sendfile.c b/tools/regression/sockets/sendfile/sendfile.c index 18ae9adadd46..3a5923487dec 100644 --- a/tools/regression/sockets/sendfile/sendfile.c +++ b/tools/regression/sockets/sendfile/sendfile.c @@ -459,12 +459,9 @@ cleanup(void) int main(int argc, char *argv[]) { - int pagesize; path[0] = '\0'; - pagesize = getpagesize(); - if (argc == 1) { snprintf(path, sizeof(path), "sendfile.XXXXXXXXXXXX"); file_fd = mkstemp(path);