Fix address truncation on Windows
[fio.git] / server.c
index 5e94696eb6aa6ee79d34668723b3981f1384d4dd..33f69ef611a7ae2dd7eda4bd7e0e15c3284487a6 100644 (file)
--- a/server.c
+++ b/server.c
@@ -453,7 +453,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
                je->iops[i]     = cpu_to_le32(je->iops[i]);
        }
 
-       je->elapsed_sec         = cpu_to_le32(je->nr_running);
+       je->elapsed_sec         = cpu_to_le64(je->elapsed_sec);
        je->eta_sec             = cpu_to_le64(je->eta_sec);
 
        fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
@@ -1188,8 +1188,8 @@ int fio_start_server(char *pidfile)
        int ret;
 
 #if defined(WIN32)
-    WSADATA wsd;
-    WSAStartup(MAKEWORD(2,2), &wsd);
+       WSADATA wsd;
+       WSAStartup(MAKEWORD(2,2), &wsd);
 #endif
 
        if (!pidfile)