From a5362457af45293cafc969f30ec3d4e1c1a0174d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 13 Dec 2018 13:13:11 +0100 Subject: s4:torture: Use C99 initializers for hold_sharemode_table in smb2 sharemode test Signed-off-by: Andreas Schneider Reviewed-by: Douglas Bagnall --- source4/torture/smb2/sharemode.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/source4/torture/smb2/sharemode.c b/source4/torture/smb2/sharemode.c index d1ad22e477d..8c7403c8302 100644 --- a/source4/torture/smb2/sharemode.c +++ b/source4/torture/smb2/sharemode.c @@ -34,14 +34,38 @@ struct hold_sharemode_info { const char *filename; struct smb2_handle handle; } hold_sharemode_table[] = { - { "", BASEDIRHOLD "\\N" }, - { "R", BASEDIRHOLD "\\R" }, - { "W", BASEDIRHOLD "\\W" }, - { "D", BASEDIRHOLD "\\D" }, - { "RW", BASEDIRHOLD "\\RW" }, - { "RD", BASEDIRHOLD "\\RD" }, - { "WD", BASEDIRHOLD "\\WD" }, - { "RWD", BASEDIRHOLD "\\RWD" }, + { + .sharemode = "", + .filename = BASEDIRHOLD "\\N", + }, + { + .sharemode = "R", + .filename = BASEDIRHOLD "\\R", + }, + { + .sharemode = "W", + .filename = BASEDIRHOLD "\\W", + }, + { + .sharemode = "D", + .filename = BASEDIRHOLD "\\D", + }, + { + .sharemode = "RW", + .filename = BASEDIRHOLD "\\RW", + }, + { + .sharemode = "RD", + .filename = BASEDIRHOLD "\\RD", + }, + { + .sharemode = "WD", + .filename = BASEDIRHOLD "\\WD", + }, + { + .sharemode = "RWD", + .filename = BASEDIRHOLD "\\RWD", + }, }; static void signal_handler(struct tevent_context *ev, -- cgit v1.2.1