From: Joe Perches <joe@perches.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>, Stephen Kitt <steve@sk2.org>,
Kees Cook <keescook@chromium.org>,
Nitin Gote <nitin.r.gote@intel.com>,
jannh@google.com, kernel-hardening@lists.openwall.com,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
Andrew Morton <akpm@linux-foundation.org>,
linux-doc@vger.kernel.org
Subject: [PATCH 2/2] kernel-doc: core-api: Include string.h into core-api
Date: Mon, 22 Jul 2019 17:38:16 -0700 [thread overview]
Message-ID: <224a6ebf39955f4107c0c376d66155d970e46733.1563841972.git.joe@perches.com> (raw)
In-Reply-To: <cover.1563841972.git.joe@perches.com>
core-api should show all the various string functions including the
newly added stracpy and stracpy_pad.
Miscellanea:
o Update the Returns: value for strscpy
o fix a defect with %NUL)
Signed-off-by: Joe Perches <joe@perches.com>
---
Documentation/core-api/kernel-api.rst | 3 +++
include/linux/string.h | 5 +++--
lib/string.c | 10 ++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst
index 08af5caf036d..f77de49b1d51 100644
--- a/Documentation/core-api/kernel-api.rst
+++ b/Documentation/core-api/kernel-api.rst
@@ -42,6 +42,9 @@ String Manipulation
.. kernel-doc:: lib/string.c
:export:
+.. kernel-doc:: include/linux/string.h
+ :internal:
+
.. kernel-doc:: mm/util.c
:functions: kstrdup kstrdup_const kstrndup kmemdup kmemdup_nul memdup_user
vmemdup_user strndup_user memdup_user_nul
diff --git a/include/linux/string.h b/include/linux/string.h
index f80b0973f0e5..329188fffc11 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -515,8 +515,9 @@ static inline void memcpy_and_pad(void *dest, size_t dest_len,
* But this can lead to bugs due to typos, or if prefix is a pointer
* and not a constant. Instead use str_has_prefix().
*
- * Returns: 0 if @str does not start with @prefix
- strlen(@prefix) if @str does start with @prefix
+ * Returns:
+ * * strlen(@prefix) if @str starts with @prefix
+ * * 0 if @str does not start with @prefix
*/
static __always_inline size_t str_has_prefix(const char *str, const char *prefix)
{
diff --git a/lib/string.c b/lib/string.c
index 461fb620f85f..53582b6dce2a 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -173,8 +173,9 @@ EXPORT_SYMBOL(strlcpy);
* doesn't unnecessarily force the tail of the destination buffer to be
* zeroed. If zeroing is desired please use strscpy_pad().
*
- * Return: The number of characters copied (not including the trailing
- * %NUL) or -E2BIG if the destination buffer wasn't big enough.
+ * Returns:
+ * * The number of characters copied (not including the trailing %NUL)
+ * * -E2BIG if count is 0.
*/
ssize_t strscpy(char *dest, const char *src, size_t count)
{
@@ -253,8 +254,9 @@ EXPORT_SYMBOL(strscpy);
* For full explanation of why you may want to consider using the
* 'strscpy' functions please see the function docstring for strscpy().
*
- * Return: The number of characters copied (not including the trailing
- * %NUL) or -E2BIG if the destination buffer wasn't big enough.
+ * Returns:
+ * * The number of characters copied (not including the trailing %NUL)
+ * * -E2BIG if count is 0.
*/
ssize_t strscpy_pad(char *dest, const char *src, size_t count)
{
--
2.15.0
next prev parent reply other threads:[~2019-07-23 0:38 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 0:38 [PATCH 0/2] string: Add stracpy and stracpy_pad Joe Perches
2019-07-23 0:38 ` [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms Joe Perches
2019-07-23 4:35 ` Andrew Morton
2019-07-23 4:42 ` Joe Perches
2019-07-23 21:29 ` Kees Cook
2019-07-23 6:55 ` Rasmus Villemoes
2019-07-23 15:41 ` David Laight
2019-07-23 15:50 ` Joe Perches
2019-07-23 21:34 ` Kees Cook
2019-07-24 12:05 ` Yann Droneaud
2019-07-24 13:09 ` Rasmus Villemoes
2019-07-24 17:08 ` Linus Torvalds
2019-07-25 20:03 ` Kees Cook
2019-07-26 2:46 ` Joe Perches
[not found] ` <66fcdbf607d7d0bea41edb39e5579d63b62b7d84.camel@perches.com>
2019-07-23 20:52 ` [Fwd: [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms] Julia Lawall
2019-07-23 23:42 ` Joe Perches
2019-07-24 3:54 ` Julia Lawall
2019-07-24 4:19 ` Joe Perches
2019-07-24 4:27 ` Julia Lawall
2019-07-24 4:37 ` Joe Perches
2019-07-24 10:28 ` David Laight
2019-07-24 10:43 ` Joe Perches
2019-07-24 11:45 ` Julia Lawall
2019-07-25 1:42 ` Julia Lawall
2019-07-25 7:46 ` [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms Markus Elfring
2019-07-25 11:34 ` Julia Lawall
2019-07-25 12:40 ` [1/2] " Markus Elfring
2019-07-25 13:45 ` [PATCH 1/2] " Markus Elfring
2019-07-25 13:48 ` Julia Lawall
2019-07-25 14:48 ` [1/2] " Markus Elfring
2019-07-25 13:50 ` [Fwd: [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms] Joe Perches
2019-07-25 13:58 ` Julia Lawall
2019-07-25 14:12 ` Joe Perches
2019-07-25 22:51 ` Julia Lawall
2019-07-26 6:15 ` [1/2] string: Add stracpy and stracpy_pad mechanisms Markus Elfring
2019-07-29 14:07 ` [Fwd: [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms] Julia Lawall
2019-07-29 16:28 ` Joe Perches
2019-07-23 21:36 ` [PATCH 1/2] string: Add stracpy and stracpy_pad mechanisms Kees Cook
2019-07-24 11:40 ` Joe Perches
2019-07-23 0:38 ` Joe Perches [this message]
2019-07-23 21:28 ` [PATCH 2/2] kernel-doc: core-api: Include string.h into core-api Kees Cook
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=224a6ebf39955f4107c0c376d66155d970e46733.1563841972.git.joe@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nitin.r.gote@intel.com \
--cc=rasmus.villemoes@prevas.dk \
--cc=steve@sk2.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).