diff options
| author | Chris Johns <chrisj@rtems.org> | 2010-06-17 22:04:51 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2010-06-17 22:04:51 +0000 |
| commit | 099cdd5b03d503fcf31bc1a74a09b21b2cf63077 (patch) | |
| tree | 054d9efa5a93682bb251c6eb7f5c03f878e75e47 | |
| parent | ca8c50deae081fed2b8e8a7d7ec86a974cb15cd5 (diff) | |
2010-06-18 Chris Johns <chrisj@rtems.org>
* libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths.
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-block.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index cc2029c61a..9067df627c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,9 @@ 2010-06-18 Chris Johns <chrisj@rtems.org> + * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths. + +2010-06-18 Chris Johns <chrisj@rtems.org> + * libfs/src/rfs/rtems-rfs-file-system.h, libfs/src/rfs/rtems-rfs-file-system.c: Move questionable macros to C functions. 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 |