diff options
| author | Ralph Boehme <slow@samba.org> | 2015-10-08 03:25:53 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2015-10-14 11:29:34 +0200 |
| commit | f3489d5cb77a804891bdaff3d90449fa7f293dd6 (patch) | |
| tree | 6ce5d1baf9689ff4b1e140485df650faab71db07 | |
| parent | c5e809fed9a9e2cfce40312150322f28d3d338a6 (diff) | |
| download | socket_wrapper-f3489d5cb77a804891bdaff3d90449fa7f293dd6.tar.gz socket_wrapper-f3489d5cb77a804891bdaff3d90449fa7f293dd6.tar.xz socket_wrapper-f3489d5cb77a804891bdaff3d90449fa7f293dd6.zip | |
swrap: Simplify cmspace calculation in swrap_sendmsg_copy_cmsg()
With cmsg->cmsg_len = CMSG_LEN(len) =>
CMSG_ALIGN(cmsg->cmsg_len) =
CMSG_ALIGN(CMSG_LEN(len)) =
CMSG_ALIGN(CMSG_ALIGN(sizeof(struct cmsghdr)) + len) =
CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len) =
CMSG_SPACE(len) =
CMSG_SPACE(CMSG_ALIGN(sizeof(struct cmsghdr)) + len - CMSG_ALIGN(sizeof(struct cmsghdr))) =
CMSG_SPACE(CMSG_LEN(len) - CMSG_ALIGN(sizeof(struct cmsghdr))) =
CMSG_SPACE(cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)))
:)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | src/socket_wrapper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index aad5f3e..353ad1d 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -3739,9 +3739,7 @@ static int swrap_sendmsg_copy_cmsg(struct cmsghdr *cmsg, size_t cmspace; uint8_t *p; - cmspace = - (*cm_data_space) + - CMSG_SPACE(cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr))); + cmspace = *cm_data_space + CMSG_ALIGN(cmsg->cmsg_len); p = realloc((*cm_data), cmspace); if (p == NULL) { |