[Goodies-commits] r6771 - in xfce4-diskperf-plugin/trunk: . panel-plugin

[Landry Breuil]

Author: landry
Date: 2009-02-23 21:06:51 +0000 (Mon, 23 Feb 2009)
New Revision: 6771

Modified:
   xfce4-diskperf-plugin/trunk/configure.in.in
   xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c
Log:
Replace AC_PROG_CC by AC_PROG_CC_C99 to silence
a warning about round() on Linux.
While here, fix another warning about fscanf
return value being ignored.
This should fix #4983.


Modified: xfce4-diskperf-plugin/trunk/configure.in.in
===================================================================
--- xfce4-diskperf-plugin/trunk/configure.in.in	2009-02-23 19:15:49 UTC (rev 6770)
+++ xfce4-diskperf-plugin/trunk/configure.in.in	2009-02-23 21:06:51 UTC (rev 6771)
@@ -32,7 +32,7 @@
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
-AC_PROG_CC()
+AC_PROG_CC_C99()
 AC_PROG_LD()
 AC_PROG_INSTALL()
 AC_PROG_LIBTOOL()

Modified: xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c	2009-02-23 19:15:49 UTC (rev 6770)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c	2009-02-23 21:06:51 UTC (rev 6771)
@@ -82,7 +82,9 @@
 	    while ((c = fgetc (pF)) && (c != '\n'));	/* Goto next line */
 	    continue;
 	}
-	fscanf (pF, "%*s");	/* Skip device name */
+	n = fscanf (pF, "%*s");	/* Skip device name */
+	if (n != 1)
+	    goto Error;
 	/* Read rest of line into acStats */
 	if (!(fgets (acStats, sizeof (acStats), pF)))
 	    goto Error;