Merge "Fix return value." into gingerbread
This commit is contained in:

committed by
Android (Google) Code Review

commit
6e42398dd6
@@ -38,18 +38,9 @@ void *memccpy(void *dst, const void *src, int c, size_t n)
|
|||||||
for (;;) {
|
for (;;) {
|
||||||
if (ch == c || p >= p_end) break;
|
if (ch == c || p >= p_end) break;
|
||||||
*q++ = ch = *p++;
|
*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 NULL;
|
||||||
|
|
||||||
return q;
|
return q;
|
||||||
|
Reference in New Issue
Block a user