From fc55dd29cfaccbe925839ff665591c85313e3359 Mon Sep 17 00:00:00 2001 From: Steve Guminski Date: Mon, 22 May 2017 09:06:09 -0400 Subject: [PATCH] LU-6210 utils: Use C99 initializer in jt_nodemap_add_idmap() This patch makes no functional changes. The long_options struct initializer in jt_nodemap_add_idmap() is updated to C99 syntax. It is renamed to long_opts for consistency. 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 Change-Id: Iafeb7e76a943d8f8118623c532da1e8e2880aba2 Reviewed-on: https://review.whamcloud.com/27890 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin --- lustre/utils/obd.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c index f029e92..f6a9348 100644 --- a/lustre/utils/obd.c +++ b/lustre/utils/obd.c @@ -3725,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; -- 1.8.3.1