aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-01-30 13:40:43 +0000
committerUlrich Drepper <drepper@redhat.com>1998-01-30 13:40:43 +0000
commit9aae565a5699c6486a0ffd9a1528cf7719319d1b (patch)
tree9bd4089cf0bbca6fa3403686f352ca0e9f8a4608
parent9931ba241298969e46854d23491da21dfcbf1e23 (diff)
downloadglibc-9aae565a5699c6486a0ffd9a1528cf7719319d1b.zip
glibc-9aae565a5699c6486a0ffd9a1528cf7719319d1b.tar.gz
glibc-9aae565a5699c6486a0ffd9a1528cf7719319d1b.tar.bz2
Update.
1998-01-30 22:37 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/memmem.c: Correct last change.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/generic/memmem.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b99c3a8..c825466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-01-30 22:37 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/generic/memmem.c: Correct last change.
+
1998-01-30 22:12 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Makefile [$(subdir)==nis]: Define
diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c
index 482ab6a..9e32f51 100644
--- a/sysdeps/generic/memmem.c
+++ b/sysdeps/generic/memmem.c
@@ -36,7 +36,7 @@ memmem (haystack, haystack_len, needle, needle_len)
if (needle_len == 0)
/* The first occurrence of the empty string is deemed to occur at
the beginning of the string. */
- return (void *) &((const char *) haystack);
+ return (void *) haystack;
for (begin = (const char *) haystack; begin <= last_possible; ++begin)
if (begin[0] == ((const char *) needle)[0] &&