diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-13 16:50:09 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-15 07:01:42 +0200 |
commit | e2d8e8c24c391a779aca009f1f5589ae335c3dfd (patch) | |
tree | 2b5c89b07e3790ac6eb805d19807d12a10fc2824 /fs | |
parent | 3dc08c3056464e5fcd3b8152e83fadb88b6ea1a6 (diff) | |
download | barebox-e2d8e8c24c391a779aca009f1f5589ae335c3dfd.tar.gz barebox-e2d8e8c24c391a779aca009f1f5589ae335c3dfd.tar.xz |
mem: Fix memcpy_sz variable types
- Drop usage of 'ulong', use unsigned long
- remove unnecessary intermediate casting to unsigned long
- Use proper u8/u16/u32 types. Fixes 64bit systems on which ulong is 64bit
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -1564,14 +1564,11 @@ out: } EXPORT_SYMBOL(rmdir); -static void memcpy_sz(void *_dst, const void *_src, ulong count, ulong rwsize) +static void memcpy_sz(void *dst, const void *src, size_t count, int rwsize) { - ulong dst = (ulong)_dst; - ulong src = (ulong)_src; - /* no rwsize specification given. Do whatever memcpy likes best */ if (!rwsize) { - memcpy(_dst, _src, count); + memcpy(dst, src, count); return; } @@ -1582,13 +1579,13 @@ static void memcpy_sz(void *_dst, const void *_src, ulong count, ulong rwsize) while (count-- > 0) { switch (rwsize) { case 1: - *((u_char *)dst) = *((u_char *)src); + *((u8 *)dst) = *((u8 *)src); break; case 2: - *((ushort *)dst) = *((ushort *)src); + *((u16 *)dst) = *((u16 *)src); break; case 4: - *((ulong *)dst) = *((ulong *)src); + *((u32 *)dst) = *((u32 *)src); break; } dst += rwsize; |