From fcb2dfa7a20fec396b6b5dfd23a791e13115bbed Mon Sep 17 00:00:00 2001 From: Steve Guminski Date: Fri, 14 Apr 2017 15:06:45 -0400 Subject: [PATCH] LU-6210 utils: Use C99 struct initializers in lfs_find() This patch makes no functional changes. Struct initializers that use C89 or GCC-only syntax are 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. This patch updates lfs_find() to use the C99 syntax. Test-Parameters: trivial Signed-off-by: Steve Guminski Change-Id: I646e42ac5173f927c670a41cc56c13a7caa19a1e Reviewed-on: https://review.whamcloud.com/27513 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: John L. Hammond --- lustre/utils/lfs.c | 95 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 7a48345..435cf5d 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -1888,54 +1888,65 @@ static int lfs_find(int argc, char **argv) { int c, rc; int ret = 0; - time_t t; + time_t t; struct find_param param = { .fp_max_depth = -1, .fp_quiet = 1, }; struct option long_opts[] = { - {"atime", required_argument, 0, 'A'}, - {"comp-count", required_argument, 0, LFS_COMP_COUNT_OPT}, - {"component-count", required_argument, 0, LFS_COMP_COUNT_OPT}, - {"comp-flags", required_argument, 0, LFS_COMP_FLAGS_OPT}, - {"component-flags", required_argument, 0, LFS_COMP_FLAGS_OPT}, - {"comp-start", required_argument, 0, LFS_COMP_START_OPT}, - {"component-start", required_argument, 0, LFS_COMP_START_OPT}, - {"stripe-count", required_argument, 0, 'c'}, - {"stripe_count", required_argument, 0, 'c'}, - {"ctime", required_argument, 0, 'C'}, - {"maxdepth", required_argument, 0, 'D'}, - {"comp-end", required_argument, 0, 'E'}, - {"component-end", required_argument, 0, 'E'}, - {"gid", required_argument, 0, 'g'}, - {"group", required_argument, 0, 'G'}, - {"mdt-hash", required_argument, 0, 'H'}, - {"stripe-index", required_argument, 0, 'i'}, - {"stripe_index", required_argument, 0, 'i'}, - /*{"component-id", required_argument, 0, 'I'},*/ - {"layout", required_argument, 0, 'L'}, - {"mdt", required_argument, 0, 'm'}, - {"mdt-index", required_argument, 0, 'm'}, - {"mdt_index", required_argument, 0, 'm'}, - {"mtime", required_argument, 0, 'M'}, - {"name", required_argument, 0, 'n'}, + { .val = 'A', .name = "atime", .has_arg = required_argument }, + { .val = LFS_COMP_COUNT_OPT, + .name = "comp-count", .has_arg = required_argument }, + { .val = LFS_COMP_COUNT_OPT, + .name = "component-count", + .has_arg = required_argument }, + { .val = LFS_COMP_FLAGS_OPT, + .name = "comp-flags", .has_arg = required_argument }, + { .val = LFS_COMP_FLAGS_OPT, + .name = "component-flags", + .has_arg = required_argument }, + { .val = LFS_COMP_START_OPT, + .name = "comp-start", .has_arg = required_argument }, + { .val = LFS_COMP_START_OPT, + .name = "component-start", + .has_arg = required_argument }, + { .val = 'c', .name = "stripe-count", .has_arg = required_argument }, + { .val = 'c', .name = "stripe_count", .has_arg = required_argument }, + { .val = 'C', .name = "ctime", .has_arg = required_argument }, + { .val = 'D', .name = "maxdepth", .has_arg = required_argument }, + { .val = 'E', .name = "comp-end", .has_arg = required_argument }, + { .val = 'E', .name = "component-end", + .has_arg = required_argument }, + { .val = 'g', .name = "gid", .has_arg = required_argument }, + { .val = 'G', .name = "group", .has_arg = required_argument }, + { .val = 'H', .name = "mdt-hash", .has_arg = required_argument }, + { .val = 'i', .name = "stripe-index", .has_arg = required_argument }, + { .val = 'i', .name = "stripe_index", .has_arg = required_argument }, + /*{"component-id", required_argument, 0, 'I'},*/ + { .val = 'L', .name = "layout", .has_arg = required_argument }, + { .val = 'm', .name = "mdt", .has_arg = required_argument }, + { .val = 'm', .name = "mdt-index", .has_arg = required_argument }, + { .val = 'm', .name = "mdt_index", .has_arg = required_argument }, + { .val = 'M', .name = "mtime", .has_arg = required_argument }, + { .val = 'n', .name = "name", .has_arg = required_argument }, /* reserve {"or", no_argument, , 0, 'o'}, to match find(1) */ - {"obd", required_argument, 0, 'O'}, - {"ost", required_argument, 0, 'O'}, - /* no short option for pool, p/P already used */ - {"pool", required_argument, 0, LFS_POOL_OPT}, - {"print0", no_argument, 0, 'p'}, - {"print", no_argument, 0, 'P'}, - {"projid", required_argument, 0, LFS_PROJID_OPT}, - {"size", required_argument, 0, 's'}, - {"stripe-size", required_argument, 0, 'S'}, - {"stripe_size", required_argument, 0, 'S'}, - {"type", required_argument, 0, 't'}, - {"mdt-count", required_argument, 0, 'T'}, - {"uid", required_argument, 0, 'u'}, - {"user", required_argument, 0, 'U'}, - {0, 0, 0, 0} - }; + { .val = 'O', .name = "obd", .has_arg = required_argument }, + { .val = 'O', .name = "ost", .has_arg = required_argument }, + /* no short option for pool, p/P already used */ + { .val = LFS_POOL_OPT, + .name = "pool", .has_arg = required_argument }, + { .val = 'p', .name = "print0", .has_arg = no_argument }, + { .val = 'P', .name = "print", .has_arg = no_argument }, + { .val = LFS_PROJID_OPT, + .name = "projid", .has_arg = required_argument }, + { .val = 's', .name = "size", .has_arg = required_argument }, + { .val = 'S', .name = "stripe-size", .has_arg = required_argument }, + { .val = 'S', .name = "stripe_size", .has_arg = required_argument }, + { .val = 't', .name = "type", .has_arg = required_argument }, + { .val = 'T', .name = "mdt-count", .has_arg = required_argument }, + { .val = 'u', .name = "uid", .has_arg = required_argument }, + { .val = 'U', .name = "user", .has_arg = required_argument }, + { .name = NULL } }; int pathstart = -1; int pathend = -1; int neg_opt = 0; -- 1.8.3.1