Fio 2.0.15

[fio.git] / server.c

diff --git a/server.c b/server.c
index 7ec8531964e15b45f5a13df9e104175482498f0f..d4676ddab40cf733007a5685700edda0b27ee67d 100644 (file)
--- a/server.c
+++ b/server.c
@@ -463,8 +463,9 @@ static int handle_command(struct fio_net_cmd *cmd)
 {
        int ret;
 
-       dprint(FD_NET, "server: got op [%s], pdu=%u, tag=%lx\n",
-                       fio_server_op(cmd->opcode), cmd->pdu_len, cmd->tag);
+       dprint(FD_NET, "server: got op [%s], pdu=%u, tag=%llx\n",
+                       fio_server_op(cmd->opcode), cmd->pdu_len,
+                       (unsigned long long) cmd->tag);
 
        switch (cmd->opcode) {
        case FIO_NET_CMD_QUIT:
@@ -811,6 +812,7 @@ int fio_server_log(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        return fio_server_text_output(buffer, len);
 }