summaryrefslogtreecommitdiff
path: root/modules/devices
diff options
context:
space:
mode:
Diffstat (limited to 'modules/devices')
-rw-r--r--modules/devices/battery.c2
-rw-r--r--modules/devices/dmi.c2
-rw-r--r--modules/devices/spd-decode.c3
-rw-r--r--modules/devices/spd-vendors.c3
-rw-r--r--modules/devices/storage.c10
5 files changed, 9 insertions, 11 deletions
diff --git a/modules/devices/battery.c b/modules/devices/battery.c
index e356c14a..784a6cc5 100644
--- a/modules/devices/battery.c
+++ b/modules/devices/battery.c
@@ -312,7 +312,7 @@ __scan_battery_apm(void)
if ((procapm = fopen("/proc/apm", "r"))) {
int old_percentage = percentage;
- (void)fscanf(procapm, "%s %s %s 0x%x %s %s %d%%",
+ int c=fscanf(procapm, "%s %s %s 0x%x %s %s %d%%",
apm_drv_ver, apm_bios_ver, trash,
&ac_bat, trash, trash, &percentage);
fclose(procapm);
diff --git a/modules/devices/dmi.c b/modules/devices/dmi.c
index 34374fbe..af02e6d4 100644
--- a/modules/devices/dmi.c
+++ b/modules/devices/dmi.c
@@ -73,7 +73,7 @@ gboolean dmi_get_info(void)
DMIInfo *info;
gboolean dmi_succeeded = FALSE;
guint i;
- gchar *value;
+ gchar *value=NULL;
const gchar *vendor;
if (dmi_info) {
diff --git a/modules/devices/spd-decode.c b/modules/devices/spd-decode.c
index cf4c89d7..7cfc688c 100644
--- a/modules/devices/spd-decode.c
+++ b/modules/devices/spd-decode.c
@@ -20,8 +20,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ctype.h>
diff --git a/modules/devices/spd-vendors.c b/modules/devices/spd-vendors.c
index 80b2a6a4..7a646758 100644
--- a/modules/devices/spd-vendors.c
+++ b/modules/devices/spd-vendors.c
@@ -20,8 +20,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* from decode-dimms, in the i2c-tools package:
diff --git a/modules/devices/storage.c b/modules/devices/storage.c
index bbf9b195..c0bee0d2 100644
--- a/modules/devices/storage.c
+++ b/modules/devices/storage.c
@@ -632,7 +632,7 @@ void __scan_ide_devices(void)
if (!proc_ide)
continue;
- (void) fgets(buf, 128, proc_ide);
+ char *cc=fgets(buf, 128, proc_ide);
fclose(proc_ide);
buf[strlen(buf) - 1] = 0;
@@ -648,7 +648,7 @@ void __scan_ide_devices(void)
continue;
}
- (void) fgets(buf, 128, proc_ide);
+ char *c=fgets(buf, 128, proc_ide);
fclose(proc_ide);
buf[strlen(buf) - 1] = 0;
@@ -717,7 +717,7 @@ void __scan_ide_devices(void)
if (g_file_test(device, G_FILE_TEST_EXISTS)) {
proc_ide = fopen(device, "r");
if (proc_ide) {
- (void) fscanf(proc_ide, "%d", &cache);
+ int c=fscanf(proc_ide, "%d", &cache);
fclose(proc_ide);
} else {
cache = 0;
@@ -731,7 +731,7 @@ void __scan_ide_devices(void)
proc_ide = fopen(device, "r");
if (proc_ide) {
- (void) fgets(buf, 64, proc_ide);
+ char *c=fgets(buf, 64, proc_ide);
for (tmp = buf; *tmp; tmp++) {
if (*tmp >= '0' && *tmp <= '9')
break;
@@ -739,7 +739,7 @@ void __scan_ide_devices(void)
pgeometry = g_strdup(g_strstrip(tmp));
- (void) fgets(buf, 64, proc_ide);
+ char *cc=fgets(buf, 64, proc_ide);
for (tmp = buf; *tmp; tmp++) {
if (*tmp >= '0' && *tmp <= '9')
break;