Merge branch 'wip-rbd-engine-tweaks' of https://github.com/dillaman/fio

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index ca6fb344b89786123e824dfa60eb913b4db33d6f..c6cec5845aac48a3a8643b88c89b5f27fcdb8995 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -938,8 +938,9 @@ static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
 
        if (ntohl(msg.magic) != FIO_LINK_OPEN_CLOSE_MAGIC ||
            ntohl(msg.cmd) != FIO_LINK_OPEN) {
-               log_err("fio: bad udp open magic %x/%x\n", ntohl(msg.magic),
-                                                               ntohl(msg.cmd));
+               log_err("fio: bad udp open magic %x/%x\n",
+                       (unsigned int) ntohl(msg.magic),
+                       (unsigned int) ntohl(msg.cmd));
                return -1;
        }
 
@@ -1105,8 +1106,7 @@ static int fio_netio_setup_connect_unix(struct thread_data *td,
        struct sockaddr_un *soun = &nd->addr_un;
 
        soun->sun_family = AF_UNIX;
-       memset(soun->sun_path, 0, sizeof(soun->sun_path));
-       strncpy(soun->sun_path, path, sizeof(soun->sun_path) - 1);
+       snprintf(soun->sun_path, sizeof(soun->sun_path), "%s", path);
        return 0;
 }
 
@@ -1135,9 +1135,8 @@ static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
 
        mode = umask(000);
 
-       memset(addr, 0, sizeof(*addr));
        addr->sun_family = AF_UNIX;
-       strncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1);
+       snprintf(addr->sun_path, sizeof(addr->sun_path), "%s", path);
        unlink(path);
 
        len = sizeof(addr->sun_family) + strlen(path) + 1;