From a3aca2f73412fd35ece4b6610959928a2b62fff5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 8 Jan 2019 17:07:34 +0100
Subject: [PATCH] s3:torture: Use C99 initializer for poptOption in vfstest

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---
 source3/torture/vfstest.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 508b55568e8..c9f602ff04e 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -474,10 +474,27 @@ int main(int argc, const char *argv[])
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-		{"file",	'f', POPT_ARG_STRING,	&filename, 0, },
-		{"command",	'c', POPT_ARG_STRING,	&cmdstr, 0, "Execute specified list of commands" },
-		{"memreport",	'm', POPT_ARG_INT,	&memreports, 0,
-		 "Report memory left on talloc stackframe after each command" },
+		{
+			.longName   = "file",
+			.shortName  = 'f',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = &filename,
+		},
+		{
+			.longName   = "command",
+			.shortName  = 'c',
+			.argInfo    = POPT_ARG_STRING,
+			.arg        = &cmdstr,
+			.val        = 0,
+			.descrip    = "Execute specified list of commands",
+		},
+		{
+			.longName   = "memreport",
+			.shortName  = 'm',
+			.argInfo    = POPT_ARG_INT,
+			.arg        = &memreports,
+			.descrip    = "Report memory left on talloc stackframe after each command",
+		},
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
-- 
2.11.4.GIT