hal/hald/linux/volume_id volume_id.c, 1.45, 1.46 volume_id.h, 1.23, 1.24

[David Zeuthen]

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

Modified Files:
	volume_id.c volume_id.h 
Log Message:
2004-12-13  David Zeuthen  <davidz at redhat.com>

	Merged all changes from the stable branch so HEAD is on par.



Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- volume_id.c	25 Oct 2004 16:32:10 -0000	1.45
+++ volume_id.c	14 Dec 2004 02:57:48 -0000	1.46
@@ -571,7 +571,7 @@
 				p->partition_type_raw = part[i].sys_ind;
 
 				if (id->partition_count >= VOLUME_ID_PARTITIONS_MAX) {
-					dbg("to many partitions");
+					dbg("too many partitions");
 					next = 0;
 				}
 			}
@@ -2014,6 +2014,8 @@
 {
 	int rc;
 
+	dbg("called with size=0x%llx", size);
+
 	if (id == NULL)
 		return -EINVAL;
 
@@ -2088,9 +2090,6 @@
 			break;
 
 		/* signature in the first block, only small buffer needed */
-		rc = probe_msdos_part_table(id, off);
-		if (rc == 0)
-			break;
 		rc = probe_vfat(id, off);
 		if (rc == 0)
 			break;

Index: volume_id.h
===================================================================
RCS file: /cvs/hal/hal/hald/linux/volume_id/volume_id.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- volume_id.h	25 Oct 2004 02:57:27 -0000	1.23
+++ volume_id.h	14 Dec 2004 02:57:48 -0000	1.24
@@ -28,7 +28,7 @@
 #define VOLUME_ID_UUID_STRING_SIZE	37
 #define VOLUME_ID_FORMAT_SIZE		32
 #define VOLUME_ID_PATH_MAX		256
-#define VOLUME_ID_PARTITIONS_MAX	16
+#define VOLUME_ID_PARTITIONS_MAX	256
 
 enum volume_id_usage {
 	VOLUME_ID_UNUSED,