hal/hald/linux/volume_id volume_id.c, 1.37, 1.38 volume_id.h, 1.20, 1.21

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux/volume_id
In directory gabe:/tmp/cvs-serv12845/hald/linux/volume_id

Modified Files:
	volume_id.c volume_id.h 
Log Message:
2004-09-20  David Zeuthen  <david at fubar.dk>

	* hald/linux/block_class_device.c (block_class_pre_process): 
	Catch up with changes made in volume_id described below

	* hald/linux/volume_id/volume_id.h: Remove partition_number
	as it's redundant. Rename partition_msdosparttable_type to
	partition_type_raw

	* hald/linux/volume_id/volume_id.c (probe_msdos_part_table): 
	Don't set partition_number as it's gone



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- volume_id.c	20 Sep 2004 01:25:54 -0000	1.37
+++ volume_id.c	20 Sep 2004 07:52:42 -0000	1.38
@@ -461,8 +461,7 @@
 
 		p = &id->partitions[i];
 
-		p->partition_number = i + 1;
-		p->partition_msdosparttable_type = part[i].sys_ind;
+		p->partition_type_raw = part[i].sys_ind;
 
 		if (is_extended(part[i].sys_ind)) {
 			dbg("found extended partition at 0x%llx", poff);
@@ -539,9 +538,7 @@
 				p->len = plen;
 				id->partition_count++;
 
-				p->partition_number = id->partition_count;
-				p->partition_msdosparttable_type = part[i].sys_ind;
-
+				p->partition_type_raw = part[i].sys_ind;
 
 				if (id->partition_count >= VOLUME_ID_PARTITIONS_MAX) {
 					dbg("to many partitions");

Index: volume_id.h
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- volume_id.h	20 Sep 2004 01:25:54 -0000	1.20
+++ volume_id.h	20 Sep 2004 07:52:42 -0000	1.21
@@ -68,9 +68,7 @@
 	char		*type;
 	unsigned long long off;
 	unsigned long long len;
-
-	unsigned int partition_number;
-	unsigned int partition_msdosparttable_type;
+	unsigned int partition_type_raw;
 };
 
 struct volume_id {