From 8e922ad47dc08e7c4a74c10d1a0d12b90d0c2031 Mon Sep 17 00:00:00 2001 From: Steve Guminski Date: Fri, 19 May 2017 15:35:45 -0400 Subject: [PATCH] LU-6210 utils: Use consistent naming for option strings This patch makes no functional changes. The option strings in jt_lfsck_start() and jt_lfsck_stop() are renamed to short_opts for consistency. Test-Parameters: trivial Signed-off-by: Steve Guminski Change-Id: Id29ef63aa2ef62223d72f31374eb0a93badc280e Reviewed-on: https://review.whamcloud.com/27792 Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: James Simmons Tested-by: Jenkins Reviewed-by: Fan Yong --- lustre/utils/lustre_lfsck.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c index f3b00f0..9bd6c60e 100644 --- a/lustre/utils/lustre_lfsck.c +++ b/lustre/utils/lustre_lfsck.c @@ -278,7 +278,7 @@ int jt_lfsck_start(int argc, char **argv) char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; char device[MAX_OBD_NAME]; struct lfsck_start start; - char *optstring = "Ac::C::d::e:hM:n::ors:t:w:"; + char *short_opts = "Ac::C::d::e:hM:n::ors:t:w:"; int opt, index, rc, val, i; memset(&data, 0, sizeof(data)); @@ -290,7 +290,7 @@ int jt_lfsck_start(int argc, char **argv) /* Reset the 'optind' for the case of getopt_long() called multiple * times under the same lctl. */ optind = 0; - while ((opt = getopt_long(argc, argv, optstring, long_opt_start, + while ((opt = getopt_long(argc, argv, short_opts, long_opt_start, &index)) != EOF) { switch (opt) { case 'A': @@ -468,7 +468,7 @@ int jt_lfsck_stop(int argc, char **argv) char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf; char device[MAX_OBD_NAME]; struct lfsck_stop stop; - char *optstring = "AhM:"; + char *short_opts = "AhM:"; int opt, index, rc; memset(&data, 0, sizeof(data)); @@ -478,7 +478,7 @@ int jt_lfsck_stop(int argc, char **argv) /* Reset the 'optind' for the case of getopt_long() called multiple * times under the same lctl. */ optind = 0; - while ((opt = getopt_long(argc, argv, optstring, long_opt_stop, + while ((opt = getopt_long(argc, argv, short_opts, long_opt_stop, &index)) != EOF) { switch (opt) { case 'A': -- 1.8.3.1