hal/hald/linux block_class_device.c, 1.34, 1.35 input_class_device.c, 1.9, 1.10 net_class_device.c, 1.13, 1.14 osspec.c, 1.23, 1.24

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv12311/hald/linux

Modified Files:
	block_class_device.c input_class_device.c net_class_device.c 
	osspec.c 
Log Message:
2004-07-05  David Zeuthen  <david at fubar.dk>
	
	* hald/linux/input_class_device.c (input_class_accept): Make this
	static (remove warning)

	* hald/linux/osspec.c (osspec_init): Remove error variable (remove
	warning)
	(visit_bus): Comment out this function because it is not currently
	used (remove warning)

	* hald/linux/block_class_device.c (block_class_in_gdl): New function
	(block_class_pre_process): Move check for media and mtab to the new
	block_class_in_gdl method



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- block_class_device.c	5 Jul 2004 18:21:07 -0000	1.34
+++ block_class_device.c	5 Jul 2004 18:54:58 -0000	1.35
@@ -1419,7 +1419,13 @@
 						       "storage.", propname);
 		}
 	}
+}
 
+static void
+block_class_in_gdl (ClassDeviceHandler *self,
+		    HalDevice *d,
+		    const char *udi)
+{
 	/* check for media on the device */
 	detect_media (d, FALSE);
 
@@ -2035,7 +2041,7 @@
 	class_device_post_merge,            /**< post merge function */
 	block_class_got_udi,                /**< got UDI */
 	block_class_compute_udi,            /**< UDI computation */
-	class_device_in_gdl,                /**< in GDL */
+	block_class_in_gdl,                 /**< in GDL */
 	"block",                            /**< sysfs class name */
 	"block",                            /**< hal class name */
 	TRUE,                               /**< require device file */

Index: input_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/input_class_device.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- input_class_device.c	5 Jul 2004 18:21:07 -0000	1.9
+++ input_class_device.c	5 Jul 2004 18:54:58 -0000	1.10
@@ -62,7 +62,7 @@
  *  @param  path                Sysfs-path for device
  *  @param  class_device        libsysfs object for class device
  */
-dbus_bool_t
+static dbus_bool_t
 input_class_accept (ClassDeviceHandler *self,
                     const char *path,
                     struct sysfs_class_device *class_device)

Index: net_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/net_class_device.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- net_class_device.c	5 Jul 2004 18:21:07 -0000	1.13
+++ net_class_device.c	5 Jul 2004 18:54:58 -0000	1.14
@@ -318,7 +318,7 @@
 
 	memset (&ifname, 0, sizeof (ifname));
 
-	attr = (void *) ifinfo + NLMSG_ALIGN (sizeof (struct ifinfomsg));
+	attr = (void *) (ifinfo + NLMSG_ALIGN (sizeof (struct ifinfomsg)));
 	attr_len = NLMSG_PAYLOAD (hdr, sizeof (struct ifinfomsg));
 
 	while (RTA_OK (attr, attr_len)) {

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- osspec.c	24 Jun 2004 21:47:49 -0000	1.23
+++ osspec.c	5 Jul 2004 18:54:58 -0000	1.24
@@ -271,6 +271,7 @@
 }
 
 
+#if 0
 /** Visit all devices on a given bus
  *
  *  @param  class_name          Name of class, e.g. scsi_host or block
@@ -298,6 +299,7 @@
 
 	sysfs_close_bus (bus);
 }
+#endif
 
 
 /** Timeout handler for polling
@@ -329,7 +331,6 @@
 {
 	int i;
 	int rc;
-	DBusError error;
 
 	/* get mount path for sysfs */
 	rc = sysfs_get_mnt_path (sysfs_mount_path, SYSFS_PATH_MAX);