[PATCH 5/7] mkfs: move getnum within the file

Jan Tulak
2017-07-20T09:29:42Z

Move getnum, check_opt and illegal_option within the file. We have to do
this to avoid dependency issues with the following patch. There is no
other change in this patch, just cut&paste of these functions.

Signed-off-by: Jan Tulak <jtulak@redhat.com>
---
mkfs/xfs_mkfs.c | 236 ++++++++++++++++++++++++++++----------------------------
1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index f10cb15a..9d2db2a2 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -761,6 +761,124 @@ get_conf_raw(int opt, int subopt)
return opts[opt].subopt_params[subopt].raw_input;
}

+static __attribute__((noreturn)) void
+illegal_option(
+ const char *value,
+ struct opt_params *opts,
+ int index,
+ const char *reason)
+{
+ fprintf(stderr,
+ _("Illegal value %s for -%c %s option. %s\n"),
+ value, opts->name, opts->subopts[index],
+ reason ? reason : "");
+ usage();
+}
+
+/*
+ * Check for conflicts and option respecification.
+ */
+static void
+check_opt(
+ struct opt_params *opts,
+ int index,
+ bool str_seen)
+{
+ struct subopt_param *sp = &opts->subopt_params[index];
+ int i;
+
+ if (sp->index != index) {
+ fprintf(stderr,
+ ("Developer screwed up option parsing (%d/%d)! Please report!\n"),
+ sp->index, index);
+ reqval(opts->name, (char **)opts->subopts, index);
+ }
+
+ /*
+ * Check for respecification of the option. This is more complex than it
+ * seems because some options are parsed twice - once as a string during
+ * input parsing, then later the string is passed to getnum for
+ * conversion into a number and bounds checking. Hence the two variables
+ * used to track the different uses based on the @str parameter passed
+ * to us.
+ */
+ if (!str_seen) {
+ if (sp->seen)
+ respec(opts->name, (char **)opts->subopts, index);
+ sp->seen = true;
+ } else {
+ if (sp->str_seen)
+ respec(opts->name, (char **)opts->subopts, index);
+ sp->str_seen = true;
+ }
+
+ /* check for conflicts with the option */
+ for (i = 0; i < MAX_CONFLICTS; i++) {
+ int conflict_opt = sp->conflicts[i];
+
+ if (conflict_opt == LAST_CONFLICT)
+ break;
+ if (opts->subopt_params[conflict_opt].seen ||
+ opts->subopt_params[conflict_opt].str_seen)
+ conflict(opts->name, (char **)opts->subopts,
+ conflict_opt, index);
+ }
+}
+
+static long long
+getnum(
+ const char *str,
+ struct opt_params *opts,
+ int index)
+{
+ struct subopt_param *sp = &opts->subopt_params[index];
+ long long c;
+
+ check_opt(opts, index, false);
+ set_conf_raw(opts->index, index, str);
+ /* empty strings might just return a default value */
+ if (!str || *str == '\0') {
+ if (sp->flagval == SUBOPT_NEEDS_VAL)
+ reqval(opts->name, (char **)opts->subopts, index);
+ return sp->flagval;
+ }
+
+ if (sp->minval == 0 && sp->maxval == 0) {
+ fprintf(stderr,
+ _("Option -%c %s has undefined minval/maxval."
+ "Can't verify value range. This is a bug.\n"),
+ opts->name, opts->subopts[index]);
+ exit(1);
+ }
+
+ /*
+ * Some values are pure numbers, others can have suffixes that define
+ * the units of the number. Those get passed to cvtnum(), otherwise we
+ * convert it ourselves to guarantee there is no trailing garbage in the
+ * number.
+ */
+ if (sp->convert)
+ c = cvtnum(blocksize, sectorsize, str);
+ else {
+ char *str_end;
+
+ c = strtoll(str, &str_end, 0);
+ if (c == 0 && str_end == str)
+ illegal_option(str, opts, index, NULL);
+ if (*str_end != '\0')
+ illegal_option(str, opts, index, NULL);
+ }
+
+ /* Validity check the result. */
+ if (c < sp->minval)
+ illegal_option(str, opts, index, _("value is too small"));
+ else if (c > sp->maxval)
+ illegal_option(str, opts, index, _("value is too large"));
+ if (sp->is_power_2 && !ispow2(c))
+ illegal_option(str, opts, index, _("value must be a power of 2"));
+ return c;
+}
+
/*
* Convert lsu to lsunit for 512 bytes blocks and check validity of the values.
*/
@@ -1285,124 +1403,6 @@ sb_set_features(

}

-static __attribute__((noreturn)) void
-illegal_option(
- const char *value,
- struct opt_params *opts,
- int index,
- const char *reason)
-{
- fprintf(stderr,
- _("Illegal value %s for -%c %s option. %s\n"),
- value, opts->name, opts->subopts[index],
- reason ? reason : "");
- usage();
-}
-
-/*
- * Check for conflicts and option respecification.
- */
-static void
-check_opt(
- struct opt_params *opts,
- int index,
- bool str_seen)
-{
- struct subopt_param *sp = &opts->subopt_params[index];
- int i;
-
- if (sp->index != index) {
- fprintf(stderr,
- ("Developer screwed up option parsing (%d/%d)! Please report!\n"),
- sp->index, index);
- reqval(opts->name, (char **)opts->subopts, index);
- }
-
- /*
- * Check for respecification of the option. This is more complex than it
- * seems because some options are parsed twice - once as a string during
- * input parsing, then later the string is passed to getnum for
- * conversion into a number and bounds checking. Hence the two variables
- * used to track the different uses based on the @str parameter passed
- * to us.
- */
- if (!str_seen) {
- if (sp->seen)
- respec(opts->name, (char **)opts->subopts, index);
- sp->seen = true;
- } else {
- if (sp->str_seen)
- respec(opts->name, (char **)opts->subopts, index);
- sp->str_seen = true;
- }
-
- /* check for conflicts with the option */
- for (i = 0; i < MAX_CONFLICTS; i++) {
- int conflict_opt = sp->conflicts[i];
-
- if (conflict_opt == LAST_CONFLICT)
- break;
- if (opts->subopt_params[conflict_opt].seen ||
- opts->subopt_params[conflict_opt].str_seen)
- conflict(opts->name, (char **)opts->subopts,
- conflict_opt, index);
- }
-}
-
-static long long
-getnum(
- const char *str,
- struct opt_params *opts,
- int index)
-{
- struct subopt_param *sp = &opts->subopt_params[index];
- long long c;
-
- check_opt(opts, index, false);
- set_conf_raw(opts->index, index, str);
- /* empty strings might just return a default value */
- if (!str || *str == '\0') {
- if (sp->flagval == SUBOPT_NEEDS_VAL)
- reqval(opts->name, (char **)opts->subopts, index);
- return sp->flagval;
- }
-
- if (sp->minval == 0 && sp->maxval == 0) {
- fprintf(stderr,
- _("Option -%c %s has undefined minval/maxval."
- "Can't verify value range. This is a bug.\n"),
- opts->name, opts->subopts[index]);
- exit(1);
- }
-
- /*
- * Some values are pure numbers, others can have suffixes that define
- * the units of the number. Those get passed to cvtnum(), otherwise we
- * convert it ourselves to guarantee there is no trailing garbage in the
- * number.
- */
- if (sp->convert)
- c = cvtnum(blocksize, sectorsize, str);
- else {
- char *str_end;
-
- c = strtoll(str, &str_end, 0);
- if (c == 0 && str_end == str)
- illegal_option(str, opts, index, NULL);
- if (*str_end != '\0')
- illegal_option(str, opts, index, NULL);
- }
-
- /* Validity check the result. */
- if (c < sp->minval)
- illegal_option(str, opts, index, _("value is too small"));
- else if (c > sp->maxval)
- illegal_option(str, opts, index, _("value is too large"));
- if (sp->is_power_2 && !ispow2(c))
- illegal_option(str, opts, index, _("value must be a power of 2"));
- return c;
-}
-
/*
* Option is a string - do all the option table work, and check there
* is actually an option string. Otherwise we don't do anything with the string
--
2.11.0