LU-6210 utils: Use C99 initializer in jt_nodemap_del_idmap()

[fs/lustre-release.git] / lustre / utils / obd.c

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 5331898..05c6498 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -2656,14 +2656,13 @@ static int llog_cancel_parse_optional(int argc, char **argv,
                                      struct obd_ioctl_data *data)
 {
        int cOpt;
-       const char *const short_options = "c:l:i:h";
-       const struct option long_options[] = {
-               {"catalog", required_argument, NULL, 'c'},
-               {"log_id", required_argument, NULL, 'l'},
-               {"log_idx", required_argument, NULL, 'i'},
-               {"help", no_argument, NULL, 'h'},
-               {NULL, 0, NULL, 0}
-       };
+       const char *const short_opts = "c:l:i:h";
+       const struct option long_opts[] = {
+       { .val = 'c',   .name = "catalog",      .has_arg = required_argument },
+       { .val = 'h',   .name = "help",         .has_arg = no_argument },
+       { .val = 'i',   .name = "log_idx",      .has_arg = required_argument },
+       { .val = 'l',   .name = "log_id",       .has_arg = required_argument },
+       { .name = NULL } };
 
        /* sanity check */
        if (!data || argc <= 1) {
@@ -2671,8 +2670,8 @@ static int llog_cancel_parse_optional(int argc, char **argv,
        }
 
        /*now process command line arguments*/
-       while ((cOpt = getopt_long(argc, argv, short_options,
-                                       long_options, NULL)) != -1) {
+       while ((cOpt = getopt_long(argc, argv, short_opts,
+                                       long_opts, NULL)) != -1) {
                switch (cOpt) {
                case 'c':
                        data->ioc_inllen1 = strlen(optarg) + 1;
@@ -3439,28 +3438,15 @@ int jt_nodemap_add_range(int argc, char **argv)
        int                     rc = 0;
        int                     c;
 
-       static struct option long_options[] = {
-               {
-                       .name           = "name",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'n',
-               },
-               {
-                       .name           = "range",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'r',
-               },
-               {
-                       NULL
-               }
-       };
+       static struct option long_opts[] = {
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .val = 'r',   .name = "range",        .has_arg = required_argument },
+       { .name = NULL } };
 
        INIT_LIST_HEAD(&nidlist);
 
        while ((c = getopt_long(argc, argv, "n:r:",
-                               long_options, NULL)) != -1) {
+                               long_opts, NULL)) != -1) {
                switch (c) {
                case 'n':
                        nodemap_name = optarg;
@@ -3613,26 +3599,13 @@ int jt_nodemap_set_fileset(int argc, char **argv)
        int   rc = 0;
        int   c;
 
-       static struct option long_options[] = {
-               {
-                       .name           = "name",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'n',
-               },
-               {
-                       .name           = "fileset",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'f',
-               },
-               {
-                       NULL
-               }
-       };
+       static struct option long_opts[] = {
+       { .val = 'f',   .name = "fileset",      .has_arg = required_argument },
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .name = NULL } };
 
        while ((c = getopt_long(argc, argv, "n:f:",
-                               long_options, NULL)) != -1) {
+                               long_opts, NULL)) != -1) {
                switch (c) {
                case 'n':
                        nodemap_name = optarg;
@@ -3683,32 +3656,14 @@ int jt_nodemap_modify(int argc, char **argv)
        char                    *param = NULL;
        char                    *value = NULL;
 
-       static struct option long_options[] = {
-               {
-                       .name           = "name",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'n',
-               },
-               {
-                       .name           = "property",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'p',
-               },
-               {
-                       .name           = "value",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'v',
-               },
-               {
-                       NULL
-               }
-       };
+       static struct option long_opts[] = {
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .val = 'p',   .name = "property",     .has_arg = required_argument },
+       { .val = 'v',   .name = "value",        .has_arg = required_argument },
+       { .name = NULL } };
 
        while ((c = getopt_long(argc, argv, "n:p:v:",
-                               long_options, NULL)) != -1) {
+                               long_opts, NULL)) != -1) {
                switch (c) {
                case 'n':
                        nodemap_name = optarg;
@@ -3770,32 +3725,14 @@ int jt_nodemap_add_idmap(int argc, char **argv)
        char                    *idtype = NULL;
        int                     rc = 0;
 
-       static struct option long_options[] = {
-               {
-                       .name           = "name",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'n',
-               },
-               {
-                       .name           = "idmap",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'm',
-               },
-               {
-                       .name           = "idtype",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'i',
-               },
-               {
-                       NULL
-               }
-       };
+       static struct option long_opts[] = {
+       { .val = 'i',   .name = "idtype",       .has_arg = required_argument },
+       { .val = 'm',   .name = "idmap",        .has_arg = required_argument },
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .name = NULL } };
 
        while ((c = getopt_long(argc, argv, "n:m:i:",
-                               long_options, NULL)) != -1) {
+                               long_opts, NULL)) != -1) {
                switch (c) {
                case 'n':
                        nodemap_name = optarg;
@@ -3844,32 +3781,14 @@ int jt_nodemap_del_idmap(int argc, char **argv)
        char                    *idtype = NULL;
        int                     rc = 0;
 
-       static struct option long_options[] = {
-               {
-                       .name           = "name",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'n',
-               },
-               {
-                       .name           = "idmap",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'm',
-               },
-               {
-                       .name           = "idtype",
-                       .has_arg        = required_argument,
-                       .flag           = 0,
-                       .val            = 'i',
-               },
-               {
-                       NULL
-               }
-       };
+       static struct option long_opts[] = {
+       { .val = 'i',   .name = "idtype",       .has_arg = required_argument },
+       { .val = 'm',   .name = "idmap",        .has_arg = required_argument },
+       { .val = 'n',   .name = "name",         .has_arg = required_argument },
+       { .name = NULL } };
 
        while ((c = getopt_long(argc, argv, "n:m:i:",
-                               long_options, NULL)) != -1) {
+                               long_opts, NULL)) != -1) {
                switch (c) {
                case 'n':
                        nodemap_name = optarg;