diff options
| author | Slavomir Kaslev <kaslevs@vmware.com> | 2019-03-15 17:33:26 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-22 15:14:11 -0400 |
| commit | 22d39986959c3f97de08e17b84cac58362296072 (patch) | |
| tree | f2317e5ef36aa60728d5d965bdef3a4e9890f8af | |
| parent | 67b3b228a14620ca54b1549b63134ab1584ce471 (diff) | |
| download | trace-cmd-22d39986959c3f97de08e17b84cac58362296072.tar.gz | |
trace-cmd: Add msg_buf_len() function
Factor out common code computing message buffer length in a function.
No changes in behavior intended.
Link: http://lore.kernel.org/linux-trace-devel/20190315153326.5602-4-kaslevs@vmware.com
Signed-off-by: Slavomir Kaslev <kaslevs@vmware.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | tracecmd/trace-msg.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tracecmd/trace-msg.c b/tracecmd/trace-msg.c index 1149f15a..3cca1428 100644 --- a/tracecmd/trace-msg.c +++ b/tracecmd/trace-msg.c @@ -107,6 +107,11 @@ struct tracecmd_msg { void *buf; } __attribute__((packed)); +static int msg_buf_len(struct tracecmd_msg *msg) +{ + return ntohl(msg->hdr.size) - MSG_HDR_LEN - ntohl(msg->hdr.cmd_size); +} + static int msg_write(int fd, struct tracecmd_msg *msg) { int cmd = ntohl(msg->hdr.cmd); @@ -425,7 +430,7 @@ int tracecmd_msg_send_init_data(struct tracecmd_msg_handle *msg_handle, goto error; } - buf_len = ntohl(msg.hdr.size) - MSG_HDR_LEN - ntohl(msg.hdr.cmd_size); + buf_len = msg_buf_len(&msg); if (buf_len <= 0) { ret = -EINVAL; goto error; @@ -541,7 +546,7 @@ int tracecmd_msg_initial_setting(struct tracecmd_msg_handle *msg_handle) goto error; } - buf_len = ntohl(msg.hdr.size) - MSG_HDR_LEN - ntohl(msg.hdr.cmd_size); + buf_len = msg_buf_len(&msg); if (buf_len < 0) { ret = -EINVAL; goto error; @@ -689,7 +694,7 @@ int tracecmd_msg_read_data(struct tracecmd_msg_handle *msg_handle, int ofd) goto next; } - n = ntohl(msg.hdr.size) - MSG_HDR_LEN - ntohl(msg.hdr.cmd_size); + n = msg_buf_len(&msg); t = n; s = 0; while (t > 0) { |