warnings: fix code that emits compiler warnings

PR-URL: https://github.com/libuv/libuv/pull/2066
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>

20 files changed, 75 insertions, 33 deletions

diff --git a/test/run-tests.c b/test/run-tests.c
index 42bde0bb..2a699f46 100644
--- a/test/run-tests.c
+++ b/test/run-tests.c
@@ -142,11 +142,11 @@ static int maybe_run_test(int argc, char **argv) {
   if (strcmp(argv[1], "spawn_helper5") == 0) {
     const char out[] = "fourth stdio!\n";
     notify_parent_process();
+    {
 #ifdef _WIN32
-    DWORD bytes;
-    WriteFile((HANDLE) _get_osfhandle(3), out, sizeof(out) - 1, &bytes, NULL);
+      DWORD bytes;
+      WriteFile((HANDLE) _get_osfhandle(3), out, sizeof(out) - 1, &bytes, NULL);
 #else
-    {
       ssize_t r;
 
       do
@@ -154,8 +154,8 @@ static int maybe_run_test(int argc, char **argv) {
       while (r == -1 && errno == EINTR);
 
       fsync(3);
-    }
 #endif
+    }
     return 1;
   }
 
diff --git a/test/runner-win.c b/test/runner-win.c
index e3e91a7b..f60c23df 100644
--- a/test/runner-win.c
+++ b/test/runner-win.c
@@ -194,7 +194,7 @@ int process_wait(process_info_t *vec, int n, int timeout) {
 
   result = WaitForMultipleObjects(n, handles, TRUE, timeout_api);
 
-  if (result >= WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + n) {
+  if (result < WAIT_OBJECT_0 + n) {
     /* All processes are terminated. */
     return 0;
   }
@@ -268,7 +268,8 @@ int process_read_last_line(process_info_t *p,
   if (!ReadFile(p->stdio_out, buffer, buffer_len - 1, &read, &overlapped))
     return -1;
 
-  for (start = read - 1; start >= 0; start--) {
+  start = read;
+  while (start-- > 0) {
     if (buffer[start] == '\n' || buffer[start] == '\r')
       break;
   }
@@ -308,7 +309,7 @@ void process_cleanup(process_info_t *p) {
 }
 
 
-static int clear_line() {
+static int clear_line(void) {
   HANDLE handle;
   CONSOLE_SCREEN_BUFFER_INFO info;
   COORD coord;
diff --git a/test/runner-win.h b/test/runner-win.h
index 8cc4c16e..975eed79 100644
--- a/test/runner-win.h
+++ b/test/runner-win.h
@@ -20,7 +20,9 @@
  */
 
 /* Don't complain about write(), fileno() etc. being deprecated. */
+#ifdef _MSC_VER
 #pragma warning(disable : 4996)
+#endif
 
 
 #include <winsock2.h>
diff --git a/test/test-close-fd.c b/test/test-close-fd.c
index 93a7bd7c..2ed9a100 100644
--- a/test/test-close-fd.c
+++ b/test/test-close-fd.c
@@ -73,4 +73,8 @@ TEST_IMPL(close_fd) {
   return 0;
 }
 
-#endif  /* !defined(_WIN32) */
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-condvar.c b/test/test-condvar.c
index 50f3c047..32abccc2 100644
--- a/test/test-condvar.c
+++ b/test/test-condvar.c
@@ -235,7 +235,7 @@ TEST_IMPL(condvar_5) {
   uint64_t elapsed;
   uint64_t timeout;
 
-  timeout = 100 * 1e6; /* 100 ms in ns */
+  timeout = 100 * 1000 * 1000; /* 100 ms in ns */
 
   /* Mostly irrelevant. We need cond and mutex initialized. */
   worker_config_init(&wc, 0, NULL, NULL);
diff --git a/test/test-emfile.c b/test/test-emfile.c
index 8e44ac5c..bc1fce5f 100644
--- a/test/test-emfile.c
+++ b/test/test-emfile.c
@@ -38,6 +38,11 @@ static uv_tcp_t client_handle;
 
 
 TEST_IMPL(emfile) {
+  struct sockaddr_in addr;
+  struct rlimit limits;
+  uv_connect_t connect_req;
+  uv_loop_t* loop;
+  int first_fd;
 #if defined(_AIX) || defined(__MVS__)
   /* On AIX, if a 'accept' call fails ECONNRESET is set on the socket
    * which causes uv__emfile_trick to not work as intended and this test
@@ -45,11 +50,6 @@ TEST_IMPL(emfile) {
    */
   RETURN_SKIP("uv__emfile_trick does not work on this OS");
 #endif
-  struct sockaddr_in addr;
-  struct rlimit limits;
-  uv_connect_t connect_req;
-  uv_loop_t* loop;
-  int first_fd;
 
   /* Lower the file descriptor limit and use up all fds save one. */
   limits.rlim_cur = limits.rlim_max = maxfd + 1;
@@ -114,4 +114,8 @@ static void connect_cb(uv_connect_t* req, int status) {
   uv_close((uv_handle_t*) &client_handle, NULL);
 }
 
-#endif  /* !defined(_WIN32) */
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-fork.c b/test/test-fork.c
index f47ae3e6..9e4684f0 100644
--- a/test/test-fork.c
+++ b/test/test-fork.c
@@ -676,5 +676,8 @@ TEST_IMPL(fork_threadpool_queue_work_simple) {
 }
 #endif /* !__MVS__ */
 
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
 
 #endif /* !_WIN32 */
diff --git a/test/test-fs.c b/test/test-fs.c
index 038d2dd6..5530b3c8 100644
--- a/test/test-fs.c
+++ b/test/test-fs.c
@@ -154,7 +154,7 @@ int uv_test_getiovmax(void) {
 static unsigned REPARSE_TAG = 0x9913;
 static GUID REPARSE_GUID = {
   0x1bf6205f, 0x46ae, 0x4527,
-  0xb1, 0x0c, 0xc5, 0x09, 0xb7, 0x55, 0x22, 0x80 };
+  { 0xb1, 0x0c, 0xc5, 0x09, 0xb7, 0x55, 0x22, 0x80 }};
 #endif
 
 static void check_permission(const char* filename, unsigned int mode) {
@@ -2331,9 +2331,6 @@ TEST_IMPL(fs_stat_root) {
 
 
 TEST_IMPL(fs_futime) {
-#if defined(_AIX) && !defined(_AIX71)
-  RETURN_SKIP("futime is not implemented for AIX versions below 7.1");
-#else
   utime_check_t checkme;
   const char* path = "test_file";
   double atime;
@@ -2341,6 +2338,9 @@ TEST_IMPL(fs_futime) {
   uv_file file;
   uv_fs_t req;
   int r;
+#if defined(_AIX) && !defined(_AIX71)
+  RETURN_SKIP("futime is not implemented for AIX versions below 7.1");
+#endif
 
   /* Setup. */
   loop = uv_default_loop();
@@ -2402,7 +2402,6 @@ TEST_IMPL(fs_futime) {
 
   MAKE_VALGRIND_HAPPY();
   return 0;
-#endif
 }
 
 
diff --git a/test/test-ip6-addr.c b/test/test-ip6-addr.c
index 25570dca..bbf33a48 100644
--- a/test/test-ip6-addr.c
+++ b/test/test-ip6-addr.c
@@ -83,7 +83,7 @@ TEST_IMPL(ip6_addr_link_local) {
     ASSERT(0 == r);
 #ifdef _WIN32
     /* On Windows, the interface identifier is the numeric string of the index. */
-    ASSERT(strtol(interface_id, NULL, 10) == iface_index);
+    ASSERT(strtoul(interface_id, NULL, 10) == iface_index);
 #else
     /* On Unix/Linux, the interface identifier is the interface device name. */
     ASSERT(0 == strcmp(device_name, interface_id));
diff --git a/test/test-pipe-close-stdout-read-stdin.c b/test/test-pipe-close-stdout-read-stdin.c
index c8804b0e..126be2cc 100644
--- a/test/test-pipe-close-stdout-read-stdin.c
+++ b/test/test-pipe-close-stdout-read-stdin.c
@@ -105,4 +105,8 @@ TEST_IMPL(pipe_close_stdout_read_stdin) {
   return 0;
 }
 
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
 #endif /* ifndef _WIN32 */
diff --git a/test/test-poll-close-doesnt-corrupt-stack.c b/test/test-poll-close-doesnt-corrupt-stack.c
index 1dfc80e3..3393820f 100644
--- a/test/test-poll-close-doesnt-corrupt-stack.c
+++ b/test/test-poll-close-doesnt-corrupt-stack.c
@@ -49,7 +49,7 @@ static void poll_cb(uv_poll_t* h, int status, int events) {
 }
 
 
-static void NO_INLINE close_socket_and_verify_stack() {
+static void NO_INLINE close_socket_and_verify_stack(void) {
   const uint32_t MARKER = 0xDEADBEEF;
   const int VERIFY_AFTER = 10; /* ms */
   int r;
diff --git a/test/test-poll-oob.c b/test/test-poll-oob.c
index 2a6da843..77ffe31e 100644
--- a/test/test-poll-oob.c
+++ b/test/test-poll-oob.c
@@ -202,4 +202,9 @@ TEST_IMPL(poll_oob) {
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
+
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
 #endif
diff --git a/test/test-process-title-threadsafe.c b/test/test-process-title-threadsafe.c
index c0dee48a..19098eda 100644
--- a/test/test-process-title-threadsafe.c
+++ b/test/test-process-title-threadsafe.c
@@ -70,7 +70,7 @@ TEST_IMPL(process_title_threadsafe) {
 #if defined(__sun) || defined(__CYGWIN__) || defined(__MSYS__) || \
     defined(__MVS__)
   RETURN_SKIP("uv_(get|set)_process_title is not implemented.");
-#else
+#endif
 
   ASSERT(0 == uv_set_process_title(titles[0]));
   ASSERT(0 == uv_thread_create(&getter_thread, getter_thread_body, NULL));
@@ -82,5 +82,4 @@ TEST_IMPL(process_title_threadsafe) {
     ASSERT(0 == uv_thread_join(&setter_threads[i]));
 
   return 0;
-#endif
 }
diff --git a/test/test-process-title.c b/test/test-process-title.c
index 886f83a7..efd48142 100644
--- a/test/test-process-title.c
+++ b/test/test-process-title.c
@@ -62,7 +62,8 @@ static void uv_get_process_title_edge_cases(void) {
 TEST_IMPL(process_title) {
 #if defined(__sun) || defined(__CYGWIN__) || defined(__MSYS__)
   RETURN_SKIP("uv_(get|set)_process_title is not implemented.");
-#else
+#endif
+
   /* Check for format string vulnerabilities. */
   set_title("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s");
   set_title("new title");
@@ -71,5 +72,4 @@ TEST_IMPL(process_title) {
   uv_get_process_title_edge_cases();
 
   return 0;
-#endif
 }
diff --git a/test/test-signal-multiple-loops.c b/test/test-signal-multiple-loops.c
index 79242fc9..4281d23d 100644
--- a/test/test-signal-multiple-loops.c
+++ b/test/test-signal-multiple-loops.c
@@ -295,4 +295,8 @@ TEST_IMPL(signal_multiple_loops) {
   return 0;
 }
 
-#endif  /* !_WIN32 */
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-spawn.c b/test/test-spawn.c
index 594a64c6..05c76f61 100644
--- a/test/test-spawn.c
+++ b/test/test-spawn.c
@@ -49,7 +49,9 @@ static char exepath[1024];
 static size_t exepath_size = 1024;
 static char* args[5];
 static int no_term_signal;
+#ifndef _WIN32
 static int timer_counter;
+#endif
 static uv_tcp_t tcp_server;
 
 #define OUTPUT_SIZE 1024
@@ -138,10 +140,12 @@ static void on_read(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) {
 }
 
 
+#ifndef _WIN32
 static void on_read_once(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) {
   uv_read_stop(tcp);
   on_read(tcp, nread, buf);
 }
+#endif
 
 
 static void write_cb(uv_write_t* req, int status) {
@@ -173,9 +177,11 @@ static void timer_cb(uv_timer_t* handle) {
 }
 
 
+#ifndef _WIN32
 static void timer_counter_cb(uv_timer_t* handle) {
   ++timer_counter;
 }
+#endif
 
 
 TEST_IMPL(spawn_fails) {
@@ -1198,7 +1204,7 @@ TEST_IMPL(argument_escaping) {
 int make_program_env(char** env_block, WCHAR** dst_ptr);
 
 TEST_IMPL(environment_creation) {
-  int i;
+  size_t i;
   char* environment[] = {
     "FOO=BAR",
     "SYSTEM=ROOT", /* substring of a supplied var name */
diff --git a/test/test-tcp-close-accept.c b/test/test-tcp-close-accept.c
index e4878398..624262bc 100644
--- a/test/test-tcp-close-accept.c
+++ b/test/test-tcp-close-accept.c
@@ -191,4 +191,8 @@ TEST_IMPL(tcp_close_accept) {
   return 0;
 }
 
-#endif  /* !_WIN32 */
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-tcp-oob.c b/test/test-tcp-oob.c
index ca2361f9..53f8231e 100644
--- a/test/test-tcp-oob.c
+++ b/test/test-tcp-oob.c
@@ -138,4 +138,9 @@ TEST_IMPL(tcp_oob) {
   MAKE_VALGRIND_HAPPY();
   return 0;
 }
-#endif
+
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-tcp-write-after-connect.c b/test/test-tcp-write-after-connect.c
index aa03228f..8198e7e1 100644
--- a/test/test-tcp-write-after-connect.c
+++ b/test/test-tcp-write-after-connect.c
@@ -65,4 +65,8 @@ TEST_IMPL(tcp_write_after_connect) {
   return 0;
 }
 
-#endif
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */
diff --git a/test/test-tty.c b/test/test-tty.c
index 979a6ec3..688711e5 100644
--- a/test/test-tty.c
+++ b/test/test-tty.c
@@ -315,10 +315,8 @@ TEST_IMPL(tty_raw_cancel) {
   int r;
   int ttyin_fd;
   uv_tty_t tty_in;
-  uv_loop_t* loop;
   HANDLE handle;
 
-  loop = uv_default_loop();
   /* Make sure we have an FD that refers to a tty */
   handle = CreateFileA("conin$",
                        GENERIC_READ | GENERIC_WRITE,