change log for rtems (2010-06-16)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu Jun 17 04:12:16 UTC 2010


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.

M 1.2409  cpukit/ChangeLog
M 1.2346.2.29  cpukit/ChangeLog
M    1.9  cpukit/libfs/src/rfs/rtems-rfs-shell.c
M 1.7.2.2  cpukit/libfs/src/rfs/rtems-rfs-shell.c

diff -u rtems/cpukit/ChangeLog:1.2408 rtems/cpukit/ChangeLog:1.2409
--- rtems/cpukit/ChangeLog:1.2408	Wed Jun 16 22:08:59 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:13:32 2010
@@ -1,3 +1,7 @@
+2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
+
+	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
+
 2010-06-17	Chris Johns <chrisj at rtems.org>
 
 	libfs/src/rfs/rtems-rfs-bitmaps.h,
@@ -6,6 +10,7 @@
 
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
 

diff -u rtems/cpukit/ChangeLog:1.2346.2.28 rtems/cpukit/ChangeLog:1.2346.2.29
--- rtems/cpukit/ChangeLog:1.2346.2.28	Wed Jun 16 21:48:47 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:14:12 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
 

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.8 rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.9
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.8	Wed Jun 16 09:31:48 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c	Wed Jun 16 22:13:32 2010
@@ -19,6 +19,7 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
 #include <string.h>
 
 #include <rtems/rfs/rtems-rfs-block.h>
@@ -120,18 +121,18 @@
   int    ipcent;
 
   printf ("RFS Filesystem Data\n");
-  printf ("             flags: %08lx\n", fs->flags);
+  printf ("             flags: %08" PRIx32 "\n", fs->flags);
 #if 0
   printf ("            device: %08lx\n", rtems_rfs_fs_device (fs));
 #endif
   printf ("            blocks: %zu\n",  rtems_rfs_fs_blocks (fs));
   printf ("        block size: %zu\n",  rtems_rfs_fs_block_size (fs));
-  printf ("              size: %llu\n", rtems_rfs_fs_size (fs));
-  printf ("  media block size: %lu\n",  rtems_rfs_fs_media_block_size (fs));
-  printf ("        media size: %llu\n", rtems_rfs_fs_media_size (fs));
-  printf ("            inodes: %lu\n",  rtems_rfs_fs_inodes (fs));
-  printf ("        bad blocks: %lu\n",  fs->bad_blocks);
-  printf ("  max. name length: %lu\n",  rtems_rfs_fs_max_name (fs));
+  printf ("              size: %" PRIu64 "\n",  rtems_rfs_fs_size (fs));
+  printf ("  media block size: %" PRIu32 "\n",  rtems_rfs_fs_media_block_size (fs));
+  printf ("        media size: %" PRIu64 "\n", rtems_rfs_fs_media_size (fs));
+  printf ("            inodes: %" PRIu32 "\n",  rtems_rfs_fs_inodes (fs));
+  printf ("        bad blocks: %" PRIu32 "\n",  fs->bad_blocks);
+  printf ("  max. name length: %" PRIu32 "\n",  rtems_rfs_fs_max_name (fs));
   printf ("            groups: %d\n",   fs->group_count);
   printf ("      group blocks: %zd\n",  fs->group_blocks);
   printf ("      group inodes: %zd\n",  fs->group_inodes);
@@ -139,7 +140,7 @@
   printf ("  blocks per block: %zd\n",  fs->blocks_per_block);
   printf ("     singly blocks: %zd\n",  fs->block_map_singly_blocks);
   printf ("    doublly blocks: %zd\n",  fs->block_map_doubly_blocks);
-  printf (" max. held buffers: %ld\n",  fs->max_held_buffers);
+  printf (" max. held buffers: %" PRId32 "\n",  fs->max_held_buffers);
 
   rtems_rfs_shell_lock_rfs (fs);
 
@@ -182,18 +183,18 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: testing block state: block=%lu: (%d) %s\n",
+    printf ("error: testing block state: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
 
-  printf (" %5lu: block %s\n", block, state ? "allocated" : "free");
+  printf (" %5" PRIu32 ": block %s\n", block, state ? "allocated" : "free");
     
   rc = rtems_rfs_buffer_handle_open (fs, &buffer);
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: opening buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: opening buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -203,7 +204,7 @@
   {
     rtems_rfs_buffer_handle_close (fs, &buffer);
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: requesting buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: requesting buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -230,7 +231,7 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: closing buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: closing buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -304,7 +305,7 @@
   if ((start < 0) || (end < 0) ||
       (start >= total) || (end >= total))
   {
-    printf ("error: inode out of range (0->%ld).\n", total - 1);
+    printf ("error: inode out of range (0->%" PRId32 ").\n", total - 1);
     return 1;
   }
 
@@ -319,7 +320,7 @@
     if (rc > 0)
     {
       rtems_rfs_shell_unlock_rfs (fs);
-      printf ("error: testing inode state: ino=%lu: (%d) %s\n",
+      printf ("error: testing inode state: ino=%" PRIu32 ": (%d) %s\n",
               ino, rc, strerror (rc));
       return 1;
     }
@@ -333,7 +334,7 @@
       if (rc > 0)
       {
         rtems_rfs_shell_unlock_rfs (fs);
-        printf ("error: opening inode handle: ino=%lu: (%d) %s\n",
+        printf ("error: opening inode handle: ino=%" PRIu32 ": (%d) %s\n",
                 ino, rc, strerror (rc));
         return 1;
       }
@@ -368,7 +369,7 @@
 
       if (!error_check_only || error)
       {
-        printf (" %5lu: pos=%06lu:%04zx %c ",
+        printf (" %5" PRIu32 ": pos=%06" PRIu32 ":%04zx %c ",
                 ino, rtems_rfs_buffer_bnum (&inode.buffer),
                 inode.offset * RTEMS_RFS_INODE_SIZE,
                 allocated ? 'A' : 'F');
@@ -389,14 +390,14 @@
             type = "REG";
           else if (RTEMS_RFS_S_ISLNK (mode))
             type = "LNK";
-          printf ("links=%03i mode=%04x (%s/%03o) bo=%04u bc=%04lu b=[",
+          printf ("links=%03i mode=%04x (%s/%03o) bo=%04u bc=%04" PRIu32 " b=[",
                   rtems_rfs_inode_get_links (&inode),
                   mode, type, mode & ((1 << 10) - 1),
                   rtems_rfs_inode_get_block_offset (&inode),
                   rtems_rfs_inode_get_block_count (&inode));
           for (b = 0; b < (RTEMS_RFS_INODE_BLOCKS - 1); b++)
-            printf ("%lu ", rtems_rfs_inode_get_block (&inode, b));
-          printf ("%lu]\n", rtems_rfs_inode_get_block (&inode, b));
+            printf ("%" PRIu32 " ", rtems_rfs_inode_get_block (&inode, b));
+          printf ("%" PRIu32 "]\n", rtems_rfs_inode_get_block (&inode, b));
         }
       }
       
@@ -404,7 +405,7 @@
       if (rc > 0)
       {
         rtems_rfs_shell_unlock_rfs (fs);
-        printf ("error: closing inode handle: ino=%lu: (%d) %s\n",
+        printf ("error: closing inode handle: ino=%" PRIu32 ": (%d) %s\n",
                 ino, rc, strerror (rc));
         return 1;
       }
@@ -441,18 +442,18 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: testing block state: block=%lu: (%d) %s\n",
+    printf ("error: testing block state: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
 
-  printf (" %5lu: block %s\n", block, state ? "allocated" : "free");
+  printf (" %5" PRIu32 ": block %s\n", block, state ? "allocated" : "free");
 
   rc = rtems_rfs_buffer_handle_open (fs, &buffer);
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: opening buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: opening buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -462,7 +463,7 @@
   {
     rtems_rfs_buffer_handle_close (fs, &buffer);
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: requesting buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: requesting buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -493,13 +494,13 @@
     
     if ((eino < RTEMS_RFS_ROOT_INO) || (eino >= rtems_rfs_fs_inodes (fs)))
     {
-      printf (" %5d: entry ino appears corrupt: ino=%ld\n", entry, eino);
+      printf (" %5d: entry ino appears corrupt: ino=%" PRId32 "\n", entry, eino);
       break;
     }
     
     length = elength - RTEMS_RFS_DIR_ENTRY_SIZE;
     
-    printf (" %5d: %04x inode=%-6lu hash=%08lx name[%03u]=",
+    printf (" %5d: %04x inode=%-6" PRIu32 " hash=%08" PRIx32 " name[%03u]=",
             entry, b,
             rtems_rfs_dir_entry_ino (data),
             rtems_rfs_dir_entry_hash (data),
@@ -523,7 +524,7 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: closing buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: closing buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -575,7 +576,7 @@
     size_t           inodes;
     blocks = group->size - rtems_rfs_bitmap_map_free (&group->block_bitmap);
     inodes = fs->group_inodes - rtems_rfs_bitmap_map_free (&group->inode_bitmap);
-    printf (" %4d: base=%-7lu size=%-6zu blocks=%-5zu (%3zu%%) inode=%-5zu (%3zu%%)\n",
+    printf (" %4d: base=%-7" PRIu32 " size=%-6zu blocks=%-5zu (%3zu%%) inode=%-5zu (%3zu%%)\n",
             g, group->base, group->size,
             blocks, (blocks * 100)  / group->size,
             inodes, (inodes * 100) / fs->group_inodes);

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.7.2.1 rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.7.2.2
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c:1.7.2.1	Wed Jun 16 09:32:21 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-shell.c	Wed Jun 16 22:14:12 2010
@@ -19,6 +19,7 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
 #include <string.h>
 
 #include <rtems/rfs/rtems-rfs-block.h>
@@ -120,18 +121,18 @@
   int    ipcent;
 
   printf ("RFS Filesystem Data\n");
-  printf ("             flags: %08lx\n", fs->flags);
+  printf ("             flags: %08" PRIx32 "\n", fs->flags);
 #if 0
   printf ("            device: %08lx\n", rtems_rfs_fs_device (fs));
 #endif
   printf ("            blocks: %zu\n",  rtems_rfs_fs_blocks (fs));
   printf ("        block size: %zu\n",  rtems_rfs_fs_block_size (fs));
-  printf ("              size: %llu\n", rtems_rfs_fs_size (fs));
-  printf ("  media block size: %lu\n",  rtems_rfs_fs_media_block_size (fs));
-  printf ("        media size: %llu\n", rtems_rfs_fs_media_size (fs));
-  printf ("            inodes: %lu\n",  rtems_rfs_fs_inodes (fs));
-  printf ("        bad blocks: %lu\n",  fs->bad_blocks);
-  printf ("  max. name length: %lu\n",  rtems_rfs_fs_max_name (fs));
+  printf ("              size: %" PRIu64 "\n",  rtems_rfs_fs_size (fs));
+  printf ("  media block size: %" PRIu32 "\n",  rtems_rfs_fs_media_block_size (fs));
+  printf ("        media size: %" PRIu64 "\n", rtems_rfs_fs_media_size (fs));
+  printf ("            inodes: %" PRIu32 "\n",  rtems_rfs_fs_inodes (fs));
+  printf ("        bad blocks: %" PRIu32 "\n",  fs->bad_blocks);
+  printf ("  max. name length: %" PRIu32 "\n",  rtems_rfs_fs_max_name (fs));
   printf ("            groups: %d\n",   fs->group_count);
   printf ("      group blocks: %zd\n",  fs->group_blocks);
   printf ("      group inodes: %zd\n",  fs->group_inodes);
@@ -139,7 +140,7 @@
   printf ("  blocks per block: %zd\n",  fs->blocks_per_block);
   printf ("     singly blocks: %zd\n",  fs->block_map_singly_blocks);
   printf ("    doublly blocks: %zd\n",  fs->block_map_doubly_blocks);
-  printf (" max. held buffers: %ld\n",  fs->max_held_buffers);
+  printf (" max. held buffers: %" PRId32 "\n",  fs->max_held_buffers);
 
   rtems_rfs_shell_lock_rfs (fs);
 
@@ -182,18 +183,18 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: testing block state: block=%lu: (%d) %s\n",
+    printf ("error: testing block state: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
 
-  printf (" %5lu: block %s\n", block, state ? "allocated" : "free");
+  printf (" %5" PRIu32 ": block %s\n", block, state ? "allocated" : "free");
     
   rc = rtems_rfs_buffer_handle_open (fs, &buffer);
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: opening buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: opening buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -203,7 +204,7 @@
   {
     rtems_rfs_buffer_handle_close (fs, &buffer);
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: requesting buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: requesting buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -230,7 +231,7 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: closing buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: closing buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -304,7 +305,7 @@
   if ((start < 0) || (end < 0) ||
       (start >= total) || (end >= total))
   {
-    printf ("error: inode out of range (0->%ld).\n", total - 1);
+    printf ("error: inode out of range (0->%" PRId32 ").\n", total - 1);
     return 1;
   }
 
@@ -319,7 +320,7 @@
     if (rc > 0)
     {
       rtems_rfs_shell_unlock_rfs (fs);
-      printf ("error: testing inode state: ino=%lu: (%d) %s\n",
+      printf ("error: testing inode state: ino=%" PRIu32 ": (%d) %s\n",
               ino, rc, strerror (rc));
       return 1;
     }
@@ -333,7 +334,7 @@
       if (rc > 0)
       {
         rtems_rfs_shell_unlock_rfs (fs);
-        printf ("error: opening inode handle: ino=%lu: (%d) %s\n",
+        printf ("error: opening inode handle: ino=%" PRIu32 ": (%d) %s\n",
                 ino, rc, strerror (rc));
         return 1;
       }
@@ -368,7 +369,7 @@
 
       if (!error_check_only || error)
       {
-        printf (" %5lu: pos=%06lu:%04zx %c ",
+        printf (" %5" PRIu32 ": pos=%06" PRIu32 ":%04zx %c ",
                 ino, rtems_rfs_buffer_bnum (&inode.buffer),
                 inode.offset * RTEMS_RFS_INODE_SIZE,
                 allocated ? 'A' : 'F');
@@ -389,14 +390,14 @@
             type = "REG";
           else if (RTEMS_RFS_S_ISLNK (mode))
             type = "LNK";
-          printf ("links=%03i mode=%04x (%s/%03o) bo=%04u bc=%04lu b=[",
+          printf ("links=%03i mode=%04x (%s/%03o) bo=%04u bc=%04" PRIu32 " b=[",
                   rtems_rfs_inode_get_links (&inode),
                   mode, type, mode & ((1 << 10) - 1),
                   rtems_rfs_inode_get_block_offset (&inode),
                   rtems_rfs_inode_get_block_count (&inode));
           for (b = 0; b < (RTEMS_RFS_INODE_BLOCKS - 1); b++)
-            printf ("%lu ", rtems_rfs_inode_get_block (&inode, b));
-          printf ("%lu]\n", rtems_rfs_inode_get_block (&inode, b));
+            printf ("%" PRIu32 " ", rtems_rfs_inode_get_block (&inode, b));
+          printf ("%" PRIu32 "]\n", rtems_rfs_inode_get_block (&inode, b));
         }
       }
       
@@ -404,7 +405,7 @@
       if (rc > 0)
       {
         rtems_rfs_shell_unlock_rfs (fs);
-        printf ("error: closing inode handle: ino=%lu: (%d) %s\n",
+        printf ("error: closing inode handle: ino=%" PRIu32 ": (%d) %s\n",
                 ino, rc, strerror (rc));
         return 1;
       }
@@ -441,18 +442,18 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: testing block state: block=%lu: (%d) %s\n",
+    printf ("error: testing block state: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
 
-  printf (" %5lu: block %s\n", block, state ? "allocated" : "free");
+  printf (" %5" PRIu32 ": block %s\n", block, state ? "allocated" : "free");
 
   rc = rtems_rfs_buffer_handle_open (fs, &buffer);
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: opening buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: opening buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -462,7 +463,7 @@
   {
     rtems_rfs_buffer_handle_close (fs, &buffer);
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: requesting buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: requesting buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -493,13 +494,13 @@
     
     if ((eino < RTEMS_RFS_ROOT_INO) || (eino >= rtems_rfs_fs_inodes (fs)))
     {
-      printf (" %5d: entry ino appears corrupt: ino=%ld\n", entry, eino);
+      printf (" %5d: entry ino appears corrupt: ino=%" PRId32 "\n", entry, eino);
       break;
     }
     
     length = elength - RTEMS_RFS_DIR_ENTRY_SIZE;
     
-    printf (" %5d: %04x inode=%-6lu hash=%08lx name[%03u]=",
+    printf (" %5d: %04x inode=%-6" PRIu32 " hash=%08" PRIx32 " name[%03u]=",
             entry, b,
             rtems_rfs_dir_entry_ino (data),
             rtems_rfs_dir_entry_hash (data),
@@ -523,7 +524,7 @@
   if (rc > 0)
   {
     rtems_rfs_shell_unlock_rfs (fs);
-    printf ("error: closing buffer handle: block=%lu: (%d) %s\n",
+    printf ("error: closing buffer handle: block=%" PRIu32 ": (%d) %s\n",
             block, rc, strerror (rc));
     return 1;
   }
@@ -575,7 +576,7 @@
     size_t           inodes;
     blocks = group->size - rtems_rfs_bitmap_map_free (&group->block_bitmap);
     inodes = fs->group_inodes - rtems_rfs_bitmap_map_free (&group->inode_bitmap);
-    printf (" %4d: base=%-7lu size=%-6zu blocks=%-5zu (%3zu%%) inode=%-5zu (%3zu%%)\n",
+    printf (" %4d: base=%-7" PRIu32 " size=%-6zu blocks=%-5zu (%3zu%%) inode=%-5zu (%3zu%%)\n",
             g, group->base, group->size,
             blocks, (blocks * 100)  / group->size,
             inodes, (inodes * 100) / fs->group_inodes);


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.

M 1.2410  cpukit/ChangeLog
M 1.2346.2.30  cpukit/ChangeLog
M    1.7  cpukit/libfs/src/rfs/rtems-rfs-buffer.c
M 1.5.2.2  cpukit/libfs/src/rfs/rtems-rfs-buffer.c

diff -u rtems/cpukit/ChangeLog:1.2409 rtems/cpukit/ChangeLog:1.2410
--- rtems/cpukit/ChangeLog:1.2409	Wed Jun 16 22:13:32 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:16:41 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 
 2010-06-17	Chris Johns <chrisj at rtems.org>

diff -u rtems/cpukit/ChangeLog:1.2346.2.29 rtems/cpukit/ChangeLog:1.2346.2.30
--- rtems/cpukit/ChangeLog:1.2346.2.29	Wed Jun 16 22:14:12 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:16:51 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.6 rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.7
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.6	Tue Jun 15 08:35:28 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c	Wed Jun 16 22:16:41 2010
@@ -52,13 +52,13 @@
     buffer = (rtems_rfs_buffer*) node;
 
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-      printf ("%lu ", (rtems_rfs_buffer_block) ((intptr_t)(buffer->user)));
+      printf ("%" PRIuPTR " ", ((intptr_t) buffer->user));
 
     if (((rtems_rfs_buffer_block) ((intptr_t)(buffer->user))) == block)
     {
       if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-        printf (": found block=%lu\n",
-                (rtems_rfs_buffer_block) ((intptr_t)(buffer->user)));
+        printf (": found block=%" PRIuPTR "\n",
+                ((intptr_t)(buffer->user)));
 
       (*count)--;
       rtems_chain_extract (node);
@@ -95,7 +95,7 @@
       return 0;
 
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-      printf ("rtems-rfs: buffer-request: handle has buffer: %lu\n",
+      printf ("rtems-rfs: buffer-request: handle has buffer: %" PRIu32 "\n",
               rtems_rfs_buffer_bnum (handle));
 
     rc = rtems_rfs_buffer_handle_release (fs, handle);
@@ -171,7 +171,7 @@
     if (rc > 0)
     {
       if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-        printf ("rtems-rfs: buffer-request: block=%lu: bdbuf-%s: %d: %s\n",
+        printf ("rtems-rfs: buffer-request: block=%" PRIu32 ": bdbuf-%s: %d: %s\n",
                 block, read ? "read" : "get", rc, strerror (rc));
       return rc;
     }
@@ -188,7 +188,7 @@
   handle->bnum = block;
   
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-    printf ("rtems-rfs: buffer-request: block=%lu bdbuf-%s=%lu refs=%d\n",
+    printf ("rtems-rfs: buffer-request: block=%" PRIu32 " bdbuf-%s=%" PRIu32 " refs=%d\n",
             block, read ? "read" : "get", handle->buffer->block,
             handle->buffer->references);
   
@@ -204,7 +204,7 @@
   if (rtems_rfs_buffer_handle_has_block (handle))
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
-      printf ("rtems-rfs: buffer-release: block=%lu %s refs=%d %s\n",
+      printf ("rtems-rfs: buffer-release: block=%" PRIu32 " %s refs=%d %s\n",
               rtems_rfs_buffer_bnum (handle),
               rtems_rfs_buffer_dirty (handle) ? "(dirty)" : "",
               rtems_rfs_buffer_refs (handle),
@@ -242,8 +242,8 @@
           bool              modified;
         
           if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
-            printf ("rtems-rfs: buffer-release: local cache overflow:" \
-                    " %lu\n", fs->release_count + fs->release_modified_count);
+            printf ("rtems-rfs: buffer-release: local cache overflow:"
+                    " %" PRIu32 "\n", fs->release_count + fs->release_modified_count);
         
           if (fs->release_count > fs->release_modified_count)
           {
@@ -330,7 +330,7 @@
 #endif
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_SYNC))
-    printf ("rtems-rfs: buffer-open: blks=%ld, blk-size=%ld\n",
+    printf ("rtems-rfs: buffer-open: blks=%" PRId32 ", blk-size=%" PRId32 "\n",
             rtems_rfs_fs_media_blocks (fs),
             rtems_rfs_fs_media_block_size (fs));
   
@@ -442,7 +442,7 @@
   int               rc;
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-    printf ("rtems-rfs: release-chain: count=%lu\n", *count);
+    printf ("rtems-rfs: release-chain: count=%" PRIu32 "\n", *count);
 
   while (!rtems_chain_is_empty (chain))
   {
@@ -465,8 +465,8 @@
   int rc;
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_RELEASE))
-    printf ("rtems-rfs: buffers-release: active:%lu " \
-            "release:%lu release-modified:%lu\n",
+    printf ("rtems-rfs: buffers-release: active:%" PRIu32 " "
+            "release:%" PRIu32 " release-modified:%" PRIu32 "\n",
             fs->buffers_count, fs->release_count, fs->release_modified_count);
 
   rc = rtems_rfs_release_chain (&fs->release,

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.5.2.1 rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.5.2.2
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c:1.5.2.1	Tue Jun 15 08:35:53 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-buffer.c	Wed Jun 16 22:16:51 2010
@@ -52,13 +52,13 @@
     buffer = (rtems_rfs_buffer*) node;
 
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-      printf ("%lu ", (rtems_rfs_buffer_block) ((intptr_t)(buffer->user)));
+      printf ("%" PRIuPTR " ", ((intptr_t) buffer->user));
 
     if (((rtems_rfs_buffer_block) ((intptr_t)(buffer->user))) == block)
     {
       if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-        printf (": found block=%lu\n",
-                (rtems_rfs_buffer_block) ((intptr_t)(buffer->user)));
+        printf (": found block=%" PRIuPTR "\n",
+                ((intptr_t)(buffer->user)));
 
       (*count)--;
       rtems_chain_extract (node);
@@ -95,7 +95,7 @@
       return 0;
 
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-      printf ("rtems-rfs: buffer-request: handle has buffer: %lu\n",
+      printf ("rtems-rfs: buffer-request: handle has buffer: %" PRIu32 "\n",
               rtems_rfs_buffer_bnum (handle));
 
     rc = rtems_rfs_buffer_handle_release (fs, handle);
@@ -171,7 +171,7 @@
     if (rc > 0)
     {
       if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-        printf ("rtems-rfs: buffer-request: block=%lu: bdbuf-%s: %d: %s\n",
+        printf ("rtems-rfs: buffer-request: block=%" PRIu32 ": bdbuf-%s: %d: %s\n",
                 block, read ? "read" : "get", rc, strerror (rc));
       return rc;
     }
@@ -188,7 +188,7 @@
   handle->bnum = block;
   
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
-    printf ("rtems-rfs: buffer-request: block=%lu bdbuf-%s=%lu refs=%d\n",
+    printf ("rtems-rfs: buffer-request: block=%" PRIu32 " bdbuf-%s=%" PRIu32 " refs=%d\n",
             block, read ? "read" : "get", handle->buffer->block,
             handle->buffer->references);
   
@@ -204,7 +204,7 @@
   if (rtems_rfs_buffer_handle_has_block (handle))
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
-      printf ("rtems-rfs: buffer-release: block=%lu %s refs=%d %s\n",
+      printf ("rtems-rfs: buffer-release: block=%" PRIu32 " %s refs=%d %s\n",
               rtems_rfs_buffer_bnum (handle),
               rtems_rfs_buffer_dirty (handle) ? "(dirty)" : "",
               rtems_rfs_buffer_refs (handle),
@@ -242,8 +242,8 @@
           bool              modified;
         
           if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
-            printf ("rtems-rfs: buffer-release: local cache overflow:" \
-                    " %lu\n", fs->release_count + fs->release_modified_count);
+            printf ("rtems-rfs: buffer-release: local cache overflow:"
+                    " %" PRIu32 "\n", fs->release_count + fs->release_modified_count);
         
           if (fs->release_count > fs->release_modified_count)
           {
@@ -330,7 +330,7 @@
 #endif
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_SYNC))
-    printf ("rtems-rfs: buffer-open: blks=%ld, blk-size=%ld\n",
+    printf ("rtems-rfs: buffer-open: blks=%" PRId32 ", blk-size=%" PRId32 "\n",
             rtems_rfs_fs_media_blocks (fs),
             rtems_rfs_fs_media_block_size (fs));
   
@@ -442,7 +442,7 @@
   int               rc;
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
-    printf ("rtems-rfs: release-chain: count=%lu\n", *count);
+    printf ("rtems-rfs: release-chain: count=%" PRIu32 "\n", *count);
 
   while (!rtems_chain_is_empty (chain))
   {
@@ -465,8 +465,8 @@
   int rc;
 
   if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_RELEASE))
-    printf ("rtems-rfs: buffers-release: active:%lu " \
-            "release:%lu release-modified:%lu\n",
+    printf ("rtems-rfs: buffers-release: active:%" PRIu32 " "
+            "release:%" PRIu32 " release-modified:%" PRIu32 "\n",
             fs->buffers_count, fs->release_count, fs->release_modified_count);
 
   rc = rtems_rfs_release_chain (&fs->release,


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.

M 1.2411  cpukit/ChangeLog
M 1.2346.2.31  cpukit/ChangeLog
M    1.5  cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
M 1.4.2.1  cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c

diff -u rtems/cpukit/ChangeLog:1.2410 rtems/cpukit/ChangeLog:1.2411
--- rtems/cpukit/ChangeLog:1.2410	Wed Jun 16 22:16:41 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:36:01 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 

diff -u rtems/cpukit/ChangeLog:1.2346.2.30 rtems/cpukit/ChangeLog:1.2346.2.31
--- rtems/cpukit/ChangeLog:1.2346.2.30	Wed Jun 16 22:16:51 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:35:28 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4	Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c	Wed Jun 16 22:36:04 2010
@@ -22,6 +22,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems/rfs/rtems-rfs-file.h>
 #include "rtems-rfs-rtems.h"
 
@@ -51,7 +53,7 @@
   flags = 0;
 
   if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN))
-    printf("rtems-rfs: file-open: path:%s ino:%ld flags:%04lx mode:%04lx\n",
+    printf("rtems-rfs: file-open: path:%s ino:%" PRId32 " flags:%04" PRIx32 " mode:%04" PRIx32 "\n",
            pathname, ino, flags, mode);
 
   rtems_rfs_rtems_lock (fs);

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.4	Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c	Wed Jun 16 22:35:30 2010
@@ -22,6 +22,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems/rfs/rtems-rfs-file.h>
 #include "rtems-rfs-rtems.h"
 
@@ -51,7 +53,7 @@
   flags = 0;
 
   if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN))
-    printf("rtems-rfs: file-open: path:%s ino:%ld flags:%04lx mode:%04lx\n",
+    printf("rtems-rfs: file-open: path:%s ino:%" PRId32 " flags:%04" PRIx32 " mode:%04" PRIx32 "\n",
            pathname, ino, flags, mode);
 
   rtems_rfs_rtems_lock (fs);


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.

M 1.2412  cpukit/ChangeLog
M 1.2346.2.32  cpukit/ChangeLog
M    1.5  cpukit/libfs/src/rfs/rtems-rfs-file-system.c
M 1.4.2.1  cpukit/libfs/src/rfs/rtems-rfs-file-system.c

diff -u rtems/cpukit/ChangeLog:1.2411 rtems/cpukit/ChangeLog:1.2412
--- rtems/cpukit/ChangeLog:1.2411	Wed Jun 16 22:36:01 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:41:11 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.

diff -u rtems/cpukit/ChangeLog:1.2346.2.31 rtems/cpukit/ChangeLog:1.2346.2.32
--- rtems/cpukit/ChangeLog:1.2346.2.31	Wed Jun 16 22:35:28 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:41:20 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4	Mon Apr 12 00:29:25 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c	Wed Jun 16 22:41:12 2010
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems/rfs/rtems-rfs-data.h>
 #include <rtems/rfs/rtems-rfs-file-system.h>
 #include <rtems/rfs/rtems-rfs-inode.h>
@@ -79,7 +81,7 @@
       (RTEMS_RFS_VERSION * RTEMS_RFS_VERSION_MASK))
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_OPEN))
-      printf ("rtems-rfs: read-superblock: incompatible version: %08lx (%08x)\n",
+      printf ("rtems-rfs: read-superblock: incompatible version: %08" PRIx32 " (%08" PRIx32 ")\n",
               read_sb (RTEMS_RFS_SB_OFFSET_VERSION), RTEMS_RFS_VERSION_MASK);
     rtems_rfs_buffer_handle_close (fs, &handle);
     return EIO;
@@ -88,7 +90,7 @@
   if (read_sb (RTEMS_RFS_SB_OFFSET_INODE_SIZE) != RTEMS_RFS_INODE_SIZE)
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_OPEN))
-      printf ("rtems-rfs: read-superblock: inode size mismatch: fs:%ld target:%d\n",
+      printf ("rtems-rfs: read-superblock: inode size mismatch: fs:%" PRId32 " target:%" PRId32 "\n",
               read_sb (RTEMS_RFS_SB_OFFSET_VERSION), RTEMS_RFS_VERSION_MASK);
     rtems_rfs_buffer_handle_close (fs, &handle);
     return EIO;

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4	Mon Apr 12 00:29:25 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c	Wed Jun 16 22:41:21 2010
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems/rfs/rtems-rfs-data.h>
 #include <rtems/rfs/rtems-rfs-file-system.h>
 #include <rtems/rfs/rtems-rfs-inode.h>
@@ -79,7 +81,7 @@
       (RTEMS_RFS_VERSION * RTEMS_RFS_VERSION_MASK))
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_OPEN))
-      printf ("rtems-rfs: read-superblock: incompatible version: %08lx (%08x)\n",
+      printf ("rtems-rfs: read-superblock: incompatible version: %08" PRIx32 " (%08" PRIx32 ")\n",
               read_sb (RTEMS_RFS_SB_OFFSET_VERSION), RTEMS_RFS_VERSION_MASK);
     rtems_rfs_buffer_handle_close (fs, &handle);
     return EIO;
@@ -88,7 +90,7 @@
   if (read_sb (RTEMS_RFS_SB_OFFSET_INODE_SIZE) != RTEMS_RFS_INODE_SIZE)
   {
     if (rtems_rfs_trace (RTEMS_RFS_TRACE_OPEN))
-      printf ("rtems-rfs: read-superblock: inode size mismatch: fs:%ld target:%d\n",
+      printf ("rtems-rfs: read-superblock: inode size mismatch: fs:%" PRId32 " target:%" PRId32 "\n",
               read_sb (RTEMS_RFS_SB_OFFSET_VERSION), RTEMS_RFS_VERSION_MASK);
     rtems_rfs_buffer_handle_close (fs, &handle);
     return EIO;


 *ralf*:
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes.

M 1.2414  cpukit/ChangeLog
M    1.4  cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c

diff -u rtems/cpukit/ChangeLog:1.2413 rtems/cpukit/ChangeLog:1.2414
--- rtems/cpukit/ChangeLog:1.2413	Wed Jun 16 22:46:53 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:48:30 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.4
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.3	Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c	Wed Jun 16 22:48:31 2010
@@ -19,6 +19,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -201,7 +203,7 @@
   int                    rc;
 
   if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD))
-    printf ("rtems-rfs: dir-rmnod: parent:%ld doff:%lu, ino:%ld\n",
+    printf ("rtems-rfs: dir-rmnod: parent:%" PRId32 " doff:%" PRIu32 ", ino:%" PRId32 "\n",
             parent, doff, ino);
 
   if (ino == RTEMS_RFS_ROOT_INO)


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.

M 1.2413  cpukit/ChangeLog
M 1.2346.2.34  cpukit/ChangeLog
M 1.2346.2.33  cpukit/ChangeLog
M    1.6  cpukit/libfs/src/rfs/rtems-rfs-format.c
M 1.5.2.1  cpukit/libfs/src/rfs/rtems-rfs-format.c
M 1.3.2.1  cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c

diff -u rtems/cpukit/ChangeLog:1.2412 rtems/cpukit/ChangeLog:1.2413
--- rtems/cpukit/ChangeLog:1.2412	Wed Jun 16 22:41:11 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:46:53 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.

diff -u rtems/cpukit/ChangeLog:1.2346.2.33 rtems/cpukit/ChangeLog:1.2346.2.34
--- rtems/cpukit/ChangeLog:1.2346.2.33	Wed Jun 16 22:47:00 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:48:38 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.

diff -u rtems/cpukit/ChangeLog:1.2346.2.32 rtems/cpukit/ChangeLog:1.2346.2.33
--- rtems/cpukit/ChangeLog:1.2346.2.32	Wed Jun 16 22:41:20 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:47:00 2010
@@ -1,5 +1,6 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-rtems-file.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.5	Mon Apr 12 00:29:25 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c	Wed Jun 16 22:46:53 2010
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 #include <rtems/rfs/rtems-rfs-data.h>
 #include <rtems/rfs/rtems-rfs-file-system.h>
@@ -119,7 +120,7 @@
   
   if ((fs->block_size % rtems_rfs_fs_media_block_size (fs)) != 0)
   {
-    printf ("block size (%zd) is not a multiple of media block size (%ld)\n",
+    printf ("block size (%zd) is not a multiple of media block size (%" PRId32 ")\n",
             fs->block_size, rtems_rfs_fs_media_block_size (fs));
     return false;
   }
@@ -218,7 +219,7 @@
     group_size = rtems_rfs_fs_blocks (fs) - group_base;
 
   if (verbose)
-    printf ("\rrtems-rfs: format: group %3d: base = %ld, size = %zd",
+    printf ("\rrtems-rfs: format: group %3d: base = %" PRId32 ", size = %zd",
             group, group_base, group_size);
 
   /*
@@ -364,7 +365,7 @@
       if (rc > 0)
       {
         rtems_rfs_buffer_handle_close (fs, &handle);
-        printf ("\nrtems-rfs: write-group: group %3d: block %ld request failed: %d: %s\n",
+        printf ("\nrtems-rfs: write-group: group %3d: block %" PRId32 " request failed: %d: %s\n",
                 group, group_base + b + RTEMS_RFS_GROUP_INODE_BLOCK,
                 rc, strerror (rc));
         return false;
@@ -484,7 +485,7 @@
 
   if (ino != RTEMS_RFS_ROOT_INO)
   {
-    printf ("rtems-rfs: format: allocated inode not root ino: %ld\n", ino);
+    printf ("rtems-rfs: format: allocated inode not root ino: %" PRId32 "\n", ino);
     rtems_rfs_fs_close (fs);
     return rc;
   }
@@ -564,7 +565,7 @@
    */
   if (rtems_rfs_fs_media_block_size (&fs) == 0)
   {
-    printf ("rtems-rfs: media block is invalid: %lu\n",
+    printf ("rtems-rfs: media block is invalid: %" PRIu32 "\n",
             rtems_rfs_fs_media_block_size (&fs));
     return -1;
   }
@@ -577,13 +578,13 @@
 
   if (config->verbose)
   {
-    printf ("rtems-rfs: format: media size = %llu\n",
+    printf ("rtems-rfs: format: media size = %" PRIu64 "\n",
             rtems_rfs_fs_media_size (&fs));
-    printf ("rtems-rfs: format: media blocks = %ld\n",
+    printf ("rtems-rfs: format: media blocks = %" PRIu32 "\n",
             rtems_rfs_fs_media_blocks (&fs));
-    printf ("rtems-rfs: format: media block size = %lu\n",
+    printf ("rtems-rfs: format: media block size = %" PRIu32 "\n",
             rtems_rfs_fs_media_block_size (&fs));
-    printf ("rtems-rfs: format: size = %llu\n",
+    printf ("rtems-rfs: format: size = %" PRIu64 "\n",
             rtems_rfs_fs_size (&fs));
     printf ("rtems-rfs: format: blocks = %zu\n",
             rtems_rfs_fs_blocks (&fs));

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.5.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c:1.5	Mon Apr 12 00:29:25 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-format.c	Wed Jun 16 22:47:00 2010
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 #include <rtems/rfs/rtems-rfs-data.h>
 #include <rtems/rfs/rtems-rfs-file-system.h>
@@ -119,7 +120,7 @@
   
   if ((fs->block_size % rtems_rfs_fs_media_block_size (fs)) != 0)
   {
-    printf ("block size (%zd) is not a multiple of media block size (%ld)\n",
+    printf ("block size (%zd) is not a multiple of media block size (%" PRId32 ")\n",
             fs->block_size, rtems_rfs_fs_media_block_size (fs));
     return false;
   }
@@ -218,7 +219,7 @@
     group_size = rtems_rfs_fs_blocks (fs) - group_base;
 
   if (verbose)
-    printf ("\rrtems-rfs: format: group %3d: base = %ld, size = %zd",
+    printf ("\rrtems-rfs: format: group %3d: base = %" PRId32 ", size = %zd",
             group, group_base, group_size);
 
   /*
@@ -364,7 +365,7 @@
       if (rc > 0)
       {
         rtems_rfs_buffer_handle_close (fs, &handle);
-        printf ("\nrtems-rfs: write-group: group %3d: block %ld request failed: %d: %s\n",
+        printf ("\nrtems-rfs: write-group: group %3d: block %" PRId32 " request failed: %d: %s\n",
                 group, group_base + b + RTEMS_RFS_GROUP_INODE_BLOCK,
                 rc, strerror (rc));
         return false;
@@ -484,7 +485,7 @@
 
   if (ino != RTEMS_RFS_ROOT_INO)
   {
-    printf ("rtems-rfs: format: allocated inode not root ino: %ld\n", ino);
+    printf ("rtems-rfs: format: allocated inode not root ino: %" PRId32 "\n", ino);
     rtems_rfs_fs_close (fs);
     return rc;
   }
@@ -564,7 +565,7 @@
    */
   if (rtems_rfs_fs_media_block_size (&fs) == 0)
   {
-    printf ("rtems-rfs: media block is invalid: %lu\n",
+    printf ("rtems-rfs: media block is invalid: %" PRIu32 "\n",
             rtems_rfs_fs_media_block_size (&fs));
     return -1;
   }
@@ -577,13 +578,13 @@
 
   if (config->verbose)
   {
-    printf ("rtems-rfs: format: media size = %llu\n",
+    printf ("rtems-rfs: format: media size = %" PRIu64 "\n",
             rtems_rfs_fs_media_size (&fs));
-    printf ("rtems-rfs: format: media blocks = %ld\n",
+    printf ("rtems-rfs: format: media blocks = %" PRIu32 "\n",
             rtems_rfs_fs_media_blocks (&fs));
-    printf ("rtems-rfs: format: media block size = %lu\n",
+    printf ("rtems-rfs: format: media block size = %" PRIu32 "\n",
             rtems_rfs_fs_media_block_size (&fs));
-    printf ("rtems-rfs: format: size = %llu\n",
+    printf ("rtems-rfs: format: size = %" PRIu64 "\n",
             rtems_rfs_fs_size (&fs));
     printf ("rtems-rfs: format: blocks = %zu\n",
             rtems_rfs_fs_blocks (&fs));

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.3.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.3	Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c	Wed Jun 16 22:48:39 2010
@@ -19,6 +19,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -201,7 +203,7 @@
   int                    rc;
 
   if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD))
-    printf ("rtems-rfs: dir-rmnod: parent:%ld doff:%lu, ino:%ld\n",
+    printf ("rtems-rfs: dir-rmnod: parent:%" PRId32 " doff:%" PRIu32 ", ino:%" PRId32 "\n",
             parent, doff, ino);
 
   if (ino == RTEMS_RFS_ROOT_INO)


 *ralf* (on branch rtems-4-10-branch):
2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/rfs/rtems-rfs-file-system.h: Revert previous change.
	Force RTEMS_RFS_VERSION_MASK to be 32bit.

M 1.2415  cpukit/ChangeLog
M 1.2346.2.35  cpukit/ChangeLog
M    1.6  cpukit/libfs/src/rfs/rtems-rfs-file-system.h
M 1.3.2.3  cpukit/libfs/src/rfs/rtems-rfs-file-system.h

diff -u rtems/cpukit/ChangeLog:1.2414 rtems/cpukit/ChangeLog:1.2415
--- rtems/cpukit/ChangeLog:1.2414	Wed Jun 16 22:48:30 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:57:11 2010
@@ -1,5 +1,7 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-file-system.h: Revert previous change.
+	Force RTEMS_RFS_VERSION_MASK to be 32bit.
 	* libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.

diff -u rtems/cpukit/ChangeLog:1.2346.2.34 rtems/cpukit/ChangeLog:1.2346.2.35
--- rtems/cpukit/ChangeLog:1.2346.2.34	Wed Jun 16 22:48:38 2010
+++ rtems/cpukit/ChangeLog	Wed Jun 16 22:57:16 2010
@@ -1,5 +1,7 @@
 2010-06-17	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-file-system.h: Revert previous change.
+	Force RTEMS_RFS_VERSION_MASK to be 32bit.
 	* libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes.
 	* libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes.

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.5	Wed Jun 16 09:39:14 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h	Wed Jun 16 22:57:11 2010
@@ -46,7 +46,7 @@
  * RFS Version Number Mask. The mask determines which bits of the version
  * number indicate compatility issues.
  */
-#define RTEMS_RFS_VERSION_MASK (0x00000000)
+#define RTEMS_RFS_VERSION_MASK INT32_C(0x00000000)
 
 /**
  * The root inode number. Do not use 0 as this has special meaning in some Unix
@@ -308,7 +308,7 @@
  *
  * @param _fs Pointer to the file system.
  */
-#define rtems_rfs_fs_size(_fs) (rtems_rfs_fs_blocks (_fs) * \
+#define rtems_rfs_fs_size(_fs) (((uint64_t) rtems_rfs_fs_blocks (_fs)) * \
                                 rtems_rfs_fs_block_size (_fs))
 
 /**

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.2 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.3
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.2	Wed Jun 16 09:40:50 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h	Wed Jun 16 22:57:17 2010
@@ -46,7 +46,7 @@
  * RFS Version Number Mask. The mask determines which bits of the version
  * number indicate compatility issues.
  */
-#define RTEMS_RFS_VERSION_MASK (0x00000000)
+#define RTEMS_RFS_VERSION_MASK INT32_C(0x00000000)
 
 /**
  * The root inode number. Do not use 0 as this has special meaning in some Unix
@@ -308,7 +308,7 @@
  *
  * @param _fs Pointer to the file system.
  */
-#define rtems_rfs_fs_size(_fs) (rtems_rfs_fs_blocks (_fs) * \
+#define rtems_rfs_fs_size(_fs) (((uint64_t) rtems_rfs_fs_blocks (_fs)) * \
                                 rtems_rfs_fs_block_size (_fs))
 
 /**



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100616/83778899/attachment-0001.html>


More information about the vc mailing list