From: Andreas Schneider <asn@samba.org>
Date: Thu, 13 Dec 2018 10:23:00 +0000 (+0100)
Subject: lib:texpect: Use C99 initializer for poptOption in texpect
X-Git-Tag: ldb-1.6.1~420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbf8917b401d70f93d7dc9761c6ff18d587d9163;p=thirdparty%2Fsamba.git

lib:texpect: Use C99 initializer for poptOption in texpect

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

diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index dd786705e8e..3f6278bbb10 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -380,8 +380,20 @@ static int eval_parent(pid_t pid)
  */
 struct poptOption long_options[] = {
 	POPT_AUTOHELP
-	{"timeout", 't', POPT_ARG_INT,	&opt_timeout, 't'},
-	{"verbose", 'v', POPT_ARG_NONE,	&opt_verbose, 'v'},
+	{
+		.longName  = "timeout",
+		.shortName = 't',
+		.argInfo   = POPT_ARG_INT,
+		.arg       = &opt_timeout,
+		.val       = 't',
+	},
+	{
+		.longName  = "verbose",
+		.shortName = 'v',
+		.argInfo   = POPT_ARG_NONE,
+		.arg       = &opt_verbose,
+		.val       = 'v',
+	},
 	POPT_TABLEEND
 };