commit 9579ee380c06f1ac6ca85c78d5172c82f10555d0
author rich cannings <richc@google.com> Tue Aug 31 15:52:47 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 31 15:52:47 2010 -0700
tree b46b7672cd03be650338446fb7e93137587f9ac9
parent 3fda8700bd042fbb7ac37e2bbe7496df8a087244
parent 6e42398dd66d1ec7d84257f78c07dcc7f29a2283

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

Merge commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into gingerbread-plus-aosp

* commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283':
  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;