hal/hald/linux2 osspec.c,1.38,1.39

Danny Kukawka dkukawka at freedesktop.org
Thu Jan 12 09:48:46 PST 2006


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

Modified Files:
	osspec.c 
Log Message:
2006-01-12  Danny Kukawka  <danny.kukawka at web.de>

        Fixed compiler warnings if compile with flag warn_unused_result.

        * hald/device_info.c: (process_fdi_file):
        * hald/hald.c: (handle_sigterm), (main), (osspec_probe_done):
        * hald/hald_dbus.c: (hald_exec_method):
        * hald/linux2/osspec.c: (set_suspend_hibernate_keys):
        * hald/linux2/probing/probe-smbios.c: (main):
        * tools/linux/hal_hotplug.c: (main):



Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- osspec.c	8 Dec 2005 19:03:02 -0000	1.38
+++ osspec.c	12 Jan 2006 17:48:44 -0000	1.39
@@ -4,6 +4,7 @@
  * osspec.c : New and improved HAL backend for Linux 2.6
  *
  * Copyright (C) 2004 David Zeuthen, <david at fubar.dk>
+ * Copyright (C) 2005 Danny Kukawka, <danny.kukawka at web.de>
  *
  * Licensed under the Academic Free License version 2.1
  *
@@ -539,6 +540,7 @@
 {
 	int can_suspend;
 	int can_hibernate;
+	ssize_t read;
 	unsigned int len;
 	char *poweroptions;
 	FILE *fp;
@@ -554,7 +556,7 @@
 	}
 	poweroptions = NULL;
 	len = 0;
-	getline (&poweroptions, &len, fp);
+	read = getline (&poweroptions, &len, fp);
 	fclose (fp);
 	if (poweroptions == NULL) {
 		HAL_WARNING (("Contents of /sys/power/state invalid"));




More information about the hal-commit mailing list