[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c, 1.150, 1.151 ntfsinfo.c, 1.149, 1.150

[Yuval <uv...@de...>]

Changes by: uvman

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv15136/ntfsprogs

Modified Files:
	mkntfs.c ntfsinfo.c 
Log Message:
The periodic 'int is not neccessarily 32bit' fixes.

Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- mkntfs.c	27 Oct 2006 12:24:30 -0000	1.150
+++ mkntfs.c	28 Oct 2006 23:45:22 -0000	1.151
@@ -779,9 +779,12 @@ static void dump_resident_attr_val(ATTR_
 		return;
 	case AT_INDEX_ROOT:
 		/* TODO */
-		printf("collation_rule %u\n", le32_to_cpu(((INDEX_ROOT*)val)->collation_rule));
-		printf("index.entries_offset %u\n", le32_to_cpu(((INDEX_ROOT*)val)->index.entries_offset));
-		printf("index.index_length %u\n", le32_to_cpu(((INDEX_ROOT*)val)->index.index_length));
+		printf("collation_rule %u\n", (unsigned)le32_to_cpu
+				(((INDEX_ROOT*)val)->collation_rule));
+		printf("index.entries_offset %u\n", (unsigned)le32_to_cpu
+				(((INDEX_ROOT*)val)->index.entries_offset));
+		printf("index.index_length %u\n", (unsigned)le32_to_cpu
+				(((INDEX_ROOT*)val)->index.index_length));
 		printf("%s\n", todo);
 		return;
 	case AT_INDEX_ALLOCATION:
@@ -3615,8 +3618,8 @@ static BOOL mkntfs_override_vol_params(n
 				return FALSE;
 			}
 		}
-		ntfs_log_quiet("Cluster size has been automatically set to %d "
-				"bytes.\n", vol->cluster_size);
+		ntfs_log_quiet("Cluster size has been automatically set to %u "
+				"bytes.\n", (unsigned)vol->cluster_size);
 	}
 	/* Validate cluster size. */
 	if (vol->cluster_size & (vol->cluster_size - 1)) {
@@ -3723,7 +3726,8 @@ static BOOL mkntfs_override_vol_params(n
 		ntfs_log_warning("Index record size (%u bytes) exceeds system "
 				"page size (%li bytes).  You will not be able "
 				"to mount this volume using the NTFS kernel "
-				"driver.\n", vol->indx_record_size, page_size);
+				"driver.\n", (unsigned)vol->indx_record_size,
+				page_size);
 	vol->indx_record_size_bits = ffs(vol->indx_record_size) - 1;
 	ntfs_log_debug("index record size = %u bytes\n",
 			(unsigned)vol->indx_record_size);

Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- ntfsinfo.c	27 Oct 2006 12:24:30 -0000	1.149
+++ ntfsinfo.c	28 Oct 2006 23:45:22 -0000	1.150
@@ -1106,7 +1106,8 @@ static void ntfs_dump_sds_entry(SECURITY
 	SECURITY_DESCRIPTOR_RELATIVE *sd;
 
 	ntfs_log_verbose("\n");
-	ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n", le32_to_cpu(sds->hash));
+	ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n",
+			(unsigned)le32_to_cpu(sds->hash));
 	ntfs_log_verbose("\t\tSecurity id:\t\t %u (0x%x)\n",
 			(unsigned)le32_to_cpu(sds->security_id),
 			(unsigned)le32_to_cpu(sds->security_id));
@@ -1366,7 +1367,7 @@ static void ntfs_dump_index_key(INDEX_EN
 		break;
 	default:
 		ntfs_log_verbose("\t\tIndex attr type is UNKNOWN: \t 0x%08x\n",
-				le32_to_cpu(type));
+				(unsigned)le32_to_cpu(type));
 		break;
 	}
 }
@@ -1415,7 +1416,7 @@ static void ntfs_dump_index_data(INDEX_E
 				(unsigned)le32_to_cpu(data->sdh.length),
 				(unsigned)le32_to_cpu(data->sdh.length));
 		ntfs_log_verbose("\t\tUnknown (padding):\t 0x%08x\n",
-				 le32_to_cpu(data->sdh.reserved_II));
+				(unsigned)le32_to_cpu(data->sdh.reserved_II));
 		break;
 	case INDEX_ATTR_OBJID_O: {
 		OBJ_ID_INDEX_DATA *object_id_data;
@@ -1925,8 +1926,8 @@ static void ntfs_dump_attr_ea(ATTR_RECOR
 		if (ea->name_length == 11 &&
 				!strncmp((const char*)"SETFILEBITS",
 				(const char*)ea->name, 11))
-			printf("0%o\n", le32_to_cpu(*(le32*)(ea->value +
-					ea->name_length + 1)));
+			printf("0%o\n", (unsigned)le32_to_cpu(*(le32*)
+					(ea->value + ea->name_length + 1)));
 		else
 			printf("'%s'\n", ea->value + ea->name_length + 1);
 		if (ea->next_entry_offset)