projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-libpmem' of https://github.com/lukaszstolarczuk/fio
[fio.git]
/
engines
/
net.c
diff --git
a/engines/net.c
b/engines/net.c
index 8c25c4e5b12f254fbcd6d2eba1125f5d991f835a..c6cec5845aac48a3a8643b88c89b5f27fcdb8995 100644
(file)
--- a/
engines/net.c
+++ b/
engines/net.c
@@
-642,8
+642,9
@@
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
return ret;
}
return ret;
}
-static enum fio_q_status
-__fio_netio_queue(struct thread_data *td, struct io_u *io_u, enum fio_ddir ddir)
+static enum fio_q_status __fio_netio_queue(struct thread_data *td,
+ struct io_u *io_u,
+ enum fio_ddir ddir)
{
struct netio_data *nd = td->io_ops_data;
struct netio_options *o = td->eo;
{
struct netio_data *nd = td->io_ops_data;
struct netio_options *o = td->eo;
@@
-687,8
+688,8
@@
__fio_netio_queue(struct thread_data *td, struct io_u *io_u, enum fio_ddir ddir)
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}
-static enum fio_q_status
-
fio_netio_queue(struct thread_data *td,
struct io_u *io_u)
+static enum fio_q_status
fio_netio_queue(struct thread_data *td,
+
struct io_u *io_u)
{
struct netio_options *o = td->eo;
int ret;
{
struct netio_options *o = td->eo;
int ret;
@@
-937,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) {
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;
}
return -1;
}
@@
-1104,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;
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;
}
return 0;
}
@@
-1134,9
+1135,8
@@
static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
mode = umask(000);
mode = umask(000);
- memset(addr, 0, sizeof(*addr));
addr->sun_family = AF_UNIX;
addr->sun_family = AF_UNIX;
- s
trncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1
);
+ s
nprintf(addr->sun_path, sizeof(addr->sun_path), "%s", path
);
unlink(path);
len = sizeof(addr->sun_family) + strlen(path) + 1;
unlink(path);
len = sizeof(addr->sun_family) + strlen(path) + 1;