From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
kunit-dev@googlegroups.com,
Shuah Khan <skhan@linuxfoundation.org>,
Vitor Massaru Iha <vitor@massaru.org>
Cc: Mark Brown <broonie@kernel.org>,
Brendan Higgins <brendanhiggins@google.com>,
David Gow <davidgow@google.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 5/6] lib/cmdline: Allow NULL to be an output for get_option()
Date: Thu, 12 Nov 2020 20:07:31 +0200 [thread overview]
Message-ID: <20201112180732.75589-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20201112180732.75589-1-andriy.shevchenko@linux.intel.com>
In the future we would like to use get_option() to only validate
the string and parse it separately. To achieve this, allow
NULL to be an output for get_option().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v4: new patch
lib/cmdline.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/cmdline.c b/lib/cmdline.c
index ca89846ee0bb..9e186234edc0 100644
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -35,11 +35,14 @@ static int get_range(char **str, int *pint, int n)
/**
* get_option - Parse integer from an option string
* @str: option string
- * @pint: (output) integer value parsed from @str
+ * @pint: (optional output) integer value parsed from @str
*
* Read an int from an option string; if available accept a subsequent
* comma as well.
*
+ * When @pint is NULL the function can be used as a validator of
+ * the current option in the string.
+ *
* Return values:
* 0 - no int in string
* 1 - int found, no subsequent comma
@@ -53,13 +56,16 @@ static int get_range(char **str, int *pint, int n)
int get_option(char **str, int *pint)
{
char *cur = *str;
+ int value;
if (!cur || !(*cur))
return 0;
if (*cur == '-')
- *pint = -simple_strtoull(++cur, str, 0);
+ value = -simple_strtoull(++cur, str, 0);
else
- *pint = simple_strtoull(cur, str, 0);
+ value = simple_strtoull(cur, str, 0);
+ if (pint)
+ *pint = value;
if (cur == *str)
return 0;
if (**str == ',') {
--
2.28.0
next prev parent reply other threads:[~2020-11-12 18:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 18:07 [PATCH v4 1/6] lib/list_kunit: Follow new file name convention for KUnit tests Andy Shevchenko
2020-11-12 18:07 ` [PATCH v4 2/6] lib/linear_ranges_kunit: " Andy Shevchenko
2020-11-13 6:22 ` Vaittinen, Matti
2020-11-16 10:42 ` andriy.shevchenko
2020-11-12 18:07 ` [PATCH v4 3/6] lib/bits_kunit: " Andy Shevchenko
2020-11-12 18:07 ` [PATCH v4 4/6] lib/cmdline: Fix get_option() for strings starting with hyphen Andy Shevchenko
2020-11-12 18:07 ` Andy Shevchenko [this message]
2020-11-12 18:07 ` [PATCH v4 6/6] lib/cmdline_kunit: Add a new test suite for cmdline API Andy Shevchenko
2020-11-13 3:10 ` Andrew Morton
2020-11-16 9:53 ` Andy Shevchenko
2020-11-16 10:41 ` Andy Shevchenko
2020-11-16 23:43 ` David Gow
2020-11-17 15:52 ` Andy Shevchenko
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=20201112180732.75589-5-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=brendanhiggins@google.com \
--cc=broonie@kernel.org \
--cc=davidgow@google.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=vitor@massaru.org \
/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