[Xenomai-git] Philippe Gerum : lib/cobalt: use designated initializers for socket types
Module: xenomai-3 Branch: next Commit: eeca7bcf489379393343faf66e91b20b96fa4767 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=eeca7bcf489379393343faf66e91b20b96fa4767 Author: Philippe GerumDate: Sat Apr 15 15:15:17 2017 +0200 lib/cobalt: use designated initializers for socket types --- lib/cobalt/rtdm.c | 58 - 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/lib/cobalt/rtdm.c b/lib/cobalt/rtdm.c index aced887..7bdbffd 100644 --- a/lib/cobalt/rtdm.c +++ b/lib/cobalt/rtdm.c @@ -254,9 +254,18 @@ COBALT_IMPL(ssize_t, sendmsg, (int fd, const struct msghdr *msg, int flags)) COBALT_IMPL(ssize_t, recvfrom, (int fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)) { - struct iovec iov = { buf, len }; - struct msghdr msg = - { from, (from != NULL) ? *fromlen : 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = from, + .msg_namelen = from != NULL ? *fromlen : 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_recvmsg(fd, , flags); @@ -269,9 +278,18 @@ COBALT_IMPL(ssize_t, recvfrom, (int fd, void *buf, size_t len, int flags, COBALT_IMPL(ssize_t, sendto, (int fd, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen)) { - struct iovec iov = { (void *)buf, len }; - struct msghdr msg = - { (struct sockaddr *)to, tolen, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = (struct sockaddr *)to, + .msg_namelen = tolen, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_sendmsg(fd, , flags); @@ -283,8 +301,18 @@ COBALT_IMPL(ssize_t, sendto, (int fd, const void *buf, size_t len, int flags, COBALT_IMPL(ssize_t, recv, (int fd, void *buf, size_t len, int flags)) { - struct iovec iov = { buf, len }; - struct msghdr msg = { NULL, 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_recvmsg(fd, , flags); @@ -296,8 +324,18 @@ COBALT_IMPL(ssize_t, recv, (int fd, void *buf, size_t len, int flags)) COBALT_IMPL(ssize_t, send, (int fd, const void *buf, size_t len, int flags)) { - struct iovec iov = { (void *)buf, len }; - struct msghdr msg = { NULL, 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_sendmsg(fd, , flags); ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : lib/cobalt: use designated initializers for socket types
Module: xenomai-3 Branch: stable-3.0.x Commit: eeca7bcf489379393343faf66e91b20b96fa4767 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=eeca7bcf489379393343faf66e91b20b96fa4767 Author: Philippe GerumDate: Sat Apr 15 15:15:17 2017 +0200 lib/cobalt: use designated initializers for socket types --- lib/cobalt/rtdm.c | 58 - 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/lib/cobalt/rtdm.c b/lib/cobalt/rtdm.c index aced887..7bdbffd 100644 --- a/lib/cobalt/rtdm.c +++ b/lib/cobalt/rtdm.c @@ -254,9 +254,18 @@ COBALT_IMPL(ssize_t, sendmsg, (int fd, const struct msghdr *msg, int flags)) COBALT_IMPL(ssize_t, recvfrom, (int fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)) { - struct iovec iov = { buf, len }; - struct msghdr msg = - { from, (from != NULL) ? *fromlen : 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = from, + .msg_namelen = from != NULL ? *fromlen : 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_recvmsg(fd, , flags); @@ -269,9 +278,18 @@ COBALT_IMPL(ssize_t, recvfrom, (int fd, void *buf, size_t len, int flags, COBALT_IMPL(ssize_t, sendto, (int fd, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen)) { - struct iovec iov = { (void *)buf, len }; - struct msghdr msg = - { (struct sockaddr *)to, tolen, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = (struct sockaddr *)to, + .msg_namelen = tolen, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_sendmsg(fd, , flags); @@ -283,8 +301,18 @@ COBALT_IMPL(ssize_t, sendto, (int fd, const void *buf, size_t len, int flags, COBALT_IMPL(ssize_t, recv, (int fd, void *buf, size_t len, int flags)) { - struct iovec iov = { buf, len }; - struct msghdr msg = { NULL, 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_recvmsg(fd, , flags); @@ -296,8 +324,18 @@ COBALT_IMPL(ssize_t, recv, (int fd, void *buf, size_t len, int flags)) COBALT_IMPL(ssize_t, send, (int fd, const void *buf, size_t len, int flags)) { - struct iovec iov = { (void *)buf, len }; - struct msghdr msg = { NULL, 0, , 1, NULL, 0 }; + struct iovec iov = { + .iov_base = (void *)buf, + .iov_len = len, + }; + struct msghdr msg = { + .msg_name = NULL, + .msg_namelen = 0, + .msg_iov = , + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + }; int ret; ret = do_sendmsg(fd, , flags); ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git