diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2010-09-22 03:15:07 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2010-09-22 03:15:07 +0000 |
| commit | 60376287eb7a9ca1118b6a0cb30fe749beda7f48 (patch) | |
| tree | e7a7d70f6e1253b9eaf5d51f2a487f910f7b60bf /newlib/libc/string/memccpy.c | |
| parent | 5c22068f7f118a76430365d89433ab8bd392343d (diff) | |
| download | cygnal-60376287eb7a9ca1118b6a0cb30fe749beda7f48.tar.gz cygnal-60376287eb7a9ca1118b6a0cb30fe749beda7f48.tar.bz2 cygnal-60376287eb7a9ca1118b6a0cb30fe749beda7f48.zip | |
2010-09-21 Craig Howland <howland@LGSInnovations.com>
* libc/string/memcpy.c: Do not assign size_t parameter to int.
Use parameter directly, instead.
* libc/string/memccpy.c: Likewise.
* libc/string/mempcpy.c: Likewise.
* libc/string/memmove.c: Likewise.
Diffstat (limited to 'newlib/libc/string/memccpy.c')
| -rw-r--r-- | newlib/libc/string/memccpy.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c index f677ac02e..a6f45e8b3 100644 --- a/newlib/libc/string/memccpy.c +++ b/newlib/libc/string/memccpy.c @@ -92,12 +92,11 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0), _CONST char *src = src0; long *aligned_dst; _CONST long *aligned_src; - int len = len0; char endchar = endchar0 & 0xff; /* If the size is small, or either SRC or DST is unaligned, then punt into the byte copy loop. This should be rare. */ - if (!TOO_SMALL(len) && !UNALIGNED (src, dst)) + if (!TOO_SMALL(len0) && !UNALIGNED (src, dst)) { int i; unsigned long mask = 0; @@ -116,14 +115,14 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0), /* Copy one long word at a time if possible. */ - while (len >= LITTLEBLOCKSIZE) + while (len0 >= LITTLEBLOCKSIZE) { unsigned long buffer = (unsigned long)(*aligned_src); buffer ^= mask; if (DETECTNULL (buffer)) break; /* endchar is found, go byte by byte from here */ *aligned_dst++ = *aligned_src++; - len -= LITTLEBLOCKSIZE; + len0 -= LITTLEBLOCKSIZE; } /* Pick up any residual with a byte copier. */ @@ -131,7 +130,7 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0), src = (char*)aligned_src; } - while (len--) + while (len0--) { if ((*dst++ = *src++) == endchar) { |