From f915f220c00ac062e14ba1a862dd18ef5424ec3e Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 28 Jul 2016 17:07:23 +0000
Subject: [PATCH] tests: use terse notation in designated initializers where
appropriate
* tests/btrfs.c (btrfs_test_dev_replace_ioctl): Initialize
struct btrfs_ioctl_dev_replace_args using terse notation.
* tests/clock_nanosleep.c (main): Initialize struct timespec
using terse notation.
* tests/nanosleep.c (main): Likewise.
---
tests/btrfs.c | 4 +---
tests/clock_nanosleep.c | 2 +-
tests/nanosleep.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/btrfs.c b/tests/btrfs.c
index e5940cea..d6005347 100644
--- a/tests/btrfs.c
+++ b/tests/btrfs.c
@@ -1567,9 +1567,7 @@ btrfs_test_dev_replace_ioctl(void)
{
struct btrfs_ioctl_dev_replace_args args = {
.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_START,
- .start = {
- .srcdevid = 1,
- },
+ .start.srcdevid = 1
};
strcpy((char *)args.start.srcdev_name, "/dev/sda1");
strcpy((char *)args.start.tgtdev_name, "/dev/sdb1");
diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
index 1c4c4277..b1c423a9 100644
--- a/tests/clock_nanosleep.c
+++ b/tests/clock_nanosleep.c
@@ -47,7 +47,7 @@ main(void)
struct timespec ts;
uint32_t pad[2];
} req = {
- .ts = { .tv_nsec = 0xc0de1 },
+ .ts.tv_nsec = 0xc0de1,
.pad = { 0xdeadbeef, 0xbadc0ded }
}, rem = {
.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
diff --git a/tests/nanosleep.c b/tests/nanosleep.c
index 6b5999b1..db430e51 100644
--- a/tests/nanosleep.c
+++ b/tests/nanosleep.c
@@ -45,7 +45,7 @@ main(void)
struct timespec ts;
uint32_t pad[2];
} req = {
- .ts = { .tv_nsec = 0xc0de1 },
+ .ts.tv_nsec = 0xc0de1,
.pad = { 0xdeadbeef, 0xbadc0ded }
}, rem = {
.ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
--
2.40.0