Add braces in initializers for GCC 4.9 or older

Add braces to silence GCC 4.9 or older:

getaddrinfo.c: In function ‘gaih_inet’:
getaddrinfo.c:1135:24: error: missing braces around initializer [-Werror=missing-braces]
       / sizeof (struct gaih_typeproto)] = {0};
                        ^

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Sam James <sam@gentoo.org>
This commit is contained in:
H.J. Lu 2024-12-13 05:38:57 +08:00
parent 1d40170dd3
commit 8aa2a9e033
9 changed files with 21 additions and 18 deletions

View File

@ -97,7 +97,7 @@ do_test_with_invalid_iov (void)
{
/* An invalid iovec buffer should trigger an invalid memory access
or an error (Linux for instance returns EFAULT). */
struct iovec iov[IOV_MAX+1] = { 0 };
struct iovec iov[IOV_MAX+1] = { { 0 } };
TEST_VERIFY (preadv2 (temp_fd, iov, IOV_MAX + 1, 0, RWF_HIPRI) == -1);
TEST_VERIFY (errno == EINVAL || errno == ENOTSUP);

View File

@ -1132,7 +1132,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
unsigned int *naddrs, struct scratch_buffer *tmpbuf)
{
struct gaih_servtuple st[sizeof (gaih_inet_typeproto)
/ sizeof (struct gaih_typeproto)] = {0};
/ sizeof (struct gaih_typeproto)] = {{0}};
const char *orig_name = name;

View File

@ -114,7 +114,7 @@ do_test_signals (void)
{
/* Same as before, but set SIGUSR1 and SIGUSR2 to a handler different than
SIG_IGN or SIG_DFL. */
struct sigaction sa = { 0 };
struct sigaction sa = { { 0 } };
sa.sa_handler = dummy_sa_handler;
xsigaction (SIGUSR1, &sa, NULL);
xsigaction (SIGUSR2, &sa, NULL);
@ -123,7 +123,7 @@ do_test_signals (void)
{
/* Check if SIG_IGN is keep as is. */
struct sigaction sa = { 0 };
struct sigaction sa = { { 0 } };
sa.sa_handler = SIG_IGN;
xsigaction (SIGUSR1, &sa, NULL);
xsigaction (SIGUSR2, &sa, NULL);

View File

@ -57,7 +57,7 @@ thread_handler (union sigval sv)
static int
do_test (void)
{
struct sigevent sev = { 0 };
struct sigevent sev = { { 0 } };
sev.sigev_notify = SIGEV_THREAD;
sev.sigev_notify_function = &thread_handler;
@ -66,7 +66,7 @@ do_test (void)
xpthread_barrier_init (&barrier, NULL, 2);
struct itimerspec trigger = { 0 };
struct itimerspec trigger = { { 0 } };
trigger.it_value.tv_nsec = 1000000;
TEST_COMPARE (timer_settime (timerid, 0, &trigger, NULL), 0);

View File

@ -80,7 +80,7 @@ sleep_and_check_sigchld (void *closure)
sprintf (cmd, "sleep %lf" , *seconds);
TEST_COMPARE (system (cmd), 0);
sigset_t blocked = {0};
sigset_t blocked = {{0}};
TEST_COMPARE (sigprocmask (SIG_BLOCK, NULL, &blocked), 0);
TEST_COMPARE (sigismember (&blocked, SIGCHLD), 0);
return NULL;

View File

@ -52,7 +52,7 @@ thread_handler (union sigval sv)
static int
do_test (void)
{
struct sigevent sev = { 0 };
struct sigevent sev = { { 0 } };
sev.sigev_notify = SIGEV_THREAD;
sev.sigev_notify_function = &thread_handler;
@ -61,7 +61,7 @@ do_test (void)
xpthread_barrier_init (&barrier, NULL, 2);
struct itimerspec trigger = { 0 };
struct itimerspec trigger = { { 0 } };
trigger.it_value.tv_nsec = 1000000;
TEST_COMPARE (timer_settime (timerid, 0, &trigger, NULL), 0);

View File

@ -59,7 +59,7 @@ send_fd (const int sock, const int fd)
{
struct cmsghdr hdr;
char buf[CMSG_SPACE (sizeof (int))];
} cmsgbuf = {0};
} cmsgbuf = {{0}};
struct cmsghdr *cmsg;
struct iovec vec;
char ch = 'A';
@ -92,7 +92,7 @@ recv_fd (const int sock)
{
struct cmsghdr hdr;
char buf[CMSG_SPACE(sizeof(int))];
} cmsgbuf = {0};
} cmsgbuf = {{0}};
struct cmsghdr *cmsg;
struct iovec vec;
ssize_t n;

View File

@ -76,7 +76,7 @@ do_recvmsg_ancillary (bool use_multi_call, struct mmsghdr *mmhdr,
static void
do_test_large_buffer (bool mc)
{
struct mmsghdr mmhdr = { 0 };
struct mmsghdr mmhdr = { { 0 } };
/* It should be large enough for either timeval/timespec and the
64 time type as well. */
@ -147,7 +147,7 @@ do_test_large_buffer (bool mc)
static void
do_test_small_buffer (bool mc)
{
struct mmsghdr mmhdr = { 0 };
struct mmsghdr mmhdr = { { 0 } };
/* Enable 32 bit timeval precision and check if no 64 bit timeval stamp
is created. */

View File

@ -62,7 +62,8 @@ do_test (void)
it.it_interval.tv_usec = 20;
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 }, &it_old),
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { { 0 } },
&it_old),
0);
/* ITIMER_REAL returns { 0, 0 } for single-shot timers, while
other timers returns setitimer value. */
@ -87,7 +88,8 @@ do_test (void)
it.it_value.tv_usec = 40;
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 }, &it_old),
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { { 0 } },
&it_old),
0);
TEST_COMPARE (it.it_interval.tv_sec, it_old.it_interval.tv_sec);
if (timers[i] == ITIMER_REAL)
@ -107,7 +109,7 @@ do_test (void)
if (support_itimer_support_time64())
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 },
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { { 0 } },
&it_old),
0);
/* ITIMER_REAL returns { 0, 0 } for single-sort timers, while other
@ -134,7 +136,7 @@ do_test (void)
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 },
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { { 0 } },
&it_old),
0);
if (timers[i] == ITIMER_REAL)
@ -169,7 +171,8 @@ do_test (void)
TEST_COMPARE (setitimer (ITIMER_REAL, &it, NULL), 0);
intr_sleep (1);
TEST_COMPARE (cnt, 3);
TEST_COMPARE (setitimer (ITIMER_REAL, &(struct itimerval) { 0 }, NULL), 0);
TEST_COMPARE (setitimer (ITIMER_REAL, &(struct itimerval) { { 0 } },
NULL), 0);
return 0;
}