change log for rtems (2010-06-16)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Jun 17 03:12:19 UTC 2010
*ccj*:
2010-06-17 Chris Johns <chrisj at rtems.org>
libfs/src/rfs/rtems-rfs-bitmaps.h,
libfs/src/rfs/rtems-rfs-block-pos.h,
libfs/src/rfs/rtems-rfs-block.h: PR 1556. Struct clean up.
M 1.2408 cpukit/ChangeLog
M 1.3 cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h
M 1.4 cpukit/libfs/src/rfs/rtems-rfs-block-pos.h
M 1.3 cpukit/libfs/src/rfs/rtems-rfs-block.h
diff -u rtems/cpukit/ChangeLog:1.2407 rtems/cpukit/ChangeLog:1.2408
--- rtems/cpukit/ChangeLog:1.2407 Wed Jun 16 21:48:36 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 22:08:59 2010
@@ -1,3 +1,9 @@
+2010-06-17 Chris Johns <chrisj at rtems.org>
+
+ libfs/src/rfs/rtems-rfs-bitmaps.h,
+ libfs/src/rfs/rtems-rfs-block-pos.h,
+ libfs/src/rfs/rtems-rfs-block.h: PR 1556. Struct clean up.
+
2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h:1.2 rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h:1.3
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h:1.2 Wed Jun 16 09:39:14 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h Wed Jun 16 22:09:00 2010
@@ -99,7 +99,7 @@
/**
* The bitmap control is a simple way to manage the various parts of a bitmap.
*/
-typedef struct _rtems_rfs_bitmap_control
+typedef struct rtems_rfs_bitmap_control_s
{
rtems_rfs_buffer_handle* buffer; //< Handle the to buffer with the bit
//map.
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h:1.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h:1.4
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h:1.3 Wed Jun 16 09:39:14 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h Wed Jun 16 22:09:00 2010
@@ -47,7 +47,7 @@
* block field can be used hold a block number for the position as a look up
* cache.
*/
-typedef struct _rtems_rfs_block_pos
+typedef struct rtems_rfs_block_pos_s
{
/**
* The block index in the map. Range is from 0 to the maps block count minus
@@ -110,8 +110,8 @@
* @param bpos Pointer to the block position to fill in.
* @return rtems_rfs_pos The absolute offset.
*/
-rtems_rfs_pos rtems_rfs_block_get_pos (rtems_rfs_file_system* fs,
- rtems_rfs_block_pos* bpos);
+rtems_rfs_pos rtems_rfs_block_get_pos (rtems_rfs_file_system* fs,
+ rtems_rfs_block_pos* bpos);
/**
* Add the relative position to the block position. The relative position is
@@ -136,7 +136,7 @@
* A block size is the number of blocks less one plus the offset where the
* offset must be less than the block size.
*/
-typedef struct _rtems_rfs_block_size
+typedef struct rtems_rfs_block_size_s
{
/**
* The count of blocks in a map. A 0 means no blocks and a zero length and
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-block.h:1.2 rtems/cpukit/libfs/src/rfs/rtems-rfs-block.h:1.3
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-block.h:1.2 Sat Jun 12 00:18:02 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-block.h Wed Jun 16 22:09:00 2010
@@ -86,7 +86,7 @@
* @li 2,684,354,560 bytes for a 2048 byte block size, and
* @li 21,474,836,480 bytes for a 4096 byte block size.
*/
-typedef struct rtems_rfs_block_map_t
+typedef struct rtems_rfs_block_map_s
{
/**
* Is the map dirty ?
*ralf* (on branch rtems-4-10-branch):
2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
M 1.2406 cpukit/ChangeLog
M 1.2346.2.27 cpukit/ChangeLog
M 1.5 cpukit/libfs/src/rfs/rtems-rfs-group.c
M 1.4.2.1 cpukit/libfs/src/rfs/rtems-rfs-group.c
diff -u rtems/cpukit/ChangeLog:1.2405 rtems/cpukit/ChangeLog:1.2406
--- rtems/cpukit/ChangeLog:1.2405 Wed Jun 16 14:12:19 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 21:44:49 2010
@@ -1,3 +1,7 @@
+2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
+
2010-06-16 Joel Sherrill <joel.sherrilL at OARcorp.com>
PR 1453/cpukit
diff -u rtems/cpukit/ChangeLog:1.2346.2.26 rtems/cpukit/ChangeLog:1.2346.2.27
--- rtems/cpukit/ChangeLog:1.2346.2.26 Wed Jun 16 14:12:04 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 21:44:54 2010
@@ -1,3 +1,7 @@
+2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
+
2010-06-16 Joel Sherrill <joel.sherrilL at OARcorp.com>
PR 1453/cpukit
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.4 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c Wed Jun 16 21:44:49 2010
@@ -22,6 +22,8 @@
#include "config.h"
#endif
+#include <inttypes.h>
+
#include <rtems/rfs/rtems-rfs-file-system.h>
#include <rtems/rfs/rtems-rfs-group.h>
@@ -46,7 +48,7 @@
size = rtems_rfs_fs_blocks (fs) - base;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_OPEN))
- printf ("rtems-rfs: group-open: base=%ld, blocks=%zd inodes=%zd\n",
+ printf ("rtems-rfs: group-open: base=%" PRId32 ", blocks=%zd inodes=%zd\n",
base, size, inodes);
group->base = base;
@@ -114,7 +116,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_CLOSE))
- printf ("rtems-rfs: group-close: base=%ld\n", group->base);
+ printf ("rtems-rfs: group-close: base=%" PRId32 "\n", group->base);
/*
* We need to close as much as possible and also return any error if one
@@ -216,7 +218,7 @@
else
*result = rtems_rfs_group_block (&fs->groups[group], bit);
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-alloc: %s allocated: %ld\n",
+ printf ("rtems-rfs: group-bitmap-alloc: %s allocated: %" PRId32 "\n",
inode ? "inode" : "block", *result);
return 0;
}
@@ -245,7 +247,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-free: %s free: %ld\n",
+ printf ("rtems-rfs: group-bitmap-free: %s free: %" PRId32 "\n",
inode ? "inode" : "block", no);
if (inode)
@@ -287,7 +289,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-test: %s test: %ld\n",
+ printf ("rtems-rfs: group-bitmap-test: %s test: %" PRId32 "\n",
inode ? "inode" : "block", no);
if (inode)
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.4.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c:1.4 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-group.c Wed Jun 16 21:44:55 2010
@@ -22,6 +22,8 @@
#include "config.h"
#endif
+#include <inttypes.h>
+
#include <rtems/rfs/rtems-rfs-file-system.h>
#include <rtems/rfs/rtems-rfs-group.h>
@@ -46,7 +48,7 @@
size = rtems_rfs_fs_blocks (fs) - base;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_OPEN))
- printf ("rtems-rfs: group-open: base=%ld, blocks=%zd inodes=%zd\n",
+ printf ("rtems-rfs: group-open: base=%" PRId32 ", blocks=%zd inodes=%zd\n",
base, size, inodes);
group->base = base;
@@ -114,7 +116,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_CLOSE))
- printf ("rtems-rfs: group-close: base=%ld\n", group->base);
+ printf ("rtems-rfs: group-close: base=%" PRId32 "\n", group->base);
/*
* We need to close as much as possible and also return any error if one
@@ -216,7 +218,7 @@
else
*result = rtems_rfs_group_block (&fs->groups[group], bit);
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-alloc: %s allocated: %ld\n",
+ printf ("rtems-rfs: group-bitmap-alloc: %s allocated: %" PRId32 "\n",
inode ? "inode" : "block", *result);
return 0;
}
@@ -245,7 +247,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-free: %s free: %ld\n",
+ printf ("rtems-rfs: group-bitmap-free: %s free: %" PRId32 "\n",
inode ? "inode" : "block", no);
if (inode)
@@ -287,7 +289,7 @@
int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_GROUP_BITMAPS))
- printf ("rtems-rfs: group-bitmap-test: %s test: %ld\n",
+ printf ("rtems-rfs: group-bitmap-test: %s test: %" PRId32 "\n",
inode ? "inode" : "block", no);
if (inode)
*ralf* (on branch rtems-4-10-branch):
2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
M 1.2407 cpukit/ChangeLog
M 1.2346.2.28 cpukit/ChangeLog
M 1.6 cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
M 1.5.2.1 cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
diff -u rtems/cpukit/ChangeLog:1.2406 rtems/cpukit/ChangeLog:1.2407
--- rtems/cpukit/ChangeLog:1.2406 Wed Jun 16 21:44:49 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 21:48:36 2010
@@ -1,5 +1,6 @@
2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
2010-06-16 Joel Sherrill <joel.sherrilL at OARcorp.com>
diff -u rtems/cpukit/ChangeLog:1.2346.2.27 rtems/cpukit/ChangeLog:1.2346.2.28
--- rtems/cpukit/ChangeLog:1.2346.2.27 Wed Jun 16 21:44:54 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 21:48:47 2010
@@ -1,5 +1,6 @@
2010-06-17 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.
2010-06-16 Joel Sherrill <joel.sherrilL at OARcorp.com>
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5 Sat May 22 11:46:59 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c Wed Jun 16 21:48:37 2010
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <rtems/rfs/rtems-rfs-bitmaps.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
@@ -44,7 +45,7 @@
int rc = rtems_rfs_bitmap_map_test (control, bit + count, &result);
if (rc > 0)
{
- printf (" %2d. Test bit %ld in range (%ld,%ld] is %s: ",
+ printf (" %2d. Test bit %" PRId32 " in range (%" PRId32 ",%ld] is %s: ",
test, bit + count, bit, bit + size - 1, !set ? "set" : "clear");
printf ("FAIL (%s)\n", strerror (rc));
return false;
@@ -53,14 +54,14 @@
result = !result;
if (!result)
{
- printf (" %2d. Test bit %ld in range (%ld,%ld] is %s: ",
+ printf (" %2d. Test bit %" PRId32 " in range (%" PRId32 ",%ld] is %s: ",
test, bit + count, bit, bit + size - 1, !set ? "set" : "clear");
printf (" %s\n", !result ? "pass" : "FAIL");
return false;
}
}
- printf (" %2d. Test bit range (%ld,%ld] all %s: pass\n",
+ printf (" %2d. Test bit range (%" PRId32 ",%ld] all %s: pass\n",
test, bit, bit + size - 1, set ? "set" : "clear");
return true;
@@ -87,7 +88,7 @@
for (i = 0; i < size; i++)
rtems_rfs_bitmap_map_clear (control, bit + i);
- printf (" %2d. Cleared bits (%ld, %ld] (%zd)\n",
+ printf (" %2d. Cleared bits (%" PRId32 ", %ld] (%zd)\n",
test, bit, bit + size - 1, size);
for (i = 0; i < rtems_rfs_bitmap_element_bits (); i++)
@@ -100,7 +101,7 @@
}
if (state)
{
- printf (" %2d. Cleared bit still set: bit = %ld\n", test, bit + i);
+ printf (" %2d. Cleared bit still set: bit = %" PRId32 "\n", test, bit + i);
return false;
}
}
@@ -118,13 +119,13 @@
}
if (!result)
{
- printf (" %2d. Find bit with seed = %ld: %s: bit = %ld\n",
+ printf (" %2d. Find bit with seed = %" PRId32 ": %s: bit = %" PRId32 "\n",
test, seed, result ? "pass" : "FAIL", bit);
return false;
}
}
- printf (" %2d. Alloc'ed all bits (%ld, %ld] (%zd)\n",
+ printf (" %2d. Alloc'ed all bits (%" PRId32 ", %ld] (%zd)\n",
test, bit, bit + size - 1, size);
return true;
@@ -206,13 +207,13 @@
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == 0);
- printf (" 3. Find bit 0 with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 3. Find bit 0 with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
rc = rtems_rfs_bitmap_map_alloc (&control, size - 1, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 4. Find bit (size - 1) with seed = (size - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 4. Find bit (size - 1) with seed = (size - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
size - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -245,20 +246,20 @@
bit = rand () % size;
rc = rtems_rfs_bitmap_map_clear (&control, bit);
- printf (" 9. Clear bit %ld: %s (%s)\n",
+ printf (" 9. Clear bit %" PRId32 ": %s (%s)\n",
bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
rtems_rfs_exit_on_error (rc, false, &control, buffer.buffer);
last_bit = bit;
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == last_bit);
- printf (" 10. Find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 10. Find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = !result || (bit != last_bit);
- printf (" 11. Fail to find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 11. Fail to find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -269,7 +270,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size - 1, &result, &bit);
result = result && (bit == 0);
- printf (" 13. Find bit with seed = (size - 1): %s (%s): bit = %ld\n",
+ printf (" 13. Find bit with seed = (size - 1): %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -280,7 +281,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 15. Find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 15. Find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -290,7 +291,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size / 2, &result, &bit);
result = result && (bit == 0);
- printf (" 17. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %ld\n",
+ printf (" 17. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %" PRId32 "\n",
size / 2, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -301,7 +302,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size / 2, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 19. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %ld\n",
+ printf (" 19. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %" PRId32 "\n",
size / 2, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -311,7 +312,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, (size / 2) - 1, &result, &bit);
result = result && (bit == 0);
- printf (" 21. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 21. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
(size / 2) - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -321,7 +322,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, (size / 2) - 1, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 23. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 23. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
(size / 2) - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -351,18 +352,18 @@
rc = rtems_rfs_bitmap_map_clear (&control, bit);
if (rc > 0)
{
- printf (" 26. Clear bit %ld: %s (%s)\n",
+ printf (" 26. Clear bit %" PRId32 ": %s (%s)\n",
bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
rtems_rfs_exit_on_error (rc, false, &control, buffer.buffer);
}
}
- printf (" 26. Clear bit (%ld, %ld]: %s (%s)\n",
+ printf (" 26. Clear bit (%" PRId32 ", %" PRId32 "]: %s (%s)\n",
first_bit, last_bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
clear = rtems_rfs_bitmap_map_free (&control);
result = clear == (last_bit - first_bit);
- printf (" 27. Check free count is %zd: %ld: %s (%s)\n",
+ printf (" 27. Check free count is %zd: %" PRId32 ": %s (%s)\n",
clear, last_bit - first_bit,
result ? "pass" : "FAIL", strerror (rc));
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5 Sat May 22 11:46:59 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c Wed Jun 16 21:48:50 2010
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <rtems/rfs/rtems-rfs-bitmaps.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
@@ -44,7 +45,7 @@
int rc = rtems_rfs_bitmap_map_test (control, bit + count, &result);
if (rc > 0)
{
- printf (" %2d. Test bit %ld in range (%ld,%ld] is %s: ",
+ printf (" %2d. Test bit %" PRId32 " in range (%" PRId32 ",%ld] is %s: ",
test, bit + count, bit, bit + size - 1, !set ? "set" : "clear");
printf ("FAIL (%s)\n", strerror (rc));
return false;
@@ -53,14 +54,14 @@
result = !result;
if (!result)
{
- printf (" %2d. Test bit %ld in range (%ld,%ld] is %s: ",
+ printf (" %2d. Test bit %" PRId32 " in range (%" PRId32 ",%ld] is %s: ",
test, bit + count, bit, bit + size - 1, !set ? "set" : "clear");
printf (" %s\n", !result ? "pass" : "FAIL");
return false;
}
}
- printf (" %2d. Test bit range (%ld,%ld] all %s: pass\n",
+ printf (" %2d. Test bit range (%" PRId32 ",%ld] all %s: pass\n",
test, bit, bit + size - 1, set ? "set" : "clear");
return true;
@@ -87,7 +88,7 @@
for (i = 0; i < size; i++)
rtems_rfs_bitmap_map_clear (control, bit + i);
- printf (" %2d. Cleared bits (%ld, %ld] (%zd)\n",
+ printf (" %2d. Cleared bits (%" PRId32 ", %ld] (%zd)\n",
test, bit, bit + size - 1, size);
for (i = 0; i < rtems_rfs_bitmap_element_bits (); i++)
@@ -100,7 +101,7 @@
}
if (state)
{
- printf (" %2d. Cleared bit still set: bit = %ld\n", test, bit + i);
+ printf (" %2d. Cleared bit still set: bit = %" PRId32 "\n", test, bit + i);
return false;
}
}
@@ -118,13 +119,13 @@
}
if (!result)
{
- printf (" %2d. Find bit with seed = %ld: %s: bit = %ld\n",
+ printf (" %2d. Find bit with seed = %" PRId32 ": %s: bit = %" PRId32 "\n",
test, seed, result ? "pass" : "FAIL", bit);
return false;
}
}
- printf (" %2d. Alloc'ed all bits (%ld, %ld] (%zd)\n",
+ printf (" %2d. Alloc'ed all bits (%" PRId32 ", %ld] (%zd)\n",
test, bit, bit + size - 1, size);
return true;
@@ -206,13 +207,13 @@
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == 0);
- printf (" 3. Find bit 0 with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 3. Find bit 0 with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
rc = rtems_rfs_bitmap_map_alloc (&control, size - 1, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 4. Find bit (size - 1) with seed = (size - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 4. Find bit (size - 1) with seed = (size - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
size - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -245,20 +246,20 @@
bit = rand () % size;
rc = rtems_rfs_bitmap_map_clear (&control, bit);
- printf (" 9. Clear bit %ld: %s (%s)\n",
+ printf (" 9. Clear bit %" PRId32 ": %s (%s)\n",
bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
rtems_rfs_exit_on_error (rc, false, &control, buffer.buffer);
last_bit = bit;
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == last_bit);
- printf (" 10. Find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 10. Find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = !result || (bit != last_bit);
- printf (" 11. Fail to find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 11. Fail to find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -269,7 +270,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size - 1, &result, &bit);
result = result && (bit == 0);
- printf (" 13. Find bit with seed = (size - 1): %s (%s): bit = %ld\n",
+ printf (" 13. Find bit with seed = (size - 1): %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -280,7 +281,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, 0, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 15. Find bit with seed = 0: %s (%s): bit = %ld\n",
+ printf (" 15. Find bit with seed = 0: %s (%s): bit = %" PRId32 "\n",
result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -290,7 +291,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size / 2, &result, &bit);
result = result && (bit == 0);
- printf (" 17. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %ld\n",
+ printf (" 17. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %" PRId32 "\n",
size / 2, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -301,7 +302,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, size / 2, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 19. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %ld\n",
+ printf (" 19. Find bit with seed = (size / 2) (%zd): %s (%s): bit = %" PRId32 "\n",
size / 2, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -311,7 +312,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, (size / 2) - 1, &result, &bit);
result = result && (bit == 0);
- printf (" 21. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 21. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
(size / 2) - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -321,7 +322,7 @@
rc = rtems_rfs_bitmap_map_alloc (&control, (size / 2) - 1, &result, &bit);
result = result && (bit == (size - 1));
- printf (" 23. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %ld\n",
+ printf (" 23. Find bit with seed = ((size / 2) - 1) (%zd): %s (%s): bit = %" PRId32 "\n",
(size / 2) - 1, result ? "pass" : "FAIL", strerror (rc), bit);
rtems_rfs_exit_on_error (rc, !result, &control, buffer.buffer);
@@ -351,18 +352,18 @@
rc = rtems_rfs_bitmap_map_clear (&control, bit);
if (rc > 0)
{
- printf (" 26. Clear bit %ld: %s (%s)\n",
+ printf (" 26. Clear bit %" PRId32 ": %s (%s)\n",
bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
rtems_rfs_exit_on_error (rc, false, &control, buffer.buffer);
}
}
- printf (" 26. Clear bit (%ld, %ld]: %s (%s)\n",
+ printf (" 26. Clear bit (%" PRId32 ", %" PRId32 "]: %s (%s)\n",
first_bit, last_bit, rc == 0 ? "PASS" : "FAIL", strerror (rc));
clear = rtems_rfs_bitmap_map_free (&control);
result = clear == (last_bit - first_bit);
- printf (" 27. Check free count is %zd: %ld: %s (%s)\n",
+ printf (" 27. Check free count is %zd: %" PRId32 ": %s (%s)\n",
clear, last_bit - first_bit,
result ? "pass" : "FAIL", strerror (rc));
--
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/55fab3e2/attachment-0001.html>
More information about the vc
mailing list