[Linux-NTFS-cvs] CVS: dynamic-disk/test dump.c,1.8,1.9

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv25734

Modified Files:
	dump.c 
Log Message:
Tidied code, BUG_ON, list_t, BOOL, __attribute__ printf


Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- dump.c	30 Dec 2001 23:51:22 -0000	1.8
+++ dump.c	9 Feb 2002 13:46:03 -0000	1.9
@@ -68,7 +68,7 @@
 	printf ("         Parent Id   : 0x%04llx\n", part->parent_id);
 	printf ("         Disk Id     : 0x%04llx\n", part->disk_id);
-	printf ("         Start       : 0x%llX\n",   part->start);
-	printf ("         Size        : 0x%llX (%lld MB)\n", part->size, part->size >> 11);
-	printf ("         Volume Off  : 0x%llX (%llu MB)\n", part->volume_offset, part->volume_offset >> 11);
+	printf ("         Start       : 0x%llX\n",   (unsigned long long) part->start);
+	printf ("         Size        : 0x%llX (%llu MB)\n", (unsigned long long) part->size, (unsigned long long) part->size >> 11);
+	printf ("         Volume Off  : 0x%llX (%llu MB)\n", (unsigned long long) part->volume_offset, (unsigned long long) part->volume_offset >> 11);
 }
 
@@ -114,5 +114,5 @@
 	printf ("         Object Id   : 0x%04llx\n", vb->obj_id);
 	printf ("         Volume state: %s\n",       volu->volume_state);
-	printf ("         Size        : 0x%08llX (%lld MB)\n", volu->size, volu->size >> 11);
+	printf ("         Size        : 0x%08llX (%llu MB)\n", (unsigned long long) volu->size, (unsigned long long) volu->size >> 11);
 	printf ("         GUID        : %s\n", print_guid (volu->guid));
 
@@ -135,5 +135,5 @@
 static int dump_vmdb (struct ldmdb *ldb)
 {
-	struct list_head *item;
+	list_t *item;
 	struct vmdb *vm = &ldb->vm;
 
@@ -179,8 +179,8 @@
 		printf ("Disk Id            : %s\n", print_guid (ph->disk_id));
 
-	printf ("Logical disk start : 0x%llX\n",		ph->logical_disk_start);
-	printf ("Logical disk size  : 0x%llX (%lld MB)\n",	ph->logical_disk_size, ph->logical_disk_size>>11);
-	printf ("Configuration start: 0x%llX\n",		ph->config_start);
-	printf ("Configuration size : 0x%llX (%lld MB)\n",	ph->config_size, ph->config_size>>11);
+	printf ("Logical disk start : 0x%llX\n",		(unsigned long long) ph->logical_disk_start);
+	printf ("Logical disk size  : 0x%llX (%llu MB)\n",	(unsigned long long) ph->logical_disk_size, (unsigned long long) ph->logical_disk_size>>11);
+	printf ("Configuration start: 0x%llX\n",		(unsigned long long) ph->config_start);
+	printf ("Configuration size : 0x%llX (%llu MB)\n",	(unsigned long long) ph->config_size, (unsigned long long) ph->config_size>>11);
 	printf ("\n");
 	return 0;
@@ -195,10 +195,10 @@
 
 	printf ("Bitmap name        : \"%s\"\n", toc->bitmap1_name);
-	printf ("Log bitmap start   : 0x%llX\n", toc->bitmap1_start);
-	printf ("Log bitmap size    : 0x%llX\n", toc->bitmap1_size);
+	printf ("Log bitmap start   : 0x%llX\n", (unsigned long long) toc->bitmap1_start);
+	printf ("Log bitmap size    : 0x%llX\n", (unsigned long long) toc->bitmap1_size);
 
 	printf ("Bitmap name        : \"%s\"\n", toc->bitmap2_name);
-	printf ("Log bitmap start   : 0x%llX\n", toc->bitmap2_start);
-	printf ("Log bitmap size    : 0x%llX\n", toc->bitmap2_size);
+	printf ("Log bitmap start   : 0x%llX\n", (unsigned long long) toc->bitmap2_start);
+	printf ("Log bitmap size    : 0x%llX\n", (unsigned long long) toc->bitmap2_size);
 
 	return 0;
@@ -210,5 +210,5 @@
 static int dump_disks (struct ldmdb *ldb)
 {
-	struct list_head *disk_item, *part_item;
+	list_t *disk_item, *part_item;
 	struct vblk      *disk_vb,   *part_vb;
 
@@ -232,5 +232,5 @@
 			printf ("        %s ", part_vb->name);
 			printf ("Offset: 0x%08llX ", part->start);
-			printf ("Length: 0x%08llX (%lld MB)\n", part->size, part->size>>11);
+			printf ("Length: 0x%08llX (%llu MB)\n", (unsigned long long) part->size, (unsigned long long) part->size>>11);
 		}
 	}
@@ -245,5 +245,5 @@
 static int dump_volumes (struct ldmdb *ldb)
 {
-	struct list_head *volu_item, *comp_item, *part_item;
+	list_t *volu_item, *comp_item, *part_item;
 	struct vblk      *volu_vb,   *comp_vb,   *part_vb;
 
@@ -255,5 +255,5 @@
 
 		printf ("%s ", volu_vb->name);
-		printf ("Size: 0x%08llX (%lld MB)\n", volu_vb->vblk.volu.size, volu_vb->vblk.volu.size >> 11);
+		printf ("Size: 0x%08llX (%llu MB)\n", (unsigned long long) volu_vb->vblk.volu.size, (unsigned long long) volu_vb->vblk.volu.size >> 11);
 
 		list_for_each (comp_item, &ldb->v_comp) {