Whamcloud - gitweb
LU-6210 utils: Use C99 struct initializers in lfs_hsm_request() 26/27526/3
authorSteve Guminski <stephenx.guminski@intel.com>
Fri, 14 Apr 2017 19:47:25 +0000 (15:47 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Sat, 29 Jul 2017 00:02:41 +0000 (00:02 +0000)
This patch makes no functional changes.  Struct initializers that
use C89 or GCC-only syntax are updated to C99 syntax.  Variables of
type struct option are 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.

This patch updates lfs_hsm_request() to use the C99 syntax.

Test-Parameters: trivial
Signed-off-by: Steve Guminski <stephenx.guminski@intel.com>
Change-Id: I62b07e59a3f81cf8ee936ae46b1cd8f99913e53c
Reviewed-on: https://review.whamcloud.com/27526
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
lustre/utils/lfs.c

index ef2205a..35c908e 100644 (file)
@@ -5009,13 +5009,12 @@ static int fill_hur_item(struct hsm_user_request *hur, unsigned int idx,
 
 static int lfs_hsm_request(int argc, char **argv, int action)
 {
 
 static int lfs_hsm_request(int argc, char **argv, int action)
 {
-       struct option            long_opts[] = {
-               {"filelist", 1, 0, 'l'},
-               {"data", 1, 0, 'D'},
-               {"archive", 1, 0, 'a'},
-               {"mntpath", 1, 0, 'm'},
-               {0, 0, 0, 0}
-       };
+       struct option long_opts[] = {
+       { .val = 'a',   .name = "archive",      .has_arg = required_argument },
+       { .val = 'D',   .name = "data",         .has_arg = required_argument },
+       { .val = 'l',   .name = "filelist",     .has_arg = required_argument },
+       { .val = 'm',   .name = "mntpath",      .has_arg = required_argument },
+       { .name = NULL } };
        dev_t                    last_dev = 0;
        char                     short_opts[] = "l:D:a:m:";
        struct hsm_user_request *hur, *oldhur;
        dev_t                    last_dev = 0;
        char                     short_opts[] = "l:D:a:m:";
        struct hsm_user_request *hur, *oldhur;