[PATCH 11/42] mkfs: factor rt subopts parser
From: Dave Chinner <david@fromorbit.com>
Date: 2017-08-29 23:51:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Dave Chinner <redacted> Signed-Off-By: Dave Chinner <redacted> --- mkfs/xfs_mkfs.c | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index e3ee1f1c87fc..87505c61aa79 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c@@ -1725,6 +1725,26 @@ rtdev_opts_parser( char *value, struct cli_params *cli) { + switch (subopt) { + case R_EXTSIZE: + cli->rtextsize = getstr(value, &ropts, R_EXTSIZE); + break; + case R_FILE: + cli->xi->risfile = getnum(value, &ropts, R_FILE); + break; + case R_NAME: + case R_DEV: + cli->xi->rtname = getstr(value, &ropts, R_NAME); + break; + case R_SIZE: + cli->rtsize = getstr(value, &ropts, R_SIZE); + break; + case R_NOALIGN: + cli->sb_feat.nortalign = getnum(value, &ropts, R_NOALIGN); + break; + default: + return -EINVAL; + } return 0; }
@@ -2062,36 +2082,13 @@ main( qflag = 1; break; case 'r': - p = optarg; - while (*p != '\0') { - char **subopts = (char **)ropts.subopts; - char *value; + parse_subopts(c, optarg, &cli); - switch (getsubopt(&p, subopts, &value)) { - case R_EXTSIZE: - rtextsize = getstr(value, &ropts, - R_EXTSIZE); - break; - case R_FILE: - xi.risfile = getnum(value, &ropts, - R_FILE); - break; - case R_NAME: - case R_DEV: - xi.rtname = getstr(value, &ropts, - R_NAME); - break; - case R_SIZE: - rtsize = getstr(value, &ropts, R_SIZE); - break; - case R_NOALIGN: - norsflag = getnum(value, &ropts, - R_NOALIGN); - break; - default: - unknown('r', value); - } - } + /* temp don't break code */ + rtextsize = cli.rtextsize; + rtsize = cli.rtsize; + norsflag = cli.sb_feat.nortalign; + /* end temp don't break code */ break; case 's': p = optarg;
--
2.13.3