From f4fc67f85c71a4329f5939bd93cb4a5ea8afdd2c Mon Sep 17 00:00:00 2001
From: Martin Baulig <baulig@suse.de>
Date: Fri, 20 Apr 2001 17:12:11 +0000
Subject: [PATCH] Added `void *closure' argument to all sysdeps functions.

2001-04-20  Martin Baulig  <baulig@suse.de>

	* include/glibtop/*.h (glibtop_get_*_s, glibtop_get_*_pl):
	Added `void *closure' argument to all sysdeps functions.

	* include/glibtop/open.h (glibtop_open_s, glibtop_open_p):
	Removed the `const char *program_name' argument and added
	`void *closure'.
---
 ChangeLog                     | 9 +++++++++
 include/glibtop/cpu.h         | 4 ++--
 include/glibtop/fsusage.h     | 2 +-
 include/glibtop/inodedb.h     | 2 +-
 include/glibtop/interfaces.h  | 4 ++--
 include/glibtop/loadavg.h     | 4 ++--
 include/glibtop/mem.h         | 4 ++--
 include/glibtop/mountlist.h   | 2 +-
 include/glibtop/msg_limits.h  | 4 ++--
 include/glibtop/netinfo.h     | 4 ++--
 include/glibtop/netload.h     | 4 ++--
 include/glibtop/open.h        | 4 ++--
 include/glibtop/ppp.h         | 4 ++--
 include/glibtop/procargs.h    | 4 ++--
 include/glibtop/proccwd.h     | 4 ++--
 include/glibtop/prockernel.h  | 4 ++--
 include/glibtop/proclist.h    | 4 ++--
 include/glibtop/procmap.h     | 4 ++--
 include/glibtop/procmem.h     | 4 ++--
 include/glibtop/procsegment.h | 4 ++--
 include/glibtop/procsignal.h  | 4 ++--
 include/glibtop/procstate.h   | 4 ++--
 include/glibtop/proctime.h    | 4 ++--
 include/glibtop/procuid.h     | 4 ++--
 include/glibtop/sem_limits.h  | 4 ++--
 include/glibtop/shm_limits.h  | 2 +-
 include/glibtop/swap.h        | 4 ++--
 include/glibtop/uptime.h      | 4 ++--
 28 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 647935a4..c06427c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-20  Martin Baulig  <baulig@suse.de>
+
+	* include/glibtop/*.h (glibtop_get_*_s, glibtop_get_*_pl):
+	Added `void *closure' argument to all sysdeps functions.
+
+	* include/glibtop/open.h (glibtop_open_s, glibtop_open_p):
+	Removed the `const char *program_name' argument and added
+	`void *closure'.
+
 2001-04-20  Martin Baulig  <baulig@suse.de>
 
 	* libgtop.pc.in: Added pkg-config file.
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
index ae100126..cd65cd09 100644
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -76,10 +76,10 @@ int glibtop_get_cpu_l (glibtop_client *client, glibtop_cpu *buf);
 
 #if GLIBTOP_SUID_CPU
 int glibtop_init_cpu_p (glibtop *server);
-int glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
+int glibtop_get_cpu_p (glibtop *server, void *closure, glibtop_cpu *buf);
 #else
 int glibtop_init_cpu_s (glibtop_server *server);
-int glibtop_get_cpu_s (glibtop_server *server, glibtop_cpu *buf);
+int glibtop_get_cpu_s (glibtop_server *server, void *closure, glibtop_cpu *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h
index 4ffe367c..69e37b8f 100644
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -52,7 +52,7 @@ struct _glibtop_fsusage
 };
 
 int glibtop_get_fsusage_l (glibtop_client *client, glibtop_fsusage *buf, const char *mount_dir);
-int glibtop_get_fsusage_s (glibtop_server *server, glibtop_fsusage *buf, const char *mount_dir);
+int glibtop_get_fsusage_s (glibtop_server *server, void *closure, glibtop_fsusage *buf, const char *mount_dir);
 
 #ifdef GLIBTOP_NAMES
 
diff --git a/include/glibtop/inodedb.h b/include/glibtop/inodedb.h
index aac9259a..ce0ce4df 100644
--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -58,7 +58,7 @@ glibtop_inodedb_lookup_s (glibtop_server *server,
 			  u_int64_t device, u_int64_t inode);
 
 void
-glibtop_inodedb_close_s (glibtop_server *server, glibtop_inodedb *inodedb);
+glibtop_inodedb_close_s (glibtop_server *server, void *closure, glibtop_inodedb *inodedb);
 
 END_LIBGTOP_DECLS
 
diff --git a/include/glibtop/interfaces.h b/include/glibtop/interfaces.h
index 9c80cec9..88c0e88b 100644
--- a/include/glibtop/interfaces.h
+++ b/include/glibtop/interfaces.h
@@ -181,10 +181,10 @@ glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibto
 
 #if GLIBTOP_SUID_INTERFACE_NAMES
 int glibtop_init_interface_names_p (glibtop *server);
-glibtop_interface *glibtop_get_interface_names_p (glibtop *server, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_p (glibtop *server, void *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
 #else
 int glibtop_init_interface_names_s (glibtop_server *server);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
+glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, void *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h
index bb100155..29695644 100644
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -59,10 +59,10 @@ int glibtop_get_loadavg_l (glibtop_client *client, glibtop_loadavg *buf);
 
 #if GLIBTOP_SUID_LOADAVG
 int glibtop_init_loadavg_p (glibtop *server);
-int glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
+int glibtop_get_loadavg_p (glibtop *server, void *closure, glibtop_loadavg *buf);
 #else
 int glibtop_init_loadavg_s (glibtop_server *server);
-int glibtop_get_loadavg_s (glibtop_server *server, glibtop_loadavg *buf);
+int glibtop_get_loadavg_s (glibtop_server *server, void *closure, glibtop_loadavg *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h
index 26058caa..80238258 100644
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -67,10 +67,10 @@ int glibtop_get_mem_l (glibtop_client *client, glibtop_mem *buf);
 
 #if GLIBTOP_SUID_MEM
 int glibtop_init_mem_p (glibtop *server);
-int glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
+int glibtop_get_mem_p (glibtop *server, void *closure, glibtop_mem *buf);
 #else
 int glibtop_init_mem_s (glibtop_server *server);
-int glibtop_get_mem_s (glibtop_server *server, glibtop_mem *buf);
+int glibtop_get_mem_s (glibtop_server *server, void *closure, glibtop_mem *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h
index 731afe23..41180d82 100644
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -50,7 +50,7 @@ glibtop_mountentry *
 glibtop_get_mountlist_l (glibtop_client *client, glibtop_array *array, int all_fs);
 
 glibtop_mountentry *
-glibtop_get_mountlist_s (glibtop_server *server, glibtop_array *array, int all_fs);
+glibtop_get_mountlist_s (glibtop_server *server, void *closure, glibtop_array *array, int all_fs);
 
 #ifdef GLIBTOP_NAMES
 
diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h
index 366390ce..f4e56b51 100644
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -65,10 +65,10 @@ int glibtop_get_msg_limits_l (glibtop_client *client, glibtop_msg_limits *buf);
 
 #if GLIBTOP_SUID_MSG_LIMITS
 int glibtop_init_msg_limits_p (glibtop *server);
-int glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
+int glibtop_get_msg_limits_p (glibtop *server, void *closure, glibtop_msg_limits *buf);
 #else
 int glibtop_init_msg_limits_s (glibtop_server *server);
-int glibtop_get_msg_limits_s (glibtop_server *server, glibtop_msg_limits *buf);
+int glibtop_get_msg_limits_s (glibtop_server *server, void *closure, glibtop_msg_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h
index 147afee8..66f696d7 100644
--- a/include/glibtop/netinfo.h
+++ b/include/glibtop/netinfo.h
@@ -61,10 +61,10 @@ glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *ar
 
 #if GLIBTOP_SUID_NETINFO
 int glibtop_init_netinfo_p (glibtop *server);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop *server, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_p (glibtop *server, void *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
 #else
 int glibtop_init_netinfo_s (glibtop_server *server);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
+glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, void *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h
index fd4039f4..24812ac7 100644
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -73,10 +73,10 @@ int glibtop_get_netload_l (glibtop_client *client, glibtop_netload *buf, const c
 
 #if GLIBTOP_SUID_NETLOAD
 int glibtop_init_netload_p (glibtop *server);
-int glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
+int glibtop_get_netload_p (glibtop *server, void *closure, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
 #else
 int glibtop_init_netload_s (glibtop_server *server);
-int glibtop_get_netload_s (glibtop_server *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
+int glibtop_get_netload_s (glibtop_server *server, void *closure, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/open.h b/include/glibtop/open.h
index 360b884f..ef0ec1b8 100644
--- a/include/glibtop/open.h
+++ b/include/glibtop/open.h
@@ -60,11 +60,11 @@ glibtop_init_p (glibtop *server, const unsigned long features,
 		const unsigned flags);
 
 void
-glibtop_open_p (glibtop_server *server, const char *program_name,
+glibtop_open_p (glibtop_server *server, void *closure,
 		const unsigned long features, const unsigned flags);
 
 void
-glibtop_open_s (glibtop_server *server, const char *program_name,
+glibtop_open_s (glibtop_server *server, void *closure,
 		const unsigned long features, const unsigned flags);
 
 #ifdef _IN_LIBGTOP
diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h
index 96e58176..645cc821 100644
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -63,10 +63,10 @@ int glibtop_get_ppp_l (glibtop_client *client, glibtop_ppp *buf, unsigned short
 
 #if GLIBTOP_SUID_PPP
 int glibtop_init_ppp_p (glibtop *server);
-int glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn);
+int glibtop_get_ppp_p (glibtop *server, void *closure, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn);
 #else
 int glibtop_init_ppp_s (glibtop_server *server);
-int glibtop_get_ppp_s (glibtop_server *server, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn);
+int glibtop_get_ppp_s (glibtop_server *server, void *closure, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h
index 43bcb6c0..8fbc12d4 100644
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -47,12 +47,12 @@ glibtop_get_proc_args_l (glibtop_client *client, glibtop_array *array, pid_t pid
 int glibtop_init_proc_args_p (glibtop *server);
 
 char **
-glibtop_get_proc_args_p (glibtop *server, glibtop_array *array, pid_t pid);
+glibtop_get_proc_args_p (glibtop *server, void *closure, glibtop_array *array, pid_t pid);
 #else
 int glibtop_init_proc_args_s (glibtop_server *server);
 
 char **
-glibtop_get_proc_args_s (glibtop_server *server, glibtop_array *array, pid_t pid);
+glibtop_get_proc_args_s (glibtop_server *server, void *closure, glibtop_array *array, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/proccwd.h b/include/glibtop/proccwd.h
index 382da788..e621b524 100644
--- a/include/glibtop/proccwd.h
+++ b/include/glibtop/proccwd.h
@@ -61,10 +61,10 @@ char *glibtop_get_proc_cwd_l (glibtop_client *client, glibtop_proc_cwd *buf, pid
 
 #if GLIBTOP_SUID_PROC_CWD
 int glibtop_init_proc_cwd_p (glibtop *server);
-char *glibtop_get_proc_cwd_p (glibtop *server, glibtop_proc_cwd *buf, pid_t pid);
+char *glibtop_get_proc_cwd_p (glibtop *server, void *closure, glibtop_proc_cwd *buf, pid_t pid);
 #else
 int glibtop_init_proc_cwd_s (glibtop_server *server);
-char *glibtop_get_proc_cwd_s (glibtop_server *server, glibtop_proc_cwd *buf, pid_t pid);
+char *glibtop_get_proc_cwd_s (glibtop_server *server, void *closure, glibtop_proc_cwd *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h
index ae7d35e5..472c59a0 100644
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -87,10 +87,10 @@ int glibtop_get_proc_kernel_l (glibtop_client *client, glibtop_proc_kernel *buf,
 
 #if GLIBTOP_SUID_PROC_KERNEL
 int glibtop_init_proc_kernel_p (glibtop *server);
-int glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
+int glibtop_get_proc_kernel_p (glibtop *server, void *closure, glibtop_proc_kernel *buf, pid_t pid);
 #else
 int glibtop_init_proc_kernel_s (glibtop_server *server);
-int glibtop_get_proc_kernel_s (glibtop_server *server, glibtop_proc_kernel *buf, pid_t pid);
+int glibtop_get_proc_kernel_s (glibtop_server *server, void *closure, glibtop_proc_kernel *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h
index 134117e5..c10c6d38 100644
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -66,13 +66,13 @@ glibtop_get_proclist_l (glibtop_client *client, glibtop_array *array,
 int glibtop_init_proclist_p (glibtop *server);
 
 unsigned *
-glibtop_get_proclist_p (glibtop *server, glibtop_array *array,
+glibtop_get_proclist_p (glibtop *server, void *closure, glibtop_array *array,
 			int64_t which, int64_t arg);
 #else
 int glibtop_init_proclist_s (glibtop_server *server);
 
 unsigned *
-glibtop_get_proclist_s (glibtop_server *server, glibtop_array *array,
+glibtop_get_proclist_s (glibtop_server *server, void *closure, glibtop_array *array,
 			int64_t which, int64_t arg);
 #endif
 
diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h
index 698a6656..b8b6c48e 100644
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -73,12 +73,12 @@ glibtop_get_proc_map_l (glibtop_client *client, glibtop_array *array, pid_t pid)
 int glibtop_init_proc_map_p (glibtop *server);
 
 glibtop_map_entry *
-glibtop_get_proc_map_p (glibtop *server, glibtop_array *array, pid_t pid);
+glibtop_get_proc_map_p (glibtop *server, void *closure, glibtop_array *array, pid_t pid);
 #else
 int glibtop_init_proc_map_s (glibtop_server *server);
 
 glibtop_map_entry *
-glibtop_get_proc_map_s (glibtop_server *server, glibtop_array *array, pid_t pid);
+glibtop_get_proc_map_s (glibtop_server *server, void *closure, glibtop_array *array, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h
index 714357e3..ae2f8e8b 100644
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -67,10 +67,10 @@ int glibtop_get_proc_mem_l (glibtop_client *client, glibtop_proc_mem *buf, pid_t
 
 #if GLIBTOP_SUID_PROC_MEM
 int glibtop_init_proc_mem_p (glibtop *server);
-int glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
+int glibtop_get_proc_mem_p (glibtop *server, void *closure, glibtop_proc_mem *buf, pid_t pid);
 #else
 int glibtop_init_proc_mem_s (glibtop_server *server);
-int glibtop_get_proc_mem_s (glibtop_server *server, glibtop_proc_mem *buf, pid_t pid);
+int glibtop_get_proc_mem_s (glibtop_server *server, void *closure, glibtop_proc_mem *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h
index 815689f0..c6950ee7 100644
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -87,10 +87,10 @@ int glibtop_get_proc_segment_l (glibtop_client *client, glibtop_proc_segment *bu
 
 #if GLIBTOP_SUID_PROC_SEGMENT
 int glibtop_init_proc_segment_p (glibtop *server);
-int glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
+int glibtop_get_proc_segment_p (glibtop *server, void *closure, glibtop_proc_segment *buf, pid_t pid);
 #else
 int glibtop_init_proc_segment_s (glibtop_server *server);
-int glibtop_get_proc_segment_s (glibtop_server *server, glibtop_proc_segment *buf, pid_t pid);
+int glibtop_get_proc_segment_s (glibtop_server *server, void *closure, glibtop_proc_segment *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h
index b4a83e09..834572e8 100644
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -61,10 +61,10 @@ int glibtop_get_proc_signal_l (glibtop_client *client, glibtop_proc_signal *buf,
 
 #if GLIBTOP_SUID_PROC_SIGNAL
 int glibtop_init_proc_signal_p (glibtop *server);
-int glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
+int glibtop_get_proc_signal_p (glibtop *server, void *closure, glibtop_proc_signal *buf, pid_t pid);
 #else
 int glibtop_init_proc_signal_s (glibtop_server *server);
-int glibtop_get_proc_signal_s (glibtop_server *server, glibtop_proc_signal *buf, pid_t pid);
+int glibtop_get_proc_signal_s (glibtop_server *server, void *closure, glibtop_proc_signal *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h
index c4b8485f..bbbab30a 100644
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -87,10 +87,10 @@ int glibtop_get_proc_state_l (glibtop_client *client, glibtop_proc_state *buf, p
 
 #if GLIBTOP_SUID_PROC_STATE
 int glibtop_init_proc_state_p (glibtop *server);
-int glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
+int glibtop_get_proc_state_p (glibtop *server, void *closure, glibtop_proc_state *buf, pid_t pid);
 #else
 int glibtop_init_proc_state_s (glibtop_server *server);
-int glibtop_get_proc_state_s (glibtop_server *server, glibtop_proc_state *buf, pid_t pid);
+int glibtop_get_proc_state_s (glibtop_server *server, void *closure, glibtop_proc_state *buf, pid_t pid);
 #endif
      
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h
index f4b77298..4b38426b 100644
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -84,10 +84,10 @@ int glibtop_get_proc_time_l (glibtop_client *client, glibtop_proc_time *buf, pid
 
 #if GLIBTOP_SUID_PROC_TIME
 int glibtop_init_proc_time_p (glibtop *server);
-int glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
+int glibtop_get_proc_time_p (glibtop *server, void *closure, glibtop_proc_time *buf, pid_t pid);
 #else
 int glibtop_init_proc_time_s (glibtop_server *server);
-int glibtop_get_proc_time_s (glibtop_server *server, glibtop_proc_time *buf, pid_t pid);
+int glibtop_get_proc_time_s (glibtop_server *server, void *closure, glibtop_proc_time *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h
index 157f4908..effaac98 100644
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -89,10 +89,10 @@ int glibtop_get_proc_uid_l (glibtop_client *client, glibtop_proc_uid *buf, pid_t
 
 #if GLIBTOP_SUID_PROC_UID
 int glibtop_init_proc_uid_p (glibtop *server);
-int glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
+int glibtop_get_proc_uid_p (glibtop *server, void *closure, glibtop_proc_uid *buf, pid_t pid);
 #else
 int glibtop_init_proc_uid_s (glibtop_server *server);
-int glibtop_get_proc_uid_s (glibtop_server *server, glibtop_proc_uid *buf, pid_t pid);
+int glibtop_get_proc_uid_s (glibtop_server *server, void *closure, glibtop_proc_uid *buf, pid_t pid);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h
index 8e0a30f5..068464ed 100644
--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -71,10 +71,10 @@ int glibtop_get_sem_limits_l (glibtop_client *client, glibtop_sem_limits *buf);
 
 #if GLIBTOP_SUID_SEM_LIMITS
 int glibtop_init_sem_limits_p (glibtop *server);
-int glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
+int glibtop_get_sem_limits_p (glibtop *server, void *closure, glibtop_sem_limits *buf);
 #else
 int glibtop_init_sem_limits_s (glibtop_server *server);
-int glibtop_get_sem_limits_s (glibtop_server *server, glibtop_sem_limits *buf);
+int glibtop_get_sem_limits_s (glibtop_server *server, void *closure, glibtop_sem_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h
index 924b3b6c..0995c4f0 100644
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -64,7 +64,7 @@ int glibtop_init_shm_limits_p (glibtop *server);
 int glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
 #else
 int glibtop_init_shm_limits_s (glibtop_server *server);
-int glibtop_get_shm_limits_s (glibtop_server *server, glibtop_shm_limits *buf);
+int glibtop_get_shm_limits_s (glibtop_server *server, void *closure, glibtop_shm_limits *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h
index 683854ce..0e90e5da 100644
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -61,10 +61,10 @@ int glibtop_get_swap_l (glibtop_client *client, glibtop_swap *buf);
 
 #if GLIBTOP_SUID_SWAP
 int glibtop_init_swap_p (glibtop *server);
-int glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
+int glibtop_get_swap_p (glibtop *server, void *closure, glibtop_swap *buf);
 #else
 int glibtop_init_swap_s (glibtop_server *server);
-int glibtop_get_swap_s (glibtop_server *server, glibtop_swap *buf);
+int glibtop_get_swap_s (glibtop_server *server, void *closure, glibtop_swap *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES
diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h
index 5d29da48..0e24f0e1 100644
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -57,10 +57,10 @@ int glibtop_get_uptime_l (glibtop_client *client, glibtop_uptime *buf);
 
 #if GLIBTOP_SUID_UPTIME
 int glibtop_init_uptime_p (glibtop *server);
-int glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
+int glibtop_get_uptime_p (glibtop *server, void *closure, glibtop_uptime *buf);
 #else
 int glibtop_init_uptime_s (glibtop_server *server);
-int glibtop_get_uptime_s (glibtop_server *server, glibtop_uptime *buf);
+int glibtop_get_uptime_s (glibtop_server *server, void *closure, glibtop_uptime *buf);
 #endif
 
 #ifdef GLIBTOP_NAMES