hal/hald/linux2/probing probe-volume.c,1.21,1.22

[Kay Sievers]

Update of /cvs/hal/hal/hald/linux2/probing
In directory gabe:/tmp/cvs-serv2223/hald/linux2/probing

Modified Files:
	probe-volume.c 
Log Message:
2005-11-15  Kay Sievers  <kay.sievers at vrfy.org>

        libvolume_id: sync with udev version and prepare
        for a possible future external dependency.

        * hald/linux2/probing/probe-volume.c: (advanced_disc_detect): Switch
        to glib function instead of the volume_id private ones.

        * volume_id/Makefile.am: Merge individual headers into the main
        public header.
        * volume_id/cramfs.c:
        * volume_id/cramfs.h:
        * volume_id/ext.c:
        * volume_id/ext.h:
        * volume_id/fat.c:
        * volume_id/fat.h:
        * volume_id/hfs.c:
        * volume_id/hfs.h:
        * volume_id/highpoint.c:
        * volume_id/highpoint.h:
        * volume_id/hpfs.c:
        * volume_id/hpfs.h:
        * volume_id/iso9660.c:
        * volume_id/iso9660.h:
        * volume_id/isw_raid.c:
        * volume_id/isw_raid.h:
        * volume_id/jfs.c:
        * volume_id/jfs.h:
        * volume_id/linux_raid.c:
        * volume_id/linux_raid.h:
        * volume_id/linux_swap.c:
        * volume_id/linux_swap.h:
        * volume_id/lsi_raid.c:
        * volume_id/lsi_raid.h:
        * volume_id/luks.c:
        * volume_id/luks.h:
        * volume_id/lvm.c:
        * volume_id/lvm.h:
        * volume_id/mac.c:
        * volume_id/mac.h:
        * volume_id/minix.c:
        * volume_id/minix.h:
        * volume_id/msdos.c:
        * volume_id/msdos.h:
        * volume_id/ntfs.c:
        * volume_id/ntfs.h:
        * volume_id/nvidia_raid.c:
        * volume_id/nvidia_raid.h:
        * volume_id/ocfs.c:
        * volume_id/ocfs.h:
        * volume_id/promise_raid.c:
        * volume_id/promise_raid.h:
        * volume_id/reiserfs.c:
        * volume_id/reiserfs.h:
        * volume_id/romfs.c:
        * volume_id/romfs.h:
        * volume_id/silicon_raid.c:
        * volume_id/silicon_raid.h:
        * volume_id/sysv.c:
        * volume_id/sysv.h:
        * volume_id/udf.c:
        * volume_id/udf.h:
        * volume_id/ufs.c:
        * volume_id/ufs.h:
        * volume_id/util.h:
        * volume_id/via_raid.c:
        * volume_id/via_raid.h:
        * volume_id/volume_id.c:
        * volume_id/volume_id.h:
        * volume_id/vxfs.c:
        * volume_id/vxfs.h:
        * volume_id/xfs.c:
        * volume_id/xfs.h:



Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- probe-volume.c	9 Nov 2005 18:54:40 -0000	1.21
+++ probe-volume.c	15 Nov 2005 03:32:36 -0000	1.22
@@ -50,10 +50,6 @@
 
 #include "drive_id/drive_id.h"
 #include "volume_id/volume_id.h"
-#include "volume_id/logging.h"
-#include "volume_id/msdos.h"
-#include "volume_id/util.h"
-
 #include "linux_dvd_rw_utils.h"
 
 #include "shared.h"
@@ -205,10 +201,10 @@
 	}
 
 	/* seek to the path table */
-	lseek (fd, le16_to_cpu(bs) * le32_to_cpu (tl), SEEK_SET);
+	lseek (fd, GUINT16_FROM_LE (bs) * GUINT32_FROM_LE (tl), SEEK_SET);
 
 	/* loop through the path table entriesi */
-	while (pos < le16_to_cpu (ts))
+	while (pos < GUINT16_FROM_LE (ts))
 	{
 		/* get the length of the filename of the current entry */
 		if (read (fd, &len_di, 1) != 1)
@@ -244,7 +240,7 @@
 
 		/* if we found a folder that has the root as a parent, and the directory name matches 
 		   one of the special directories then set the properties accordingly */
-		if (le16_to_cpu (parent) == 1)
+		if (GUINT16_FROM_LE (parent) == 1)
 		{
 			if (!strcmp (dirname, "VIDEO_TS"))
 			{