From: Steve Guminski <stephenx.guminski@intel.com>
Date: Fri, 19 May 2017 18:58:59 +0000 (-0400)
Subject: LU-6210 utils: Use C99 struct initializer for long_opt_start
X-Git-Tag: 2.10.51~47
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b2c88463370dbed1539e6d7a232f8096ac735c30

LU-6210 utils: Use C99 struct initializer for long_opt_start

This patch makes no functional changes.  The long_opt_start struct
initializer in lustre_lfsck.c is updated to C99 syntax.

C89 positional initializers require values to be placed in the
correct order. This will cause errors if the fields of the struct
definition are reordered or fields are added or removed. C99 named
initializers avoid this problem, and also automatically clear any
values that are not explicitly set.

Test-Parameters: trivial
Signed-off-by: Steve Guminski <stephenx.guminski@intel.com>
Change-Id: Id14efb47d29a5f16382422df6a3ad19cdf3156bf
Reviewed-on: https://review.whamcloud.com/27789
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
---

diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c
index 9bd6c60e..fc533da 100644
--- a/lustre/utils/lustre_lfsck.c
+++ b/lustre/utils/lustre_lfsck.c
@@ -50,25 +50,24 @@
 #include <libcfs/util/param.h>
 
 static struct option long_opt_start[] = {
-	{"device",		required_argument, 0, 'M'},
-	{"all",			no_argument,	   0, 'A'},
-	{"create_ostobj",	optional_argument, 0, 'c'},
-	{"create-ostobj",	optional_argument, 0, 'c'},
-	{"create_mdtobj",	optional_argument, 0, 'C'},
-	{"create-mdtobj",	optional_argument, 0, 'C'},
-	{"delay_create_ostobj",	optional_argument, 0, 'd'},
-	{"delay-create-ostobj",	optional_argument, 0, 'd'},
-	{"error",		required_argument, 0, 'e'},
-	{"help",		no_argument,	   0, 'h'},
-	{"dryrun",		optional_argument, 0, 'n'},
-	{"orphan",		no_argument,	   0, 'o'},
-	{"reset",		no_argument,	   0, 'r'},
-	{"speed",		required_argument, 0, 's'},
-	{"type",		required_argument, 0, 't'},
-	{"window_size",		required_argument, 0, 'w'},
-	{"window-size",		required_argument, 0, 'w'},
-	{0,			0,		   0,  0 }
-};
+{ .val = 'A',	.name = "all",			.has_arg = no_argument },
+{ .val = 'c',	.name = "create_ostobj",	.has_arg = optional_argument },
+{ .val = 'c',	.name = "create-ostobj",	.has_arg = optional_argument },
+{ .val = 'C',	.name = "create_mdtobj",	.has_arg = optional_argument },
+{ .val = 'C',	.name = "create-mdtobj",	.has_arg = optional_argument },
+{ .val = 'd',	.name = "delay_create_ostobj",	.has_arg = optional_argument },
+{ .val = 'd',	.name = "delay-create-ostobj",	.has_arg = optional_argument },
+{ .val = 'e',	.name = "error",		.has_arg = required_argument },
+{ .val = 'h',	.name = "help",			.has_arg = no_argument },
+{ .val = 'M',	.name = "device",		.has_arg = required_argument },
+{ .val = 'n',	.name = "dryrun",		.has_arg = optional_argument },
+{ .val = 'o',	.name = "orphan",		.has_arg = no_argument },
+{ .val = 'r',	.name = "reset",		.has_arg = no_argument },
+{ .val = 's',	.name = "speed",		.has_arg = required_argument },
+{ .val = 't',	.name = "type",			.has_arg = required_argument },
+{ .val = 'w',	.name = "window_size",		.has_arg = required_argument },
+{ .val = 'w',	.name = "window-size",		.has_arg = required_argument },
+{ .name = NULL } };
 
 static struct option long_opt_stop[] = {
 	{ .val = 'A',	.name = "all",		.has_arg = no_argument },