aboutsummaryrefslogtreecommitdiff
path: root/libiberty/strstr.c
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>2005-04-02 19:57:12 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>2005-04-02 19:57:12 +0000
commitf9a9ac80d6a6b5a8e7d64d3d0c81e95fb0003238 (patch)
treeaffa924d98f9c5b1f7c2ae042a32d290d2648be3 /libiberty/strstr.c
parent577e5d76f980c812f7f26f6aeded7cda5049c5d7 (diff)
configure.ac (ac_libiberty_warn_cflags): Add -Wwrite-strings -Wstrict-prototypes.
* configure.ac (ac_libiberty_warn_cflags): Add -Wwrite-strings -Wstrict-prototypes. * configure, config.in: Regenerate. * bsearch.c, index.c, rindex.c, strstr.c, strtol.c, waitpid.c: Fix warnings and reconcile interfaces with relevant standards. From-SVN: r97456
Diffstat (limited to 'libiberty/strstr.c')
-rw-r--r--libiberty/strstr.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/libiberty/strstr.c b/libiberty/strstr.c
index ff8abd20f78..60902ea40ee 100644
--- a/libiberty/strstr.c
+++ b/libiberty/strstr.c
@@ -20,23 +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 */
+#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 *
-strstr (char *s1, char *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 (const char *);
-#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)
- {
- return (p);
- }
+ return (char *)p;
}
return (0);
}