s3:client: Use C99 initializer for poptOption in smbclient
authorAndreas Schneider <asn@samba.org>
Tue, 8 Jan 2019 11:18:23 +0000 (12:18 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 28 Jan 2019 09:29:13 +0000 (10:29 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source3/client/client.c

index 3a31463cdbb5f154af4e7639ee3113c000e2764b..9db8ff657177d969ff5cedccf76de4405e5f6917 100644 (file)
@@ -6340,21 +6340,136 @@ int main(int argc,char *argv[])
        struct poptOption long_options[] = {
                POPT_AUTOHELP
 
-               { "name-resolve", 'R', POPT_ARG_STRING, &new_name_resolve_order, 'R', "Use these name resolution services only", "NAME-RESOLVE-ORDER" },
-               { "message", 'M', POPT_ARG_STRING, NULL, 'M', "Send message", "HOST" },
-               { "ip-address", 'I', POPT_ARG_STRING, NULL, 'I', "Use this IP to connect to", "IP" },
-               { "stderr", 'E', POPT_ARG_NONE, NULL, 'E', "Write messages to stderr instead of stdout" },
-               { "list", 'L', POPT_ARG_STRING, NULL, 'L', "Get a list of shares available on a host", "HOST" },
-               { "max-protocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set the max protocol level", "LEVEL" },
-               { "tar", 'T', POPT_ARG_STRING, NULL, 'T', "Command line tar", "<c|x>IXFqgbNan" },
-               { "directory", 'D', POPT_ARG_STRING, NULL, 'D', "Start from directory", "DIR" },
-               { "command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated commands" },
-               { "send-buffer", 'b', POPT_ARG_INT, &io_bufsize, 'b', "Changes the transmit/send buffer", "BYTES" },
-               { "timeout", 't', POPT_ARG_INT, &io_timeout, 'b', "Changes the per-operation timeout", "SECONDS" },
-               { "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
-               { "grepable", 'g', POPT_ARG_NONE, NULL, 'g', "Produce grepable output" },
-               { "quiet", 'q', POPT_ARG_NONE, NULL, 'q', "Suppress help message" },
-                { "browse", 'B', POPT_ARG_NONE, NULL, 'B', "Browse SMB servers using DNS" },
+               {
+                       .longName   = "name-resolve",
+                       .shortName  = 'R',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &new_name_resolve_order,
+                       .val        = 'R',
+                       .descrip    = "Use these name resolution services only",
+                       .argDescrip = "NAME-RESOLVE-ORDER",
+               },
+               {
+                       .longName   = "message",
+                       .shortName  = 'M',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'M',
+                       .descrip    = "Send message",
+                       .argDescrip = "HOST",
+               },
+               {
+                       .longName   = "ip-address",
+                       .shortName  = 'I',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'I',
+                       .descrip    = "Use this IP to connect to",
+                       .argDescrip = "IP",
+               },
+               {
+                       .longName   = "stderr",
+                       .shortName  = 'E',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'E',
+                       .descrip    = "Write messages to stderr instead of stdout",
+               },
+               {
+                       .longName   = "list",
+                       .shortName  = 'L',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'L',
+                       .descrip    = "Get a list of shares available on a host",
+                       .argDescrip = "HOST",
+               },
+               {
+                       .longName   = "max-protocol",
+                       .shortName  = 'm',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'm',
+                       .descrip    = "Set the max protocol level",
+                       .argDescrip = "LEVEL",
+               },
+               {
+                       .longName   = "tar",
+                       .shortName  = 'T',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'T',
+                       .descrip    = "Command line tar",
+                       .argDescrip = "<c|x>IXFqgbNan",
+               },
+               {
+                       .longName   = "directory",
+                       .shortName  = 'D',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = NULL,
+                       .val        = 'D',
+                       .descrip    = "Start from directory",
+                       .argDescrip = "DIR",
+               },
+               {
+                       .longName   = "command",
+                       .shortName  = 'c',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &cmdstr,
+                       .val        = 'c',
+                       .descrip    = "Execute semicolon separated commands",
+               },
+               {
+                       .longName   = "send-buffer",
+                       .shortName  = 'b',
+                       .argInfo    = POPT_ARG_INT,
+                       .arg        = &io_bufsize,
+                       .val        = 'b',
+                       .descrip    = "Changes the transmit/send buffer",
+                       .argDescrip = "BYTES",
+               },
+               {
+                       .longName   = "timeout",
+                       .shortName  = 't',
+                       .argInfo    = POPT_ARG_INT,
+                       .arg        = &io_timeout,
+                       .val        = 'b',
+                       .descrip    = "Changes the per-operation timeout",
+                       .argDescrip = "SECONDS",
+               },
+               {
+                       .longName   = "port",
+                       .shortName  = 'p',
+                       .argInfo    = POPT_ARG_INT,
+                       .arg        = &port,
+                       .val        = 'p',
+                       .descrip    = "Port to connect to",
+                       .argDescrip = "PORT",
+               },
+               {
+                       .longName   = "grepable",
+                       .shortName  = 'g',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'g',
+                       .descrip    = "Produce grepable output",
+               },
+               {
+                       .longName   = "quiet",
+                       .shortName  = 'q',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'q',
+                       .descrip    = "Suppress help message",
+               },
+               {
+                       .longName   = "browse",
+                       .shortName  = 'B',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'B',
+                       .descrip    = "Browse SMB servers using DNS",
+               },
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS