projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re: Use __asm__ rather than asm in ld testsuite
[deliverable/binutils-gdb.git]
/
libiberty
/
strstr.c
diff --git
a/libiberty/strstr.c
b/libiberty/strstr.c
index ffe1d10fc9ef5f6e241cc7b8be1344943ef88a33..60902ea40ee80b513a525f9403728398ea876d7e 100644
(file)
--- a/
libiberty/strstr.c
+++ b/
libiberty/strstr.c
@@
-7,7
+7,7
@@
This function searches for the substring @var{sub} in the string
@var{string}, not including the terminating null characters. A pointer
This function searches for the substring @var{sub} in the string
@var{string}, not including the terminating null characters. A pointer
-to the first occurrence of @var{sub} is returned, or
NULL
if the
+to the first occurrence of @var{sub} is returned, or
@code{NULL}
if the
substring is absent. If @var{sub} points to a string with zero
length, the function returns @var{string}.
substring is absent. If @var{sub} points to a string with zero
length, the function returns @var{string}.
@@
-20,24
+20,22
@@
length, the function returns @var{string}.
/* FIXME: The above description is ANSI compiliant. This routine has not
been validated to comply with it. -fnf */
/* FIXME: The above description is ANSI compiliant. This routine has not
been validated to comply with it. -fnf */
+#include <stddef.h>
+
+extern char *strchr (const char *, int);
+extern int strncmp (const void *, const void *, size_t);
+extern size_t strlen (const char *);
+
char *
char *
-strstr (s1, s2)
- char *s1, *s2;
+strstr (const char *s1, const char *s2)
{
{
- register char *p = s1;
- extern char *strchr ();
- extern int strncmp ();
-#if __GNUC__==2
- extern __SIZE_TYPE__ strlen ();
-#endif
- register int len = strlen (s2);
+ const char *p = s1;
+ const size_t len = strlen (s2);
for (; (p = strchr (p, *s2)) != 0; p++)
{
if (strncmp (p, s2, len) == 0)
for (; (p = strchr (p, *s2)) != 0; p++)
{
if (strncmp (p, s2, len) == 0)
- {
- return (p);
- }
+ return (char *)p;
}
return (0);
}
}
return (0);
}
This page took
0.02779 seconds
and
4
git commands to generate.