From bb5b1c8078c1a34072f001f9a2b9990af2050cb3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 8 Jan 2019 11:37:32 +0100
Subject: [PATCH] s4:torture: Use C99 initializers in gentest

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---
 source4/torture/gentest.c | 176 +++++++++++++++++++++++++++++++-------
 1 file changed, 146 insertions(+), 30 deletions(-)

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 33de6cc04238..868e13bdc0fe 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2880,36 +2880,152 @@ static struct {
 	bool smb2;
 	int count, success_count;
 } gen_ops[] = {
-	{"CREATE",     handler_smb2_create,     true},
-	{"CLOSE",      handler_smb2_close,      true},
-	{"READ",       handler_smb2_read,       true},
-	{"WRITE",      handler_smb2_write,      true},
-	{"LOCK",       handler_smb2_lock,       true},
-	{"FLUSH",      handler_smb2_flush,      true},
-	{"ECHO",       handler_smb2_echo,       true},
-	{"QFILEINFO",  handler_smb2_qfileinfo,  true},
-	{"SFILEINFO",  handler_smb2_sfileinfo,  true},
-
-	{"OPEN",       handler_smb_open,        false},
-	{"OPENX",      handler_smb_openx,       false},
-	{"NTCREATEX",  handler_smb_ntcreatex,   false},
-	{"CLOSE",      handler_smb_close,       false},
-	{"UNLINK",     handler_smb_unlink,      false},
-	{"MKDIR",      handler_smb_mkdir,       false},
-	{"RMDIR",      handler_smb_rmdir,       false},
-	{"RENAME",     handler_smb_rename,      false},
-	{"NTRENAME",   handler_smb_ntrename,    false},
-	{"READX",      handler_smb_readx,       false},
-	{"WRITEX",     handler_smb_writex,      false},
-	{"CHKPATH",    handler_smb_chkpath,     false},
-	{"SEEK",       handler_smb_seek,        false},
-	{"LOCKINGX",   handler_smb_lockingx,    false},
-	{"QPATHINFO",  handler_smb_qpathinfo,   false},
-	{"QFILEINFO",  handler_smb_qfileinfo,   false},
-	{"SPATHINFO",  handler_smb_spathinfo,   false},
-	{"SFILEINFO",  handler_smb_sfileinfo,   false},
-	{"NOTIFY",     handler_smb_notify,      false},
-	{"SEEK",       handler_smb_seek,        false},
+	{
+		.name    = "CREATE",
+		.handler = handler_smb2_create,
+		.smb2    = true,
+	},
+	{
+		.name    = "CLOSE",
+		.handler = handler_smb2_close,
+		.smb2    = true,
+	},
+	{
+		.name    = "READ",
+		.handler = handler_smb2_read,
+		.smb2    = true,
+	},
+	{
+		.name    = "WRITE",
+		.handler = handler_smb2_write,
+		.smb2    = true,
+	},
+	{
+		.name    = "LOCK",
+		.handler = handler_smb2_lock,
+		.smb2    = true,
+	},
+	{
+		.name    = "FLUSH",
+		.handler = handler_smb2_flush,
+		.smb2    = true,
+	},
+	{
+		.name    = "ECHO",
+		.handler = handler_smb2_echo,
+		.smb2    = true,
+	},
+	{
+		.name    = "QFILEINFO",
+		.handler = handler_smb2_qfileinfo,
+		.smb2    = true,
+	},
+	{
+		.name    = "SFILEINFO",
+		.handler = handler_smb2_sfileinfo,
+		.smb2    = true,
+	},
+
+	{
+		.name    = "OPEN",
+		.handler = handler_smb_open,
+		.smb2    = false,
+	},
+	{
+		.name    = "OPENX",
+		.handler = handler_smb_openx,
+		.smb2    = false,
+	},
+	{
+		.name    = "NTCREATEX",
+		.handler = handler_smb_ntcreatex,
+		.smb2    = false,
+	},
+	{
+		.name    = "CLOSE",
+		.handler = handler_smb_close,
+		.smb2    = false,
+	},
+	{
+		.name    = "UNLINK",
+		.handler = handler_smb_unlink,
+		.smb2    = false,
+	},
+	{
+		.name    = "MKDIR",
+		.handler = handler_smb_mkdir,
+		.smb2    = false,
+	},
+	{
+		.name    = "RMDIR",
+		.handler = handler_smb_rmdir,
+		.smb2    = false,
+	},
+	{
+		.name    = "RENAME",
+		.handler = handler_smb_rename,
+		.smb2    = false,
+	},
+	{
+		.name    = "NTRENAME",
+		.handler = handler_smb_ntrename,
+		.smb2    = false,
+	},
+	{
+		.name    = "READX",
+		.handler = handler_smb_readx,
+		.smb2    = false,
+	},
+	{
+		.name    = "WRITEX",
+		.handler = handler_smb_writex,
+		.smb2    = false,
+	},
+	{
+		.name    = "CHKPATH",
+		.handler = handler_smb_chkpath,
+		.smb2    = false,
+	},
+	{
+		.name    = "SEEK",
+		.handler = handler_smb_seek,
+		.smb2    = false,
+	},
+	{
+		.name    = "LOCKINGX",
+		.handler = handler_smb_lockingx,
+		.smb2    = false,
+	},
+	{
+		.name    = "QPATHINFO",
+		.handler = handler_smb_qpathinfo,
+		.smb2    = false,
+	},
+	{
+		.name    = "QFILEINFO",
+		.handler = handler_smb_qfileinfo,
+		.smb2    = false,
+	},
+	{
+		.name    = "SPATHINFO",
+		.handler = handler_smb_spathinfo,
+		.smb2    = false,
+	},
+	{
+		.name    = "SFILEINFO",
+		.handler = handler_smb_sfileinfo,
+		.smb2    = false,
+	},
+	{
+		.name    = "NOTIFY",
+		.handler = handler_smb_notify,
+		.smb2    = false,
+	},
+	{
+		.name    = "SEEK",
+		.handler = handler_smb_seek,
+		.smb2    = false,
+	},
 };
 
 
-- 
2.34.1