commit 964a14d0dd494055d14e2b8ee35ed9394b991c28
author rich cannings <richc@google.com> Tue Aug 31 15:55:44 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 31 15:55:44 2010 -0700
tree 05fac7d9ab91625707085a2a88efd2c358259660
parent a93baa9fc672174e1cddf4a608e4f4b063344e7a
parent 9579ee380c06f1ac6ca85c78d5172c82f10555d0

am 9579ee38: am 6e42398d: Merge "Fix return value." into gingerbread

Merge commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0'

* commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0':
  Fix return value.

libc/string/memccpy.c

diff --git a/libc/string/memccpy.c b/libc/string/memccpy.c
index 2689e80..789fde6 100644
--- a/libc/string/memccpy.c
+++ b/libc/string/memccpy.c
@@ -38,18 +38,9 @@
     for (;;) {
         if (ch == c || p >= p_end) break;
         *q++ = ch = *p++;
-
-        if (ch == c || p >= p_end) break;
-        *q++ = ch = *p++;
-
-        if (ch == c || p >= p_end) break;
-        *q++ = ch = *p++;
-
-        if (ch == c || p >= p_end) break;
-        *q++ = ch = *p++;
     }
 
-    if (p >= p_end)
+    if (p >= p_end && ch != c)
         return NULL;
 
     return q;