server: debug fixes

[fio.git] / server.c

diff --git a/server.c b/server.c
index a70dc14f414aefad94812840b20b2c326e6b76cf..79c10410a316b05a21ccd83241e529bfa91e24f3 100644 (file)
--- a/server.c
+++ b/server.c
@@ -373,11 +373,7 @@ int fio_server_text_output(const char *buf, unsigned int len)
        int size = sizeof(*cmd) + len;
 
        cmd = malloc(size);
-       fio_init_net_cmd(cmd);
-       cmd->opcode     = cpu_to_le16(FIO_NET_CMD_TEXT);
-       cmd->pdu_len    = cpu_to_le32(len);
-       memcpy(&cmd->payload, buf, len);
-
+       fio_init_net_cmd(cmd, FIO_NET_CMD_TEXT, buf, len);
        fio_net_cmd_crc(cmd);
 
        fio_send_data(server_fd, cmd, size);
@@ -389,10 +385,11 @@ int fio_server_log(const char *format, ...)
 {
        char buffer[1024];
        va_list args;
+       size_t len;
 
        va_start(args, format);
-       snprintf(buffer, sizeof(buffer), format, args);
+       len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
 
-       return fio_server_text_output(buffer, strlen(buffer));
+       return fio_server_text_output(buffer, len);
 }