From 099cdd5b03d503fcf31bc1a74a09b21b2cf63077 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 17 Jun 2010 22:04:51 +0000 Subject: 2010-06-18 Chris Johns * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths. --- cpukit/ChangeLog | 4 ++++ cpukit/libfs/src/rfs/rtems-rfs-block.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index cc2029c61a..9067df627c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,7 @@ +2010-06-18 Chris Johns + + * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths. + 2010-06-18 Chris Johns * libfs/src/rfs/rtems-rfs-file-system.h, diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.c b/cpukit/libfs/src/rfs/rtems-rfs-block.c index 49d24d1a87..5ffadcc284 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-block.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-block.c @@ -88,13 +88,15 @@ rtems_rfs_block_get_size (rtems_rfs_file_system* fs, rtems_rfs_block_size* size) { uint32_t offset; + uint64_t block_size; if (size->count == 0) return 0; if (size->offset == 0) offset = rtems_rfs_fs_block_size (fs); else offset = size->offset; - return (((uint64_t) (size->count - 1)) * rtems_rfs_fs_block_size (fs)) + offset; + block_size = rtems_rfs_fs_block_size (fs); + return (((uint64_t) (size->count - 1)) * block_size) + offset; } int -- cgit v1.2.3