aboutsummaryrefslogtreecommitdiff
path: root/jerry-libc
diff options
context:
space:
mode:
authorZoltan Herczeg <zherczeg.u-szeged@partner.samsung.com>2016-06-24 04:02:45 -0700
committerZoltan Herczeg <zherczeg.u-szeged@partner.samsung.com>2016-06-26 23:45:58 -0700
commit0940be57f6897d5adbb6bc8d47789dfee4e91c98 (patch)
tree16217b2b6b97013842577bd720172bc771f2e8d0 /jerry-libc
parent388b442d10522aedaa0d43496e0cf1a2ee83aa0d (diff)
Fix memcpy return value.
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
Diffstat (limited to 'jerry-libc')
-rw-r--r--jerry-libc/jerry-libc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/jerry-libc/jerry-libc.c b/jerry-libc/jerry-libc.c
index fbfda73e..e8592bb0 100644
--- a/jerry-libc/jerry-libc.c
+++ b/jerry-libc/jerry-libc.c
@@ -103,30 +103,30 @@ memcpy (void *s1, /**< destination */
const void *s2, /**< source */
size_t n) /**< bytes number */
{
+ uint8_t *dst_p = (uint8_t *) s1;
+ const uint8_t *src_p = (const uint8_t *) s2;
+
/* Aligned fast case. */
if (n >= 4 && !(((uintptr_t) s1) & 0x3) && !(((uintptr_t) s2) & 0x3))
{
size_t chunks = (n >> 2);
- uint32_t *area1_p = (uint32_t *) s1;
- const uint32_t *area2_p = (const uint32_t *) s2;
+ uint32_t *u32_dst_p = (uint32_t *) dst_p;
+ const uint32_t *u32_src_p = (const uint32_t *) src_p;
do
{
- *area1_p++ = *area2_p++;
+ *u32_dst_p++ = *u32_src_p++;
}
while (--chunks);
n &= 0x3;
- s1 = area1_p;
- s2 = area2_p;
+ dst_p = (uint8_t *) u32_dst_p;
+ src_p = (const uint8_t *) u32_src_p;
}
- uint8_t *area1_p = (uint8_t *) s1;
- const uint8_t *area2_p = (const uint8_t *) s2;
-
while (n--)
{
- *area1_p++ = *area2_p++;
+ *dst_p++ = *src_p++;
}
return s1;