]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: remove redundant assignments
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Apr 2020 21:38:47 +0000 (23:38 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 7 May 2020 12:39:44 +0000 (14:39 +0200)
We already initialize the fields a few lines up to the very same values,
hence remove this.

src/basic/socket-util.c
src/portable/portable.c

index b502a62a248117bdd8048137e56ce35d847c247d..a23dd6cbed5e4599f09a946fba84685b5490ec98 100644 (file)
@@ -850,8 +850,6 @@ ssize_t send_one_fd_iov_sa(
                 cmsg->cmsg_type = SCM_RIGHTS;
                 cmsg->cmsg_len = CMSG_LEN(sizeof(int));
                 memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
-
-                mh.msg_controllen = CMSG_SPACE(sizeof(int));
         }
         k = sendmsg(transport_fd, &mh, MSG_NOSIGNAL | flags);
         if (k < 0)
index 49087179c87d69e0f52e317382306533113603e3..4a881460dbbca4f06c954c087f22c642a44635c8 100644 (file)
@@ -155,7 +155,6 @@ static int send_item(
         cmsg->cmsg_len = CMSG_LEN(sizeof(int));
         memcpy(CMSG_DATA(cmsg), &data_fd, sizeof(int));
 
-        mh.msg_controllen = CMSG_SPACE(sizeof(int));
         iovec = IOVEC_MAKE_STRING(name);
 
         if (sendmsg(socket_fd, &mh, MSG_NOSIGNAL) < 0)