server: debug fixes

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/server.c b/server.c
index 8bbac70f2225fedd7399db511ea9b4b7a4f3f5d8..79c10410a316b05a21ccd83241e529bfa91e24f3 100644 (file)
--- a/server.c
+++ b/server.c
@@ -385,10 +385,11 @@ int fio_server_log(const char *format, ...)
 {
        char buffer[1024];
        va_list args;
 {
        char buffer[1024];
        va_list args;

+       size_t len;

 
        va_start(args, format);
 
        va_start(args, format);

-       snprintf(buffer, sizeof(buffer), format, args);
+       len = vsnprintf(buffer, sizeof(buffer), format, args);

        va_end(args);
 
        va_end(args);
 

-       return fio_server_text_output(buffer, strlen(buffer));
+       return fio_server_text_output(buffer, len);

 }
 }

diff --git a/server.h b/server.h
index 79449a635315b26c9c5aecde52751ff9dde2426f..d66782d532a6124c8364afec6e66ad29da584f44 100644 (file)
--- a/server.h
+++ b/server.h
@@ -74,7 +74,7 @@ static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
        memset(cmd, 0, sizeof(*cmd));
 
        cmd->version    = cpu_to_le16(FIO_SERVER_VER1);
        memset(cmd, 0, sizeof(*cmd));
 
        cmd->version    = cpu_to_le16(FIO_SERVER_VER1);

-       cmd->opcode     = cpu_to_le16(FIO_NET_CMD_TEXT);
+       cmd->opcode     = cpu_to_le16(opcode);

 
        if (pdu) {
                cmd->pdu_len    = cpu_to_le32(pdu_len);
 
        if (pdu) {
                cmd->pdu_len    = cpu_to_le32(pdu_len);