hal/hald/linux2/probing probe-hiddev.c, 1.2, 1.3 probe-input.c, 1.5, 1.6 probe-printer.c, 1.2, 1.3 probe-smbios.c, 1.2, 1.3 probe-storage.c, 1.11, 1.12 probe-volume.c, 1.12, 1.13

[David Zeuthen]

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

Modified Files:
	probe-hiddev.c probe-input.c probe-printer.c probe-smbios.c 
	probe-storage.c probe-volume.c 
Log Message:
2005-07-22  David Zeuthen  <davidz at redhat.com>

        * hald/linux2/probing/probe-hiddev.c,
        hald/linux2/probing/probe-input.c,
        hald/linux2/probing/probe-printer.c,
        hald/linux2/probing/probe-smbios.c,
        hald/linux2/probing/probe-storage.c,
        hald/linux2/probing/probe-volume.c: Here a little patch (against
        CVS) to fix several compiler warnings. Patch from Danny Kukawka
        <danny.kukawka at web.de>.



Index: probe-hiddev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-hiddev.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- probe-hiddev.c	8 Apr 2005 18:10:20 -0000	1.2
+++ probe-hiddev.c	22 Jul 2005 18:57:29 -0000	1.3
@@ -50,7 +50,6 @@
 	char *device_file;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char name[256] = "Unknown HID device";
 	unsigned int i;
 	struct hiddev_devinfo device_info;
@@ -135,6 +134,8 @@
 	}
 
 #if 0
+	DBusConnection *conn;
+
 	if (fork () == 0) {
 		sleep (10);
 

Index: probe-input.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-input.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- probe-input.c	8 Apr 2005 18:10:20 -0000	1.5
+++ probe-input.c	22 Jul 2005 18:57:29 -0000	1.6
@@ -128,7 +128,6 @@
 	char *physical_device;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char name[128];
 	struct input_id id;
 

Index: probe-printer.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-printer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- probe-printer.c	8 Apr 2005 18:10:20 -0000	1.2
+++ probe-printer.c	22 Jul 2005 18:57:29 -0000	1.3
@@ -54,8 +54,6 @@
 	char *device_file;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
-	unsigned int i;
 	char device_id[1024];
 	char **props;
 	char **iter;

Index: probe-smbios.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-smbios.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- probe-smbios.c	8 Apr 2005 18:10:20 -0000	1.2
+++ probe-smbios.c	22 Jul 2005 18:57:29 -0000	1.3
@@ -63,7 +63,6 @@
 	char *udi;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char buf[512];
 	int dmipipe[2];
 	int nullfd;

Index: probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- probe-storage.c	15 Jul 2005 19:54:31 -0000	1.11
+++ probe-storage.c	22 Jul 2005 18:57:29 -0000	1.12
@@ -108,7 +108,6 @@
 	char *device_file;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char *bus;
 	char *drive_type;
 	struct volume_id *vid;

Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- probe-volume.c	22 Jul 2005 18:47:20 -0000	1.12
+++ probe-volume.c	22 Jul 2005 18:57:29 -0000	1.13
@@ -127,7 +127,6 @@
 	char *device_file;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char *parent_udi;
 	char *sysfs_path;
 	struct volume_id *vid;