mirror of
https://github.com/oasislinux/oasis.git
synced 2026-05-17 17:33:30 +02:00
Michael Forney
230 lines
7.3 KiB
Diff
230 lines
7.3 KiB
Diff
From 1ea9b617255ce7ae228fa6fec171a0d960ab7e96 Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Sat, 6 Jul 2019 01:54:05 -0700
|
|
Subject: [PATCH] Avoid empty initializer lists
|
|
|
|
---
|
|
src/bpf.c | 4 ++--
|
|
src/futex_waitv.c | 2 +-
|
|
src/sched.c | 2 +-
|
|
src/signal.c | 2 +-
|
|
src/strace.c | 2 +-
|
|
tests/btrfs.c | 8 ++++----
|
|
tests/clock_nanosleep.c | 2 +-
|
|
tests/nanosleep.c | 2 +-
|
|
tests/restart_syscall.c | 2 +-
|
|
tests/setrlimit.c | 2 +-
|
|
tests/timer_create.c | 2 +-
|
|
tests/wait4.c | 2 +-
|
|
tests/waitid.c | 2 +-
|
|
13 files changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/src/bpf.c b/src/bpf.c
|
|
index 7bdeb4f65..3c6889eb0 100644
|
|
--- a/src/bpf.c
|
|
+++ b/src/bpf.c
|
|
@@ -48,7 +48,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \
|
|
#define BEGIN_BPF_CMD_DECODER(bpf_cmd) \
|
|
static DECL_BPF_CMD_DECODER(decode_ ## bpf_cmd) \
|
|
{ \
|
|
- struct bpf_cmd ## _struct attr = {}; \
|
|
+ struct bpf_cmd ## _struct attr = {0}; \
|
|
size_t attr_size = bpf_cmd ## _struct_size; \
|
|
const unsigned int len = MIN(size, attr_size); \
|
|
memcpy(&attr, data, len); \
|
|
@@ -159,7 +159,7 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
|
|
if (abbrev(tcp)) {
|
|
printaddr(addr);
|
|
} else {
|
|
- struct ebpf_insns_data eid = {};
|
|
+ struct ebpf_insns_data eid = {0};
|
|
struct ebpf_insn insn;
|
|
|
|
print_array(tcp, addr, len, &insn, sizeof(insn),
|
|
diff --git a/src/futex_waitv.c b/src/futex_waitv.c
|
|
index 512ee715d..340201aa3 100644
|
|
--- a/src/futex_waitv.c
|
|
+++ b/src/futex_waitv.c
|
|
@@ -49,7 +49,7 @@ print_waiter_array(struct tcb * const tcp, const kernel_ulong_t waiters,
|
|
const unsigned int nr_futexes)
|
|
{
|
|
struct futex_waitv buf;
|
|
- struct print_waiter_data data = {};
|
|
+ struct print_waiter_data data = {0};
|
|
|
|
print_array(tcp, waiters, nr_futexes, &buf, sizeof(buf),
|
|
tfetch_mem, print_waiter, &data);
|
|
diff --git a/src/sched.c b/src/sched.c
|
|
index acd4d32cf..d7de19ada 100644
|
|
--- a/src/sched.c
|
|
+++ b/src/sched.c
|
|
@@ -111,7 +111,7 @@ static void
|
|
print_sched_attr(struct tcb *const tcp, const kernel_ulong_t addr,
|
|
unsigned int usize)
|
|
{
|
|
- struct sched_attr attr = {};
|
|
+ struct sched_attr attr = {0};
|
|
unsigned int size;
|
|
bool is_set = false;
|
|
|
|
diff --git a/src/signal.c b/src/signal.c
|
|
index fc13a6613..f7b6e6e49 100644
|
|
--- a/src/signal.c
|
|
+++ b/src/signal.c
|
|
@@ -257,7 +257,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
|
|
printaddr(addr);
|
|
return;
|
|
}
|
|
- int mask[NSIG_BYTES / sizeof(int)] = {};
|
|
+ int mask[NSIG_BYTES / sizeof(int)] = {0};
|
|
if (umoven_or_printaddr(tcp, addr, len, mask))
|
|
return;
|
|
tprints(sprintsigmask_n("", mask, len));
|
|
diff --git a/src/strace.c b/src/strace.c
|
|
index 3f5a00a0a..cea52bb22 100644
|
|
--- a/src/strace.c
|
|
+++ b/src/strace.c
|
|
@@ -3621,7 +3621,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
|
|
syscall_entering_finish(tcp, res);
|
|
return res;
|
|
} else {
|
|
- struct timespec ts = {};
|
|
+ struct timespec ts = {0};
|
|
int res = syscall_exiting_decode(tcp, &ts);
|
|
if (res != 0) {
|
|
res = syscall_exiting_trace(tcp, &ts, res);
|
|
diff --git a/tests/btrfs.c b/tests/btrfs.c
|
|
index 12ae01545..a821d8057 100644
|
|
--- a/tests/btrfs.c
|
|
+++ b/tests/btrfs.c
|
|
@@ -313,7 +313,7 @@ btrfs_test_subvol_ioctls(void)
|
|
char *long_subvol_name;
|
|
void *bad_pointer = (void *) (unsigned long) 0xdeadbeeffffffeedULL;
|
|
uint64_t u64val = 0xdeadbeefbadc0dedULL;
|
|
- struct btrfs_ioctl_vol_args vol_args = {};
|
|
+ struct btrfs_ioctl_vol_args vol_args = {0};
|
|
struct btrfs_ioctl_vol_args_v2 vol_args_v2 = {
|
|
.fd = 2,
|
|
.flags = max_flags_plus_one(2),
|
|
@@ -554,7 +554,7 @@ btrfs_test_balance_ioctls(void)
|
|
.devid = 1,
|
|
},
|
|
};
|
|
- struct btrfs_ioctl_vol_args vol_args = {};
|
|
+ struct btrfs_ioctl_vol_args vol_args = {0};
|
|
|
|
ioctl(-1, BTRFS_IOC_BALANCE_CTL, 1);
|
|
printf("ioctl(-1, %s, %sBTRFS_BALANCE_CTL_PAUSE%s) = -1 EBADF (%m)\n",
|
|
@@ -764,7 +764,7 @@ btrfs_print_defrag_range_args(struct btrfs_ioctl_defrag_range_args *args,
|
|
static void
|
|
btrfs_test_defrag_ioctls(void)
|
|
{
|
|
- struct btrfs_ioctl_vol_args vol_args = {};
|
|
+ struct btrfs_ioctl_vol_args vol_args = {0};
|
|
struct btrfs_ioctl_defrag_range_args args = {
|
|
.start = 0,
|
|
.len = -1ULL,
|
|
@@ -1092,7 +1092,7 @@ btrfs_test_ino_lookup_ioctl(void)
|
|
static void
|
|
btrfs_test_space_info_ioctl(void)
|
|
{
|
|
- struct btrfs_ioctl_space_args args = {};
|
|
+ struct btrfs_ioctl_space_args args = {0};
|
|
|
|
ioctl(-1, BTRFS_IOC_SPACE_INFO, NULL);
|
|
printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n",
|
|
diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
|
|
index 51bd0d7f7..a1053fd1e 100644
|
|
--- a/tests/clock_nanosleep.c
|
|
+++ b/tests/clock_nanosleep.c
|
|
@@ -39,7 +39,7 @@ main(void)
|
|
.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
|
|
.pad = { 0xdeadbeef, 0xbadc0ded }
|
|
};
|
|
- const sigset_t set = {};
|
|
+ const sigset_t set = {0};
|
|
const struct sigaction act = { .sa_handler = handler };
|
|
const struct itimerval itv = {
|
|
.it_interval.tv_usec = 222222,
|
|
diff --git a/tests/nanosleep.c b/tests/nanosleep.c
|
|
index 8ff6a86b8..6377f38ee 100644
|
|
--- a/tests/nanosleep.c
|
|
+++ b/tests/nanosleep.c
|
|
@@ -53,7 +53,7 @@ main(void)
|
|
.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
|
|
.pad = { 0xdeadbeef, 0xbadc0ded }
|
|
};
|
|
- const sigset_t set = {};
|
|
+ const sigset_t set = {0};
|
|
const struct sigaction act = { .sa_handler = handler };
|
|
const struct itimerval itv = { .it_value.tv_usec = 111111 };
|
|
|
|
diff --git a/tests/restart_syscall.c b/tests/restart_syscall.c
|
|
index e4e83dc09..da83d1dc7 100644
|
|
--- a/tests/restart_syscall.c
|
|
+++ b/tests/restart_syscall.c
|
|
@@ -26,7 +26,7 @@ main(void)
|
|
*/
|
|
error_msg_and_skip("x32 is broken");
|
|
#else
|
|
- const sigset_t set = {};
|
|
+ const sigset_t set = {0};
|
|
const struct sigaction act = { .sa_handler = SIG_IGN };
|
|
const struct itimerval itv = { .it_value.tv_usec = 111111 };
|
|
const struct timespec req = { .tv_nsec = 222222222 };
|
|
diff --git a/tests/setrlimit.c b/tests/setrlimit.c
|
|
index d4953f6f8..60d54fbd8 100644
|
|
--- a/tests/setrlimit.c
|
|
+++ b/tests/setrlimit.c
|
|
@@ -39,7 +39,7 @@ main(void)
|
|
printf("setrlimit(%s, NULL) = %s\n", xlat->str, sprintrc(rc));
|
|
# endif
|
|
|
|
- struct rlimit libc_rlim = {};
|
|
+ struct rlimit libc_rlim = {0};
|
|
if (getrlimit((int) res, &libc_rlim))
|
|
continue;
|
|
rlimit[0] = libc_rlim.rlim_cur;
|
|
diff --git a/tests/timer_create.c b/tests/timer_create.c
|
|
index af91da0d3..a0a79f1ad 100644
|
|
--- a/tests/timer_create.c
|
|
+++ b/tests/timer_create.c
|
|
@@ -24,7 +24,7 @@ main(void)
|
|
printf("timer_create(CLOCK_REALTIME, NULL, NULL) = -1 %s (%m)\n",
|
|
errno2name());
|
|
|
|
- int tid[4] = {};
|
|
+ int tid[4] = {0};
|
|
struct_sigevent sev = {
|
|
.sigev_notify = 0xdefaced,
|
|
.sigev_signo = 0xfacefeed,
|
|
diff --git a/tests/wait4.c b/tests/wait4.c
|
|
index faf9423f8..eacee2366 100644
|
|
--- a/tests/wait4.c
|
|
+++ b/tests/wait4.c
|
|
@@ -89,7 +89,7 @@ k_wait4(const unsigned int pid, void const *wstatus,
|
|
static pid_t
|
|
do_wait4(pid_t pid, int *wstatus, int options, kernel_rusage_t *ru)
|
|
{
|
|
- sigset_t mask = {};
|
|
+ sigset_t mask = {0};
|
|
sigaddset(&mask, SIGCHLD);
|
|
|
|
assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
|
|
diff --git a/tests/waitid.c b/tests/waitid.c
|
|
index 1ed763840..fef941874 100644
|
|
--- a/tests/waitid.c
|
|
+++ b/tests/waitid.c
|
|
@@ -146,7 +146,7 @@ do_waitid(const unsigned int idtype,
|
|
const unsigned int options,
|
|
const kernel_rusage_t *const rusage)
|
|
{
|
|
- sigset_t mask = {};
|
|
+ sigset_t mask = {0};
|
|
sigaddset(&mask, SIGCHLD);
|
|
|
|
assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
|
|
--
|
|
2.37.3
|
|
|