Fixed C99 macros. Closes #161994. Patch by Vincent Berger

* include/glibtop/error.h:
	* sysdeps/common/error.c: Fixed C99 macros. Closes #161994.
	Patch by Vincent Berger <vincent.berger@ext.bull.net>.

ChangeLog

@@ -1,3 +1,9 @@
+2004-12-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/error.h:
+	* sysdeps/common/error.c: Fixed C99 macros. Closes #161994.
+	Patch by Vincent Berger <vincent.berger@ext.bull.net>.
+
 2004-12-04  Benoît Dejean  <tazforever@dlfp.org>
 
 	* NEWS:

doc/ChangeLog

@@ -1,3 +1,7 @@
+2004-12-04  Benoît Dejean  <tazforever@dlfp.org>
+
+	* reference.texi: Updated.
+
 2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
 
 	* reference.texi: Updated.

doc/reference.texi

@@ -1533,6 +1533,8 @@ struct _glibtop_fsusage
         files,
         ffree;
     guint32   block_size;
+    guint64 read,
+        write;
 @};
 @end cartouche
 @end example
@@ -1550,10 +1552,12 @@ Total file nodes.
 Free file nodes.
 @item block_size
 Block size in bytes.
+@item read
+Total blocks read.
+@item write
+Total blocks written.
 @end table
 
-Blocks are usually 512 bytes.
-
 @page
 @node Library Functions,  , Common Functions, Reference Manual
 @section Library Functions

include/glibtop/error.h

@@ -50,11 +50,11 @@ void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...);
 
 #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
-#define glibtop_error(p1, ...)	glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn(p1, ...)	glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__)
+#define glibtop_error(...)	glibtop_error_r(glibtop_global_server , __VA_ARGS__)
+#define glibtop_warn(...)	glibtop_warn_r(glibtop_global_server , __VA_ARGS__)
 
-#define glibtop_error_io(p1, ...)	glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__)
-#define glibtop_warn_io(p1, ...)	glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__)
+#define glibtop_error_io(...)	glibtop_error_io_r(glibtop_global_server , __VA_ARGS__)
+#define glibtop_warn_io(...)	glibtop_warn_io_r(glibtop_global_server , __VA_ARGS__)
 
 #else /* no __GNUC__, no C99*/
 

sysdeps/common/ChangeLog

@@ -1,3 +1,7 @@
+2004-12-09  Benoît Dejean  <tazforever@dlfp.org>
+
+	* mountlist.c: (ignore_mount_entry): Ignores "unkown" file system type.
+
 2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
 
 	* fsusage.c: (glibtop_get_fsusage_s): Fixed .block_size on Solaris.

sysdeps/common/error.c

@@ -129,7 +129,7 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
 	va_end (args);
 }
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
 
 void
 glibtop_error (char *format, ...)
@@ -167,4 +167,4 @@ glibtop_warn_io (char *format, ...)
 	va_end (args);
 }
 
-#endif /* __GNUC__ */
+#endif /* !defined(__GNUC__) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) */

sysdeps/common/mountlist.c

@@ -547,7 +547,8 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
 		"binfmt_misc",
 		"supermount",
 		"mntfs",
-		"openpromfs"
+		"openpromfs",
+		"unknown"
 	};
 
 	const char (*i)[12] = &ignored[0];