From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Cc: darrick.wong@oracle.com, jack@suse.com, jeffm@suse.com,
okurz@suse.com, lpechacek@suse.com, jtulak@redhat.com,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH v2 3/5] mkfs: replace defaults source with an enum
Date: Thu, 17 May 2018 12:26:58 -0700 [thread overview]
Message-ID: <20180517192700.23457-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20180517192700.23457-1-mcgrof@kernel.org>
Using an enum will let us later just use a switch statement to print
out the source, this makes sources easier to document, update and
manage.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
mkfs/xfs_mkfs.c | 5 +++--
mkfs/xfs_mkfs_common.h | 13 ++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index ac97039abc34..de0eab3f68e0 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3697,7 +3697,7 @@ main(
/* build time defaults */
struct mkfs_default_params dft = {
- .source = _("package build definitions"),
+ .type = DEFAULTS_BUILTIN,
.sectorsize = XFS_MIN_SECTORSIZE,
.blocksize = 1 << XFS_DFL_BLOCKSIZE_LOG,
.sb_feat = {
@@ -3737,7 +3737,8 @@ main(
* implemented, emit a message to indicate where the defaults being
* used came from.
*
- * printf(_("Default configuration sourced from %s\n"), dft.source);
+ * printf(_("Default configuration sourced from %s\n"),
+ * default_type_str(dft.type));
*/
/* copy new defaults into CLI parsing structure */
diff --git a/mkfs/xfs_mkfs_common.h b/mkfs/xfs_mkfs_common.h
index 9b0f67b70cf1..d867ab377185 100644
--- a/mkfs/xfs_mkfs_common.h
+++ b/mkfs/xfs_mkfs_common.h
@@ -40,6 +40,17 @@ struct sb_feat_args {
bool nortalign;
};
+/*
+ * File configuration type settings
+ *
+ * These are the different possibilities by which you can end up parsing
+ * default settings with. DEFAULTS_BUILTIN indicates there was no configuration
+ * file parsed and we are using the built-in defaults on this code.
+ */
+enum default_params_type {
+ DEFAULTS_BUILTIN = 0,
+};
+
/*
* Default filesystem features and configuration values
*
@@ -49,7 +60,7 @@ struct sb_feat_args {
* calculations.
*/
struct mkfs_default_params {
- char *source; /* where the defaults came from */
+ enum default_params_type type; /* where the defaults came from */
int sectorsize;
int blocksize;
--
2.16.3
next prev parent reply other threads:[~2018-05-17 19:27 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 19:26 [PATCH v2 0/5] xfsprogs: add mkfs.xfs configuration file parsing support Luis R. Rodriguez
2018-05-17 19:26 ` [PATCH v2 1/5] mkfs: distinguish between struct sb_feat_args and struct cli_params Luis R. Rodriguez
2018-05-17 22:02 ` Dave Chinner
2018-05-17 19:26 ` [PATCH v2 2/5] mkfs: move shared structs and cli params into their own headers Luis R. Rodriguez
2018-05-17 22:40 ` Dave Chinner
2018-05-17 23:54 ` Luis R. Rodriguez
2018-05-18 0:49 ` Dave Chinner
2018-05-19 1:33 ` Luis R. Rodriguez
2018-05-17 19:26 ` Luis R. Rodriguez [this message]
2018-05-17 22:48 ` [PATCH v2 3/5] mkfs: replace defaults source with an enum Dave Chinner
2018-05-17 23:09 ` Luis R. Rodriguez
2018-05-18 0:53 ` Dave Chinner
2018-05-17 19:26 ` [PATCH v2 4/5] mkfs: add helpers to process defaults Luis R. Rodriguez
2018-05-17 22:53 ` Dave Chinner
2018-05-18 0:06 ` Luis R. Rodriguez
2018-05-17 19:27 ` [PATCH v2 5/5] mkfs.xfs: add configuration file parsing support using our own parser Luis R. Rodriguez
2018-05-17 21:31 ` Darrick J. Wong
2018-05-18 0:29 ` Luis R. Rodriguez
2018-05-21 18:32 ` Luis R. Rodriguez
2018-05-18 0:44 ` Dave Chinner
2018-05-19 1:32 ` Luis R. Rodriguez
2018-05-21 0:14 ` Dave Chinner
2018-05-21 15:30 ` Darrick J. Wong
2018-05-21 16:58 ` Luis R. Rodriguez
2018-05-22 19:37 ` Luis R. Rodriguez
2018-05-18 3:24 ` Eric Sandeen
2018-05-18 3:46 ` Darrick J. Wong
2018-05-18 15:38 ` Luis R. Rodriguez
2018-05-18 17:09 ` Eric Sandeen
2018-05-18 23:56 ` Luis R. Rodriguez
2018-05-21 9:40 ` Jan Tulak
2018-05-25 0:50 ` Luis R. Rodriguez
2018-05-20 0:16 ` Dave Chinner
2018-05-21 15:33 ` Darrick J. Wong
2018-05-21 17:05 ` Luis R. Rodriguez
2018-05-21 22:10 ` Dave Chinner
2018-05-21 22:24 ` Eric Sandeen
2018-05-22 0:38 ` Dave Chinner
2018-05-25 0:51 ` Luis R. Rodriguez
2018-05-25 0:54 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180517192700.23457-4-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=darrick.wong@oracle.com \
--cc=jack@suse.com \
--cc=jeffm@suse.com \
--cc=jtulak@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=lpechacek@suse.com \
--cc=okurz@suse.com \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).