musl regtest : fix warnings and badly initialized struct msghdr

This commit is contained in:
Paul Floyd 2023-02-21 23:05:22 +01:00
parent a6101db692
commit 7136cd9876
4 changed files with 15 additions and 9 deletions

View File

@ -1,6 +1,6 @@
#include <assert.h>
#include <stdlib.h>
#include <sys/poll.h>
#include <poll.h>
// At one point, poll()'s checking was not done accurately. This test
// exposes this -- previously Memcheck only found one error, now if finds

View File

@ -20,9 +20,7 @@
#if defined(HAVE_SYS_EVENTFD_H)
#include <sys/eventfd.h>
#endif
#if defined(HAVE_SYS_POLL_H)
#include <sys/poll.h>
#endif
#include <poll.h>
#if defined(HAVE_SYS_SIGNALFD_H)
#include <sys/signalfd.h>
#endif

View File

@ -35,9 +35,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
#if defined(HAVE_SYS_SIGNAL_H)
#include <sys/signal.h>
#endif
#include <signal.h>
#if defined(HAVE_SYS_SYSCALL_H)
#include <sys/syscall.h>
#endif

View File

@ -91,8 +91,18 @@ void client (void)
struct cmsghdr cm;
char control[CMSG_SPACE(sizeof(int) * 2)];
} control_un;
struct msghdr msg = { NULL, 0, iov, 1, control_un.control,
sizeof(control_un), 0 };
struct msghdr msg;
/* this was using brace initialization
* but that doesn't work on MSL because of padding fields
* C99 designated initializers would be nicer
* but I'll just do it the simple way */
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_control = control_un.control;
msg.msg_controllen = sizeof(control_un);
msg.msg_flags = 0;
struct cmsghdr *cmsg = &control_un.cm;
char buf[1024];