From: Alex Riesen <raa.lkml@gmail.com>
To: Li Zefan <lizf@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>, Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 4/7] lib: Introduce strnstr()
Date: Sat, 16 Jan 2010 12:12:57 +0100 [thread overview]
Message-ID: <81b0412b1001160312x3874bbddj28aac9e5a36bf98a@mail.gmail.com> (raw)
In-Reply-To: <4B4E8743.6030805@cn.fujitsu.com>
On Thu, Jan 14, 2010 at 03:53, Li Zefan <lizf@cn.fujitsu.com> wrote:
> @@ -667,7 +667,7 @@ EXPORT_SYMBOL(memscan);
> */
> char *strstr(const char *s1, const char *s2)
> {
> - int l1, l2;
> + size_t l1, l2;
>
This chunk is not related, is it?
> @@ -684,6 +684,31 @@ char *strstr(const char *s1, const char *s2)
> EXPORT_SYMBOL(strstr);
> #endif
>
> +#ifndef __HAVE_ARCH_STRNSTR
> +/**
> + * strnstr - Find the first substring in a length-limited string
> + * @s1: The string to be searched
> + * @s2: The string to search for
> + * @len: the maximum number of characters to search
> + */
> +char *strnstr(const char *s1, const char *s2, size_t len)
> +{
> + size_t l1 = len, l2;
Are you sure you want to search _past_ the NUL-terminator
of s1?
> + l2 = strlen(s2);
> + if (!l2)
> + return (char *)s1;
> + while (l1 >= l2) {
> + l1--;
> + if (!memcmp(s1, s2, l2))
> + return (char *)s1;
> + s1++;
> + }
> + return NULL;
> +}
next prev parent reply other threads:[~2010-01-16 11:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 2:52 [PATCH 0/7][RESEND] tracing: Fix bugs in string filters Li Zefan
2010-01-14 2:53 ` [PATCH 1/7] ftrace: Fix MATCH_END_ONLY function filter Li Zefan
2010-01-16 9:42 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:53 ` [PATCH 2/7] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:53 ` [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY " Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:53 ` [PATCH 4/7] lib: Introduce strnstr() Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-16 11:12 ` Alex Riesen [this message]
2010-01-18 14:53 ` [PATCH 4/7] " Steven Rostedt
2010-01-18 15:56 ` Alex Riesen
2010-01-14 2:54 ` [PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:54 ` [PATCH 6/7] tracing/filters: Fix MATCH_END_ONLY filter matching for PTR_STRING Li Zefan
2010-01-16 9:44 ` [tip:tracing/urgent] tracing/filters: Fix MATCH_FULL " tip-bot for Li Zefan
2010-01-14 2:54 ` [PATCH 7/7] tracing/filters: Add comment for match callbacks Li Zefan
2010-01-16 9:44 ` [tip:tracing/urgent] " tip-bot for Li Zefan
-- strict thread matches above, loose matches on Subject: below --
2009-12-14 3:57 [PATCH 0/7] tracing: Fix bugs in string filters Li Zefan
2009-12-14 3:58 ` [PATCH 4/7] lib: Introduce strnstr() Li Zefan
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=81b0412b1001160312x3874bbddj28aac9e5a36bf98a@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.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
all inboxes | Powered by JetHome®