diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-15 13:35:28 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-06-15 13:35:28 +0000 |
commit | 06e04f89bc4f75d9745e474ac2196cf7a9ea6301 (patch) | |
tree | e3dc146883c2fa6e90e33a887aed0e0d7419f5e6 /cpukit/libfs/src/rfs/rtems-rfs-block.c | |
parent | 2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-06e04f89bc4f75d9745e474ac2196cf7a9ea6301.tar.bz2 |
2010-06-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-block.c, libfs/src/rfs/rtems-rfs-buffer.c,
libnetworking/nfs/bootp_subr.c: Misc. 64bit-compatibility fixes.
Diffstat (limited to 'cpukit/libfs/src/rfs/rtems-rfs-block.c')
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-block.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.c b/cpukit/libfs/src/rfs/rtems-rfs-block.c index ddd790b018..49d24d1a87 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-block.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-block.c @@ -38,6 +38,8 @@ #include "config.h" #endif +#include <inttypes.h> + #include <rtems/rfs/rtems-rfs-block.h> #include <rtems/rfs/rtems-rfs-data.h> #include <rtems/rfs/rtems-rfs-group.h> @@ -224,8 +226,8 @@ rtems_rfs_block_find_indirect (rtems_rfs_file_system* fs, if (*result >= rtems_rfs_fs_blocks (fs)) { if (rtems_rfs_trace (RTEMS_RFS_TRACE_BLOCK_FIND)) - printf ("rtems-rfs: block-find: invalid block in table:" \ - " block=%ld, indirect=%ld/%d\n", *result, block, offset); + printf ("rtems-rfs: block-find: invalid block in table:" + " block=%" PRId32 ", indirect=%" PRId32 "/%d\n", *result, block, offset); *result = 0; rc = EIO; } @@ -394,7 +396,7 @@ rtems_rfs_block_map_indirect_alloc (rtems_rfs_file_system* fs, { int b; if (rtems_rfs_trace (RTEMS_RFS_TRACE_BLOCK_MAP_GROW)) - printf ("rtems-rfs: block-map-grow: upping: block-count=%ld\n", + printf ("rtems-rfs: block-map-grow: upping: block-count=%" PRId32 "\n", map->size.count); for (b = 0; b < RTEMS_RFS_INODE_BLOCKS; b++) rtems_rfs_block_set_number (buffer, b, map->blocks[b]); @@ -415,9 +417,9 @@ rtems_rfs_block_map_grow (rtems_rfs_file_system* fs, int b; if (rtems_rfs_trace (RTEMS_RFS_TRACE_BLOCK_MAP_GROW)) - printf ("rtems-rfs: block-map-grow: entry: blocks=%zd count=%lu\n", + printf ("rtems-rfs: block-map-grow: entry: blocks=%zd count=%" PRIu32 "\n", blocks, map->size.count); - + if ((map->size.count + blocks) >= rtems_rfs_fs_max_block_map_blocks (fs)) return EFBIG; @@ -657,7 +659,7 @@ rtems_rfs_block_map_shrink (rtems_rfs_file_system* fs, size_t blocks) { if (rtems_rfs_trace (RTEMS_RFS_TRACE_BLOCK_MAP_SHRINK)) - printf ("rtems-rfs: block-map-shrink: entry: blocks=%zd count=%lu\n", + printf ("rtems-rfs: block-map-shrink: entry: blocks=%zd count=%" PRIu32 "\n", blocks, map->size.count); if (map->size.count == 0) |