hal/hald/linux2 apm.c, 1.9, 1.10 osspec.c, 1.26, 1.27 pcmcia_utils.c, 1.1, 1.2

[David Zeuthen]

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

Modified Files:
	apm.c osspec.c pcmcia_utils.c 
Log Message:
2005-07-26  David Zeuthen  <davidz at redhat.com>

        * drive_id/ata.c, drive_id/drive_id.c, drive_id/scsi.c,
        hald/device.c, hald/device_store.c, hald/linux2/apm.c,
        hald/linux2/osspec.c, hald/linux2/pcmcia_utils.c,
        hald/linux2/probing/probe-storage.c, tools/hal-device.c,
        volume_id/fat.c, volume_id/iso9660.c, volume_id/isw_raid.c,
        volume_id/lvm.c, volume_id/romfs.c, volume_id/volume_id.c: This is
        a patch (against CVS) to fix several compiler warnings with gcc
        3.x and 4.x. Please review. Patch from Danny Kukawka
        <danny.kukawka at web.de>.



Index: apm.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/apm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- apm.c	14 Apr 2005 04:26:56 -0000	1.9
+++ apm.c	26 Jul 2005 04:40:42 -0000	1.10
@@ -96,7 +96,7 @@
 		goto out;
 
 	if (sscanf (buf, "%s %d.%d %x %x %x %x %d%% %d",
-		    &i->driver_version,
+		    i->driver_version,
 		    &i->version_major,
 		    &i->version_minor,
 		    &i->flags,

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- osspec.c	27 Jun 2005 19:13:03 -0000	1.26
+++ osspec.c	26 Jul 2005 04:40:42 -0000	1.27
@@ -262,7 +262,7 @@
 	return TRUE;
 }
 
-gboolean 
+static gboolean 
 hal_util_get_fs_mnt_path (const gchar *fs_type, gchar *mnt_path, gsize len)
 {
 	FILE *mnt;

Index: pcmcia_utils.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/pcmcia_utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pcmcia_utils.c	22 Jan 2005 20:13:42 -0000	1.1
+++ pcmcia_utils.c	26 Jul 2005 04:40:43 -0000	1.2
@@ -259,7 +259,7 @@
 						int g;
 						char dev[50];
 
-						if (sscanf (buf, "%d\t%s\t%s\t%d\t%s", &s, &func, &driver, &g, &dev) == 5) {
+						if (sscanf (buf, "%d\t%s\t%s\t%d\t%s", &s, func, driver, &g, dev) == 5) {
 							PCMCIA_card_type t = pcmcia_card_type_from_type_string (func);
 							if (t != PCMCIA_TYPE_INVALID) {
 								entry = calloc (1, sizeof (pcmcia_stab_entry));