From: Ahmad Fatoum <a.fatoum@pengutronix.de> To: barebox@lists.infradead.org Cc: Ahmad Fatoum <a.fatoum@pengutronix.de> Subject: [PATCH v2 1/2] string: implement strchrnul Date: Mon, 28 Jun 2021 07:19:33 +0200 Message-ID: <20210628051934.9604-1-a.fatoum@pengutronix.de> (raw) We have at least two places opencoding strchrnul, one of them needlessly iterating twice instead of once over the string. Replace both by calling a common single pass implementation. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- v1 -> v2: no change --- commands/hwclock.c | 8 -------- drivers/of/base.c | 5 +---- include/linux/string.h | 4 ++++ lib/string.c | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/commands/hwclock.c b/commands/hwclock.c index 1b5c2cd100ca..7a5600c456c9 100644 --- a/commands/hwclock.c +++ b/commands/hwclock.c @@ -9,14 +9,6 @@ #include <string.h> #include <environment.h> -static char *strchrnul(const char *s, int c) -{ - while (*s != '\0' && *s != c) - s++; - - return (char *)s; -} - static int sscanf_two_digits(char *s, int *res) { char buf[3]; diff --git a/drivers/of/base.c b/drivers/of/base.c index f962159597df..1a1265bdd689 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2497,10 +2497,7 @@ struct device_node *of_get_stdoutpath(void) if (!name) return 0; - /* This could make use of strchrnul if it were available */ - p = strchr(name, ':'); - if (!p) - p = name + strlen(name); + p = strchrnul(name, ':'); q = xstrndup(name, p - name); diff --git a/include/linux/string.h b/include/linux/string.h index 55bc905c0e6b..47a27a391f0b 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -25,6 +25,10 @@ extern __kernel_size_t strspn(const char *,const char *); (typeof(&(s1)[0]))(_strstr((s1), (s2))); \ }) +#ifndef __HAVE_ARCH_STRCHRNUL +extern char * strchrnul(const char *,int); +#endif + /* * Include machine specific inline routines */ diff --git a/lib/string.c b/lib/string.c index bad186586fac..9aeb1d883022 100644 --- a/lib/string.c +++ b/lib/string.c @@ -274,6 +274,24 @@ char * _strchr(const char * s, int c) #endif EXPORT_SYMBOL(_strchr); +#ifndef __HAVE_ARCH_STRCHRNUL +/** + * strchrnul - Find and return a character in a string, or end of string + * @s: The string to be searched + * @c: The character to search for + * + * Returns pointer to first occurrence of 'c' in s. If c is not found, then + * return a pointer to the null byte at the end of s. + */ +char *strchrnul(const char *s, int c) +{ + while (*s && *s != (char)c) + s++; + return (char *)s; +} +EXPORT_SYMBOL(strchrnul); +#endif + #ifndef __HAVE_ARCH_STRRCHR /** * strrchr - Find the last occurrence of a character in a string -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2021-06-28 5:24 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-28 5:19 Ahmad Fatoum [this message] 2021-06-28 5:19 ` [PATCH v2 2/2] console: respect baudrate specified in device-tree stdout-path Ahmad Fatoum 2021-06-28 12:50 ` [PATCH v2 1/2] string: implement strchrnul Sascha Hauer
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=20210628051934.9604-1-a.fatoum@pengutronix.de \ --to=a.fatoum@pengutronix.de \ --cc=barebox@lists.infradead.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
mail archive of the barebox mailing list This inbox may be cloned and mirrored by anyone: git clone --mirror https://lore.pengutronix.de/barebox/0 barebox/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 barebox barebox/ https://lore.pengutronix.de/barebox \ barebox@lists.infradead.org barebox@lists.infradead.org public-inbox-index barebox Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git