From: Andreas Schneider <asn@samba.org>
Date: Mon, 14 Jan 2019 17:05:34 +0000 (+0100)
Subject: s4:client: Use C99 initializer for poptOption in cifsdd
X-Git-Tag: ldb-1.6.1~389
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f66ead39de8d08472bbacf6b7e9b0d94d4d69d36;p=thirdparty%2Fsamba.git

s4:client: Use C99 initializer for poptOption in cifsdd

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 7ab59cd49e2..8ffb7b9a417 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -540,11 +540,27 @@ done:
 /* ------------------------------------------------------------------------- */
 
 struct poptOption cifsddHelpOptions[] = {
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&cifsdd_help_message, '\0', NULL, NULL },
-  { "help", '?', 0, NULL, '?', "Show this help message", NULL },
-  { "usage", '\0', 0, NULL, 'u', "Display brief usage message", NULL },
-  { NULL }
-} ;
+	{
+		.longName   = NULL,
+		.shortName  = '\0',
+		.argInfo    = POPT_ARG_CALLBACK,
+		.arg        = (void *)&cifsdd_help_message,
+		.val        = '\0',
+	},
+	{
+		.longName   = "help",
+		.shortName  = '?',
+		.val        = '?',
+		.descrip    = "Show this help message",
+	},
+	{
+		.longName   = "usage",
+		.shortName  = '\0',
+		.val        = 'u',
+		.descrip    = "Display brief usage message",
+	},
+	POPT_TABLEEND
+};
 
 int main(int argc, const char ** argv)
 {