Use glib-like function prototypes instead of "extern <function>

1999-02-18  Martin Baulig  <martin@home-of-linux.org>

	* include/glibtop/*.h: Use glib-like function prototypes
	instead of "extern <function> __P((args))".

40 files changed, 199 insertions, 144 deletions

diff --git a/ChangeLog b/ChangeLog
index 504c00a3..cfb4b06d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-02-18  Martin Baulig  <martin@home-of-linux.org>
 
+	* include/glibtop/*.h: Use glib-like function prototypes
+	instead of "extern <function> __P((args))".
+
 	* sysdeps/common/error.h: Replaced inline with static.
 
 1999-02-18  Martin Baulig  <martin@home-of-linux.org>
diff --git a/include/glibtop/close.h b/include/glibtop/close.h
index f31826ce..ee701dab 100644
--- a/include/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -26,10 +26,10 @@
 
 __BEGIN_DECLS
 
-extern void glibtop_close_r __P((glibtop *));
+void glibtop_close_r (glibtop *server);
 
-extern void glibtop_close_s __P((glibtop *));
-extern void glibtop_close_p __P((glibtop *));
+void glibtop_close_s (glibtop *server);
+void glibtop_close_p (glibtop *server);
 
 __END_DECLS
 
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
index a087e6f8..b888cdfa 100644
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -87,8 +87,13 @@ struct _glibtop_response
 
 #define glibtop_call(p1, p2, p3, p4)	glibtop_call_r(glibtop_global_server, p1, p2, p3, p4)
 
-extern void *glibtop_call_l __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
-extern void *glibtop_call_s __P((glibtop *, unsigned, size_t, const void *, size_t, void *));
+void *
+glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
+		const void *send_buf, size_t recv_size, void *recv_buf);
+
+void *
+glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
+		const void *send_buf, size_t recv_size, void *recv_buf);
 
 __END_DECLS
 
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
index 2e1b427c..602c1985 100644
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -71,14 +71,14 @@ struct _glibtop_cpu
 #define glibtop_get_cpu_r	glibtop_get_cpu_s
 #endif
 
-extern void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *));
+void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *));
 
 #if GLIBTOP_SUID_CPU
-extern void glibtop_init_cpu_p __P((glibtop *));
-extern void glibtop_get_cpu_p __P((glibtop *, glibtop_cpu *));
+void glibtop_init_cpu_p (glibtop *server);
+void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
 #else
-extern void glibtop_init_cpu_s __P((glibtop *));
-extern void glibtop_get_cpu_s __P((glibtop *, glibtop_cpu *));
+void glibtop_init_cpu_s (glibtop *server);
+void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/error.h b/include/glibtop/error.h
index 90c98748..1b7e7932 100644
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -27,11 +27,11 @@
 
 __BEGIN_DECLS
 
-extern void glibtop_error_vr __P((glibtop *, char *, va_list));
-extern void glibtop_warn_vr __P((glibtop *, char *, va_list));
+void glibtop_error_vr (glibtop *server, char *format, va_list args);
+void glibtop_warn_vr (glibtop *server, char *format, va_list args);
 
-extern void glibtop_error_io_vr __P((glibtop *, char *, gint, va_list));
-extern void glibtop_warn_io_vr __P((glibtop *, char *, gint, va_list));
+void glibtop_error_io_vr (glibtop *server, char *format, gint, va_list args);
+void glibtop_warn_io_vr (glibtop *server, char *format, gint, va_list args);
 
 static void
 glibtop_error_r (glibtop *server, char *format, ...)
diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h
index a2f16cb9..017cd03c 100644
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -51,9 +51,8 @@ struct _glibtop_fsusage
 
 #define glibtop_get_fsusage_r		glibtop_get_fsusage_s
 
-extern void glibtop_get_fsusage_l __P((glibtop *, glibtop_fsusage *, const char *));
-
-extern void glibtop_get_fsusage_s __P((glibtop *, glibtop_fsusage *, const char *));
+void glibtop_get_fsusage_l (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
+void glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
 
 #ifdef GLIBTOP_NAMES
 
diff --git a/include/glibtop/gnuserv.h b/include/glibtop/gnuserv.h
index 8eb36128..6f945c71 100644
--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -153,8 +153,9 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 #define CONN_IPC      2
 
 /* function declarations */
-extern int glibtop_make_connection __P((const char *, int, int *));
+int glibtop_make_connection (const char *hostarg, int portarg, int *s);
 
 #ifdef INTERNET_DOMAIN_SOCKETS
-extern long glibtop_internet_addr __P((const char *));
+long glibtop_internet_addr (const char *host);
 #endif
+
diff --git a/include/glibtop/inodedb.h b/include/glibtop/inodedb.h
index fbc8d7b0..6408c8f8 100644
--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -49,9 +49,16 @@ struct _glibtop_inodedb
 #define glibtop_inodedb_lookup(p1,p2,p3) glibtop_inodedb_lookup_s(glibtop_global_server, p1, p2, p3)
 #define glibtop_inodedb_close(p1)	glibtop_inodedb_close_s(glibtop_global_server)
 
-extern glibtop_inodedb *glibtop_inodedb_open_s __P((glibtop *, unsigned, unsigned long));
-extern const char *glibtop_inodedb_lookup_s __P((glibtop *, glibtop_inodedb *, u_int64_t, u_int64_t));
-extern void glibtop_inodedb_close_s __P((glibtop *, glibtop_inodedb *));
+glibtop_inodedb *
+glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache_size);
+
+const char *
+glibtop_inodedb_lookup_s (glibtop *server,
+			  glibtop_inodedb *inodedb,
+			  u_int64_t device, u_int64_t inode);
+
+void
+glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
 
 __END_DECLS
 
diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h
index 7e4ddab0..39d507df 100644
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -53,14 +53,14 @@ struct _glibtop_loadavg
 #define glibtop_get_loadavg_r		glibtop_get_loadavg_s
 #endif
 
-extern void glibtop_get_loadavg_l __P((glibtop *, glibtop_loadavg *));
+void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
 
 #if GLIBTOP_SUID_LOADAVG
-extern void glibtop_init_loadavg_p __P((glibtop *));
-extern void glibtop_get_loadavg_p __P((glibtop *, glibtop_loadavg *));
+void glibtop_init_loadavg_p (glibtop *server);
+void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
 #else
-extern void glibtop_init_loadavg_s __P((glibtop *));
-extern void glibtop_get_loadavg_s __P((glibtop *, glibtop_loadavg *));
+void glibtop_init_loadavg_s (glibtop *server);
+void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h
index ccec6499..186520e8 100644
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -61,14 +61,14 @@ struct _glibtop_mem
 #define glibtop_get_mem_r		glibtop_get_mem_s
 #endif
 
-extern void glibtop_get_mem_l __P((glibtop *, glibtop_mem *));
+void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
 
 #if GLIBTOP_SUID_MEM
-extern void glibtop_init_mem_p __P((glibtop *));
-extern void glibtop_get_mem_p __P((glibtop *, glibtop_mem *));
+void glibtop_init_mem_p (glibtop *server);
+void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
 #else
-extern void glibtop_init_mem_s __P((glibtop *));
-extern void glibtop_get_mem_s __P((glibtop *, glibtop_mem *));
+void glibtop_init_mem_s (glibtop *server);
+void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h
index 00a8ed5e..9e6e97a3 100644
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -57,9 +57,11 @@ struct _glibtop_mountlist
 
 #define glibtop_get_mountlist_r		glibtop_get_mountlist_s
 
-extern glibtop_mountentry *glibtop_get_mountlist_l __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
+glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
-extern glibtop_mountentry *glibtop_get_mountlist_s __P((glibtop *, glibtop_mountlist *, int));
+glibtop_mountentry *
+glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
 #ifdef GLIBTOP_NAMES
 
diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h
index 5616b23d..39d680bf 100644
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -59,14 +59,14 @@ struct _glibtop_msg_limits
 #define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
 #endif
 
-extern void glibtop_get_msg_limits_l __P((glibtop *, glibtop_msg_limits *));
+void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
 
 #if GLIBTOP_SUID_MSG_LIMITS
-extern void glibtop_init_msg_limits_p __P((glibtop *));
-extern void glibtop_get_msg_limits_p __P((glibtop *, glibtop_msg_limits *));
+void glibtop_init_msg_limits_p (glibtop *server);
+void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
 #else
-extern void glibtop_init_msg_limits_s __P((glibtop *));
-extern void glibtop_get_msg_limits_s __P((glibtop *, glibtop_msg_limits *));
+void glibtop_init_msg_limits_s (glibtop *server);
+void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
@@ -83,3 +83,4 @@ extern const char *glibtop_descriptions_msg_limits [];
 __END_DECLS
 
 #endif
+
diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h
index 1412c56a..a002a954 100644
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -92,14 +92,14 @@ struct _glibtop_netload
 #define glibtop_get_netload_r	glibtop_get_netload_s
 #endif
 
-extern void glibtop_get_netload_l __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface);
 
 #if GLIBTOP_SUID_NETLOAD
-extern void glibtop_init_netload_p __P((glibtop *));
-extern void glibtop_get_netload_p __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_init_netload_p (glibtop *server);
+void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface);
 #else
-extern void glibtop_init_netload_s __P((glibtop *));
-extern void glibtop_get_netload_s __P((glibtop *, glibtop_netload *, const char *));
+void glibtop_init_netload_s (glibtop *server);
+void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/open.h b/include/glibtop/open.h
index 0e0248fa..8c0ba1f0 100644
--- a/include/glibtop/open.h
+++ b/include/glibtop/open.h
@@ -49,11 +49,22 @@ __BEGIN_DECLS
 
 #define GLIBTOP_ERROR_METHOD_DEFAULT	GLIBTOP_ERROR_METHOD_WARN_ONCE
 
-extern void glibtop_open_l __P((glibtop *, const char *, const unsigned long, const unsigned));
+void
+glibtop_open_l (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
+
+void
+glibtop_init_p (glibtop *server, const unsigned long features,
+		const unsigned flags);
+
+void
+glibtop_open_p (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
+
+void
+glibtop_open_s (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags);
 
-extern void glibtop_init_p __P((glibtop *, const unsigned long, const unsigned));
-extern void glibtop_open_p __P((glibtop *, const char *, const unsigned long, const unsigned));
-extern void glibtop_open_s __P((glibtop *, const char *, const unsigned long, const unsigned));
 
 __END_DECLS
 
diff --git a/include/glibtop/parameter.h b/include/glibtop/parameter.h
index 199d4f3a..dbf4524a 100644
--- a/include/glibtop/parameter.h
+++ b/include/glibtop/parameter.h
@@ -36,8 +36,13 @@ __BEGIN_DECLS
 #define glibtop_get_parameter(p1,p2,p3)	glibtop_get_parameter_l(glibtop_global_server,p1,p2,p3)
 #define glibtop_set_parameter(p1,p2,p3) glibtop_set_parameter_l(glibtop_global_server,p1,p2,p3)
 
-extern size_t	glibtop_get_parameter_l __P((glibtop *, const unsigned, void *, size_t));
-extern void	glibtop_set_parameter_l __P((glibtop *, const unsigned, const void *, size_t));
+size_t
+glibtop_get_parameter_l (glibtop *server, const unsigned parameter,
+			 void *data_ptr, size_t data_size);
+
+void
+glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
+			 const void *data_ptr, size_t data_size);
 
 __END_DECLS
 
diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h
index 981d27d9..556e0854 100644
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -57,14 +57,14 @@ struct _glibtop_ppp
 #define glibtop_get_ppp_r	glibtop_get_ppp_s
 #endif
 
-extern void glibtop_get_ppp_l __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device);
 
 #if GLIBTOP_SUID_PPP
-extern void glibtop_init_ppp_p __P((glibtop *));
-extern void glibtop_get_ppp_p __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_init_ppp_p (glibtop *server);
+void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #else
-extern void glibtop_init_ppp_s __P((glibtop *));
-extern void glibtop_get_ppp_s __P((glibtop *, glibtop_ppp *, unsigned short));
+void glibtop_init_ppp_s (glibtop *server);
+void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h
index 0c68ac4c..aefaef70 100644
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -47,14 +47,22 @@ struct _glibtop_proc_args
 #define glibtop_get_proc_args_r		glibtop_get_proc_args_s
 #endif
 
-extern char  *glibtop_get_proc_args_l __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+char *
+glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 
 #if GLIBTOP_SUID_PROC_ARGS
-extern void glibtop_init_proc_args_p __P((glibtop *));
-extern char *glibtop_get_proc_args_p __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+void glibtop_init_proc_args_p (glibtop *server);
+
+char *
+glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 #else
-extern void glibtop_init_proc_args_s __P((glibtop *));
-extern char *glibtop_get_proc_args_s __P((glibtop *, glibtop_proc_args *, pid_t, unsigned));
+void glibtop_init_proc_args_s (glibtop *server);
+
+char *
+glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+			 pid_t pid, unsigned max_len);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h
index 4215aec6..97ae2112 100644
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -70,14 +70,14 @@ struct _glibtop_proc_kernel
 #define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_s
 #endif
 
-extern void glibtop_get_proc_kernel_l __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_KERNEL
-extern void glibtop_init_proc_kernel_p __P((glibtop *));
-extern void glibtop_get_proc_kernel_p __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_init_proc_kernel_p (glibtop *server);
+void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_kernel_s __P((glibtop *));
-extern void glibtop_get_proc_kernel_s __P((glibtop *, glibtop_proc_kernel *, pid_t));
+void glibtop_init_proc_kernel_s (glibtop *server);
+void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h
index a699463d..0ed2089f 100644
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -68,14 +68,22 @@ struct _glibtop_proclist
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
 
-extern unsigned *glibtop_get_proclist_l __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+unsigned *
+glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 
 #if GLIBTOP_SUID_PROCLIST
-extern void glibtop_init_proclist_p __P((glibtop *));
-extern unsigned *glibtop_get_proclist_p __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+void glibtop_init_proclist_p (glibtop *server);
+
+unsigned *
+glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 #else
-extern void glibtop_init_proclist_s __P((glibtop *));
-extern unsigned *glibtop_get_proclist_s __P((glibtop *, glibtop_proclist *, int64_t, int64_t));
+void glibtop_init_proclist_s (glibtop *server);
+
+unsigned *
+glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
+			int64_t which, int64_t arg);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h
index ca0fc77f..9096225b 100644
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -77,14 +77,19 @@ struct _glibtop_proc_map
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_s
 #endif
 
-extern glibtop_map_entry *glibtop_get_proc_map_l __P((glibtop *, glibtop_proc_map *, pid_t));
+glibtop_map_entry *
+glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MAP
-extern void glibtop_init_proc_map_p __P((glibtop *));
-extern glibtop_map_entry *glibtop_get_proc_map_p __P((glibtop *, glibtop_proc_map *, pid_t));
+void glibtop_init_proc_map_p (glibtop *server);
+
+glibtop_map_entry *
+glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_map_s __P((glibtop *));
-extern glibtop_map_entry *glibtop_get_proc_map_s __P((glibtop *, glibtop_proc_map *, pid_t));
+void glibtop_init_proc_map_s (glibtop *server);
+
+glibtop_map_entry *
+glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h
index dfb85d11..f9133d6e 100644
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -61,14 +61,14 @@ struct _glibtop_proc_mem
 #define glibtop_get_proc_mem_r		glibtop_get_proc_mem_s
 #endif
 
-extern void glibtop_get_proc_mem_l __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_MEM
-extern void glibtop_init_proc_mem_p __P((glibtop *));
-extern void glibtop_get_proc_mem_p __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_init_proc_mem_p (glibtop *server);
+void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_mem_s __P((glibtop *));
-extern void glibtop_get_proc_mem_s __P((glibtop *, glibtop_proc_mem *, pid_t));
+void glibtop_init_proc_mem_s (glibtop *server);
+void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h
index 764773fc..027eeaef 100644
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -64,14 +64,14 @@ struct _glibtop_proc_segment
 #define glibtop_get_proc_segment_r	glibtop_get_proc_segment_s
 #endif
 
-extern void glibtop_get_proc_segment_l __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SEGMENT
-extern void glibtop_init_proc_segment_p __P((glibtop *));
-extern void glibtop_get_proc_segment_p __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_init_proc_segment_p (glibtop *server);
+void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_segment_s __P((glibtop *));
-extern void glibtop_get_proc_segment_s __P((glibtop *, glibtop_proc_segment *, pid_t));
+void glibtop_init_proc_segment_s (glibtop *server);
+void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h
index d42b1a05..15add08b 100644
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -55,14 +55,14 @@ struct _glibtop_proc_signal
 #define glibtop_get_proc_signal_r	glibtop_get_proc_signal_s
 #endif
 
-extern void glibtop_get_proc_signal_l __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_SIGNAL
-extern void glibtop_init_proc_signal_p __P((glibtop *));
-extern void glibtop_get_proc_signal_p __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_init_proc_signal_p (glibtop *server);
+void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_signal_s __P((glibtop *));
-extern void glibtop_get_proc_signal_s __P((glibtop *, glibtop_proc_signal *, pid_t));
+void glibtop_init_proc_signal_s (glibtop *server);
+void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h
index 56f4fd1a..a26c8b11 100644
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -62,14 +62,14 @@ struct _glibtop_proc_state
 #define glibtop_get_proc_state_r	glibtop_get_proc_state_s
 #endif
 
-extern void glibtop_get_proc_state_l __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_STATE
-extern void glibtop_init_proc_state_p __P((glibtop *));
-extern void glibtop_get_proc_state_p __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_init_proc_state_p (glibtop *server);
+void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_state_s __P((glibtop *));
-extern void glibtop_get_proc_state_s __P((glibtop *, glibtop_proc_state *, pid_t));
+void glibtop_init_proc_state_s (glibtop *server);
+void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
      
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h
index d467d61c..c9ffac69 100644
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -76,14 +76,14 @@ struct _glibtop_proc_time
 #define glibtop_get_proc_time_r	glibtop_get_proc_time_s
 #endif
 
-extern void glibtop_get_proc_time_l __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_TIME
-extern void glibtop_init_proc_time_p __P((glibtop *));
-extern void glibtop_get_proc_time_p __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_init_proc_time_p (glibtop *server);
+void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_time_s __P((glibtop *));
-extern void glibtop_get_proc_time_s __P((glibtop *, glibtop_proc_time *, pid_t));
+void glibtop_init_proc_time_s (glibtop *server);
+void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h
index a83452f0..0d73de7b 100644
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -71,14 +71,14 @@ struct _glibtop_proc_uid
 #define glibtop_get_proc_uid_r		glibtop_get_proc_uid_s
 #endif
 
-extern void glibtop_get_proc_uid_l __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 
 #if GLIBTOP_SUID_PROC_UID
-extern void glibtop_init_proc_uid_p __P((glibtop *));
-extern void glibtop_get_proc_uid_p __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_init_proc_uid_p (glibtop *server);
+void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #else
-extern void glibtop_init_proc_uid_s __P((glibtop *));
-extern void glibtop_get_proc_uid_s __P((glibtop *, glibtop_proc_uid *, pid_t));
+void glibtop_init_proc_uid_s (glibtop *server);
+void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/read.h b/include/glibtop/read.h
index bd0945d7..b1658c1b 100644
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -29,8 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
 
-extern void glibtop_read_l __P((glibtop *, size_t, void *));
-extern void glibtop_read_s __P((glibtop *, size_t, void *));
+void glibtop_read_l (glibtop *server, size_t size, void *buf);
+void glibtop_read_s (glibtop *server, size_t size, void *buf);
 
 __END_DECLS
 
diff --git a/include/glibtop/read_data.h b/include/glibtop/read_data.h
index 8583a51b..67d13f82 100644
--- a/include/glibtop/read_data.h
+++ b/include/glibtop/read_data.h
@@ -29,8 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
 
-extern void *glibtop_read_data_l __P((glibtop *));
-extern void *glibtop_read_data_s __P((glibtop *));
+void *glibtop_read_data_l (glibtop *server);
+void *glibtop_read_data_s (glibtop *server);
 
 __END_DECLS
 
diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h
index 89526310..1ce0f794 100644
--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -65,14 +65,14 @@ struct _glibtop_sem_limits
 #define glibtop_get_sem_limits_r	glibtop_get_sem_limits_s
 #endif
 
-extern void glibtop_get_sem_limits_l __P((glibtop *, glibtop_sem_limits *));
+void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf);
 
 #if GLIBTOP_SUID_SEM_LIMITS
-extern void glibtop_init_sem_limits_p __P((glibtop *));
-extern void glibtop_get_sem_limits_p __P((glibtop *, glibtop_sem_limits *));
+void glibtop_init_sem_limits_p (glibtop *server);
+void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
 #else
-extern void glibtop_init_sem_limits_s __P((glibtop *));
-extern void glibtop_get_sem_limits_s __P((glibtop *, glibtop_sem_limits *));
+void glibtop_init_sem_limits_s (glibtop *server);
+void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h
index 6165c03d..7ee62eee 100644
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -55,14 +55,14 @@ struct _glibtop_shm_limits
 #define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
 #endif
 
-extern void glibtop_get_shm_limits_l __P((glibtop *, glibtop_shm_limits *));
+void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
 
 #if GLIBTOP_SUID_SHM_LIMITS
-extern void glibtop_init_shm_limits_p __P((glibtop *));
-extern void glibtop_get_shm_limits_p __P((glibtop *, glibtop_shm_limits *));
+void glibtop_init_shm_limits_p (glibtop *server);
+void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
-extern void glibtop_init_shm_limits_s __P((glibtop *));
-extern void glibtop_get_shm_limits_s __P((glibtop *, glibtop_shm_limits *));
+void glibtop_init_shm_limits_s (glibtop *server);
+void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h
index 3d0e8331..26139170 100644
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -55,14 +55,14 @@ struct _glibtop_swap
 #define glibtop_get_swap_r		glibtop_get_swap_s
 #endif
 
-extern void glibtop_get_swap_l __P((glibtop *, glibtop_swap *));
+void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf);
 
 #if GLIBTOP_SUID_SWAP
-extern void glibtop_init_swap_p __P((glibtop *));
-extern void glibtop_get_swap_p __P((glibtop *, glibtop_swap *));
+void glibtop_init_swap_p (glibtop *server);
+void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
 #else
-extern void glibtop_init_swap_s __P((glibtop *));
-extern void glibtop_get_swap_s __P((glibtop *, glibtop_swap *));
+void glibtop_init_swap_s (glibtop *server);
+void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index c0461b7c..a8e06595 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -90,7 +90,7 @@ struct _glibtop_sysdeps
 
 #define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
 
-extern void glibtop_get_sysdeps_r __P((glibtop *, glibtop_sysdeps *));
+void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
 
 #ifdef GLIBTOP_NAMES
 
diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h
index e9922465..e71d10aa 100644
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -55,7 +55,7 @@ struct _glibtop_sysinfo
 
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
-extern glibtop_sysinfo * glibtop_get_sysinfo_s __P((glibtop *));
+glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
 
 __END_DECLS
 
diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h
index e2a9a315..806f93ce 100644
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -49,14 +49,14 @@ struct _glibtop_uptime
 #define glibtop_get_uptime_r		glibtop_get_uptime_s
 #endif
 
-extern void glibtop_get_uptime_l __P((glibtop *, glibtop_uptime *));
+void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf);
 
 #if GLIBTOP_SUID_UPTIME
-extern void glibtop_init_uptime_p __P((glibtop *));
-extern void glibtop_get_uptime_p __P((glibtop *, glibtop_uptime *));
+void glibtop_init_uptime_p (glibtop *server);
+void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
 #else
-extern void glibtop_init_uptime_s __P((glibtop *));
-extern void glibtop_get_uptime_s __P((glibtop *, glibtop_uptime *));
+void glibtop_init_uptime_s (glibtop *server);
+void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/version.h b/include/glibtop/version.h
index 9a03faef..ae392df3 100644
--- a/include/glibtop/version.h
+++ b/include/glibtop/version.h
@@ -31,7 +31,7 @@ __BEGIN_DECLS
 
 #if _IN_LIBGTOP
 
-extern void glibtop_send_version __P((glibtop *, int));
+void glibtop_send_version (glibtop *server, int fd);
 
 #endif
 
diff --git a/include/glibtop/write.h b/include/glibtop/write.h
index 065da135..b0936fa5 100644
--- a/include/glibtop/write.h
+++ b/include/glibtop/write.h
@@ -29,8 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
 
-extern void glibtop_write_l __P((glibtop *, size_t, void *));
-extern void glibtop_write_s __P((glibtop *, size_t, void *));
+void glibtop_write_l (glibtop *server, size_t size, void *buf);
+void glibtop_write_s (glibtop *server, size_t size, void *buf);
 
 __END_DECLS
 
diff --git a/include/glibtop/xmalloc.h b/include/glibtop/xmalloc.h
index adc38812..23214e43 100644
--- a/include/glibtop/xmalloc.h
+++ b/include/glibtop/xmalloc.h
@@ -33,11 +33,11 @@ __BEGIN_DECLS
 #define glibtop_strdup(p1)	glibtop_strdup_r(glibtop_global_server, p1)
 #define glibtop_free(p1)	glibtop_free_r(glibtop_global_server, p1)
 
-extern void *glibtop_malloc_r	__P((glibtop *, size_t));
-extern void *glibtop_calloc_r	__P((glibtop *, size_t, size_t));
-extern void *glibtop_realloc_r	__P((glibtop *, void *, size_t));
-extern char *glibtop_strdup_r	__P((glibtop *, const char *));
-extern void glibtop_free_r	__P((glibtop *, const void *));
+void *glibtop_malloc_r	(glibtop *server, size_t size);
+void *glibtop_calloc_r	(glibtop *server, size_t nmemb, size_t size);
+void *glibtop_realloc_r	(glibtop *server, void *ptr, size_t size);
+char *glibtop_strdup_r	(glibtop *server, const char *string);
+void glibtop_free_r	(glibtop *server, const void *ptr);
 
 __END_DECLS
 
diff --git a/sysdeps/common/fsusage.c b/sysdeps/common/fsusage.c
index 9e6a84af..c0665523 100644
--- a/sysdeps/common/fsusage.c
+++ b/sysdeps/common/fsusage.c
@@ -66,8 +66,8 @@ int statvfs ();
 #include <glibtop/error.h>
 #include <glibtop/fsusage.h>
 
-static int get_fs_usage __P ((const char *, const char *,
-			      struct fs_usage *));
+static int
+get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp);
 
 int safe_read ();
 
diff --git a/sysdeps/common/gnuslib.c b/sysdeps/common/gnuslib.c
index 15a7078e..0fe2b300 100644
--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -35,11 +35,11 @@
 #include <fcntl.h>
 
 #ifdef UNIX_DOMAIN_SOCKETS
-static int connect_to_unix_server __P((void));
+static int connect_to_unix_server (void);
 #endif
 
 #ifdef INTERNET_DOMAIN_SOCKETS
-static int connect_to_internet_server __P((const char *, u_short));
+static int connect_to_internet_server (const char *serverhost, u_short port);
 #endif
 
 /* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
diff --git a/sysdeps/common/mountlist.c b/sysdeps/common/mountlist.c
index 09fb9a25..d8db10db 100644
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -38,7 +38,7 @@ void free ();
 #include <glibtop/xmalloc.h>
 #include <glibtop/mountlist.h>
 
-static struct mount_entry *read_filesystem_list __P((int, int));
+static struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs);
 
 #undef xmalloc
 #undef xrealloc