From d6630b9f7adec0b55d823170fb52821c1be96f83 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 20 Apr 2001 18:09:15 +0000 Subject: Changed `void *closure' to `glibtop_closure *closure'. 2001-04-20 Martin Baulig * include/glibtop/*.h (glibtop_get_*_s, glibtop_get_*_pl): Changed `void *closure' to `glibtop_closure *closure'. * include/glibtop/*.h (glibtop_init_*_s): Added `glibtop_closure *closure' argument. (glibtop_init_*_p): Changed `glibtop *server' to `glibtop_server *server' and added `glibtop_closure *closure'. --- ChangeLog | 10 ++++++++++ include/glibtop/cpu.h | 8 ++++---- include/glibtop/fsusage.h | 2 +- include/glibtop/glibtop-backend.h | 2 +- include/glibtop/inodedb.h | 2 +- include/glibtop/interfaces.h | 8 ++++---- include/glibtop/loadavg.h | 8 ++++---- include/glibtop/mem.h | 8 ++++---- include/glibtop/mountlist.h | 2 +- include/glibtop/msg_limits.h | 8 ++++---- include/glibtop/netinfo.h | 8 ++++---- include/glibtop/netload.h | 8 ++++---- include/glibtop/open.h | 4 ++-- include/glibtop/ppp.h | 8 ++++---- include/glibtop/procargs.h | 8 ++++---- include/glibtop/proccwd.h | 8 ++++---- include/glibtop/prockernel.h | 8 ++++---- include/glibtop/proclist.h | 8 ++++---- include/glibtop/procmap.h | 8 ++++---- include/glibtop/procmem.h | 8 ++++---- include/glibtop/procsegment.h | 8 ++++---- include/glibtop/procsignal.h | 8 ++++---- include/glibtop/procstate.h | 8 ++++---- include/glibtop/proctime.h | 8 ++++---- include/glibtop/procuid.h | 8 ++++---- include/glibtop/sem_limits.h | 8 ++++---- include/glibtop/shm_limits.h | 8 ++++---- include/glibtop/swap.h | 8 ++++---- include/glibtop/uptime.h | 8 ++++---- 29 files changed, 108 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05e33289..319dd2fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-04-20 Martin Baulig + + * include/glibtop/*.h (glibtop_get_*_s, glibtop_get_*_pl): + Changed `void *closure' to `glibtop_closure *closure'. + + * include/glibtop/*.h + (glibtop_init_*_s): Added `glibtop_closure *closure' argument. + (glibtop_init_*_p): Changed `glibtop *server' to + `glibtop_server *server' and added `glibtop_closure *closure'. + 2001-04-20 Martin Baulig * include/glibtop/glibtop-server.h diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index cd65cd09..e77d5f2e 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -75,11 +75,11 @@ struct _glibtop_cpu 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, void *closure, glibtop_cpu *buf); +int glibtop_init_cpu_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_cpu_p (glibtop_server *server, glibtop_closure *closure, glibtop_cpu *buf); #else -int glibtop_init_cpu_s (glibtop_server *server); -int glibtop_get_cpu_s (glibtop_server *server, void *closure, glibtop_cpu *buf); +int glibtop_init_cpu_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_cpu_s (glibtop_server *server, glibtop_closure *closure, glibtop_cpu *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h index 69e37b8f..9120ec15 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, void *closure, glibtop_fsusage *buf, const char *mount_dir); +int glibtop_get_fsusage_s (glibtop_server *server, glibtop_closure *closure, glibtop_fsusage *buf, const char *mount_dir); #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/glibtop-backend.h b/include/glibtop/glibtop-backend.h index 24f4e837..72854b90 100644 --- a/include/glibtop/glibtop-backend.h +++ b/include/glibtop/glibtop-backend.h @@ -69,7 +69,7 @@ glibtop_backend_get (const char *backend_name, u_int64_t features, const char **backend_args, GError **error); void -glibtop_backend_set_closure_data (glibtop_backend *backend, void *closure); +glibtop_backend_set_closure_data (glibtop_backend *backend, glibtop_closure *closure); void * glibtop_backend_get_closure_data (glibtop_backend *backend); diff --git a/include/glibtop/inodedb.h b/include/glibtop/inodedb.h index ce0ce4df..d7199c9a 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, void *closure, glibtop_inodedb *inodedb); +glibtop_inodedb_close_s (glibtop_server *server, glibtop_closure *closure, glibtop_inodedb *inodedb); END_LIBGTOP_DECLS diff --git a/include/glibtop/interfaces.h b/include/glibtop/interfaces.h index 88c0e88b..d941aca8 100644 --- a/include/glibtop/interfaces.h +++ b/include/glibtop/interfaces.h @@ -180,11 +180,11 @@ struct _glibtop_interface glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy); #if GLIBTOP_SUID_INTERFACE_NAMES -int glibtop_init_interface_names_p (glibtop *server); -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); +int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure); +glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy); +int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure); +glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *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 29695644..40b9bc69 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -58,11 +58,11 @@ struct _glibtop_loadavg 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, void *closure, glibtop_loadavg *buf); +int glibtop_init_loadavg_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_loadavg_p (glibtop_server *server, glibtop_closure *closure, glibtop_loadavg *buf); #else -int glibtop_init_loadavg_s (glibtop_server *server); -int glibtop_get_loadavg_s (glibtop_server *server, void *closure, glibtop_loadavg *buf); +int glibtop_init_loadavg_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_loadavg_s (glibtop_server *server, glibtop_closure *closure, glibtop_loadavg *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h index 80238258..06f8f7ea 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -66,11 +66,11 @@ struct _glibtop_mem 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, void *closure, glibtop_mem *buf); +int glibtop_init_mem_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_mem_p (glibtop_server *server, glibtop_closure *closure, glibtop_mem *buf); #else -int glibtop_init_mem_s (glibtop_server *server); -int glibtop_get_mem_s (glibtop_server *server, void *closure, glibtop_mem *buf); +int glibtop_init_mem_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_mem_s (glibtop_server *server, glibtop_closure *closure, glibtop_mem *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index 41180d82..9f3afccc 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, void *closure, glibtop_array *array, int all_fs); +glibtop_get_mountlist_s (glibtop_server *server, glibtop_closure *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 f4e56b51..c8fc9d84 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -64,11 +64,11 @@ struct _glibtop_msg_limits 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, void *closure, glibtop_msg_limits *buf); +int glibtop_init_msg_limits_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_msg_limits_p (glibtop_server *server, glibtop_closure *closure, glibtop_msg_limits *buf); #else -int glibtop_init_msg_limits_s (glibtop_server *server); -int glibtop_get_msg_limits_s (glibtop_server *server, void *closure, glibtop_msg_limits *buf); +int glibtop_init_msg_limits_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_msg_limits_s (glibtop_server *server, glibtop_closure *closure, glibtop_msg_limits *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h index 66f696d7..e2e79c64 100644 --- a/include/glibtop/netinfo.h +++ b/include/glibtop/netinfo.h @@ -60,11 +60,11 @@ struct _glibtop_netinfo glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); #if GLIBTOP_SUID_NETINFO -int glibtop_init_netinfo_p (glibtop *server); -glibtop_ifaddr *glibtop_get_netinfo_p (glibtop *server, void *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); +int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure); +glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); +int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure); +glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *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 24812ac7..c8dd0cea 100644 --- a/include/glibtop/netload.h +++ b/include/glibtop/netload.h @@ -72,11 +72,11 @@ struct _glibtop_netload int glibtop_get_netload_l (glibtop_client *client, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol); #if GLIBTOP_SUID_NETLOAD -int glibtop_init_netload_p (glibtop *server); -int glibtop_get_netload_p (glibtop *server, void *closure, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol); +int glibtop_init_netload_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_netload_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol); +int glibtop_init_netload_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_netload_s (glibtop_server *server, glibtop_closure *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 ef0ec1b8..cf0e7c54 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, void *closure, +glibtop_open_p (glibtop_server *server, glibtop_closure *closure, const unsigned long features, const unsigned flags); void -glibtop_open_s (glibtop_server *server, void *closure, +glibtop_open_s (glibtop_server *server, glibtop_closure *closure, const unsigned long features, const unsigned flags); #ifdef _IN_LIBGTOP diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h index 645cc821..2f26b7cf 100644 --- a/include/glibtop/ppp.h +++ b/include/glibtop/ppp.h @@ -62,11 +62,11 @@ struct _glibtop_ppp int glibtop_get_ppp_l (glibtop_client *client, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn); #if GLIBTOP_SUID_PPP -int glibtop_init_ppp_p (glibtop *server); -int glibtop_get_ppp_p (glibtop *server, void *closure, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn); +int glibtop_init_ppp_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_ppp_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_ppp *buf, unsigned short device, unsigned short use_isdn); +int glibtop_init_ppp_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_ppp_s (glibtop_server *server, glibtop_closure *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 8fbc12d4..545e4769 100644 --- a/include/glibtop/procargs.h +++ b/include/glibtop/procargs.h @@ -44,15 +44,15 @@ char ** glibtop_get_proc_args_l (glibtop_client *client, glibtop_array *array, pid_t pid); #if GLIBTOP_SUID_PROC_ARGS -int glibtop_init_proc_args_p (glibtop *server); +int glibtop_init_proc_args_p (glibtop_server *server, glibtop_closure *closure); char ** -glibtop_get_proc_args_p (glibtop *server, void *closure, glibtop_array *array, pid_t pid); +glibtop_get_proc_args_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, pid_t pid); #else -int glibtop_init_proc_args_s (glibtop_server *server); +int glibtop_init_proc_args_s (glibtop_server *server, glibtop_closure *closure); char ** -glibtop_get_proc_args_s (glibtop_server *server, void *closure, glibtop_array *array, pid_t pid); +glibtop_get_proc_args_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, pid_t pid); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/proccwd.h b/include/glibtop/proccwd.h index e621b524..eb900bf8 100644 --- a/include/glibtop/proccwd.h +++ b/include/glibtop/proccwd.h @@ -60,11 +60,11 @@ struct _glibtop_proc_cwd char *glibtop_get_proc_cwd_l (glibtop_client *client, glibtop_proc_cwd *buf, pid_t pid); #if GLIBTOP_SUID_PROC_CWD -int glibtop_init_proc_cwd_p (glibtop *server); -char *glibtop_get_proc_cwd_p (glibtop *server, void *closure, glibtop_proc_cwd *buf, pid_t pid); +int glibtop_init_proc_cwd_p (glibtop_server *server, glibtop_closure *closure); +char *glibtop_get_proc_cwd_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_cwd *buf, pid_t pid); +int glibtop_init_proc_cwd_s (glibtop_server *server, glibtop_closure *closure); +char *glibtop_get_proc_cwd_s (glibtop_server *server, glibtop_closure *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 472c59a0..dadcb627 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -86,11 +86,11 @@ struct _glibtop_proc_kernel int glibtop_get_proc_kernel_l (glibtop_client *client, glibtop_proc_kernel *buf, pid_t pid); #if GLIBTOP_SUID_PROC_KERNEL -int glibtop_init_proc_kernel_p (glibtop *server); -int glibtop_get_proc_kernel_p (glibtop *server, void *closure, glibtop_proc_kernel *buf, pid_t pid); +int glibtop_init_proc_kernel_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_kernel_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_kernel *buf, pid_t pid); +int glibtop_init_proc_kernel_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_kernel_s (glibtop_server *server, glibtop_closure *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 c10c6d38..23e9bac5 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -63,16 +63,16 @@ glibtop_get_proclist_l (glibtop_client *client, glibtop_array *array, int64_t which, int64_t arg); #if GLIBTOP_SUID_PROCLIST -int glibtop_init_proclist_p (glibtop *server); +int glibtop_init_proclist_p (glibtop_server *server, glibtop_closure *closure); unsigned * -glibtop_get_proclist_p (glibtop *server, void *closure, glibtop_array *array, +glibtop_get_proclist_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, int64_t which, int64_t arg); #else -int glibtop_init_proclist_s (glibtop_server *server); +int glibtop_init_proclist_s (glibtop_server *server, glibtop_closure *closure); unsigned * -glibtop_get_proclist_s (glibtop_server *server, void *closure, glibtop_array *array, +glibtop_get_proclist_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, int64_t which, int64_t arg); #endif diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index b8b6c48e..b40a7802 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -70,15 +70,15 @@ glibtop_map_entry * glibtop_get_proc_map_l (glibtop_client *client, glibtop_array *array, pid_t pid); #if GLIBTOP_SUID_PROC_MAP -int glibtop_init_proc_map_p (glibtop *server); +int glibtop_init_proc_map_p (glibtop_server *server, glibtop_closure *closure); glibtop_map_entry * -glibtop_get_proc_map_p (glibtop *server, void *closure, glibtop_array *array, pid_t pid); +glibtop_get_proc_map_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, pid_t pid); #else -int glibtop_init_proc_map_s (glibtop_server *server); +int glibtop_init_proc_map_s (glibtop_server *server, glibtop_closure *closure); glibtop_map_entry * -glibtop_get_proc_map_s (glibtop_server *server, void *closure, glibtop_array *array, pid_t pid); +glibtop_get_proc_map_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, pid_t pid); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h index ae2f8e8b..51f0e9a3 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -66,11 +66,11 @@ struct _glibtop_proc_mem int glibtop_get_proc_mem_l (glibtop_client *client, glibtop_proc_mem *buf, pid_t pid); #if GLIBTOP_SUID_PROC_MEM -int glibtop_init_proc_mem_p (glibtop *server); -int glibtop_get_proc_mem_p (glibtop *server, void *closure, glibtop_proc_mem *buf, pid_t pid); +int glibtop_init_proc_mem_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_mem_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_mem *buf, pid_t pid); +int glibtop_init_proc_mem_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_mem_s (glibtop_server *server, glibtop_closure *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 c6950ee7..a64bd520 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -86,11 +86,11 @@ struct _glibtop_proc_segment int glibtop_get_proc_segment_l (glibtop_client *client, glibtop_proc_segment *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SEGMENT -int glibtop_init_proc_segment_p (glibtop *server); -int glibtop_get_proc_segment_p (glibtop *server, void *closure, glibtop_proc_segment *buf, pid_t pid); +int glibtop_init_proc_segment_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_segment_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_segment *buf, pid_t pid); +int glibtop_init_proc_segment_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_segment_s (glibtop_server *server, glibtop_closure *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 834572e8..4617c823 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -60,11 +60,11 @@ struct _glibtop_proc_signal int glibtop_get_proc_signal_l (glibtop_client *client, glibtop_proc_signal *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SIGNAL -int glibtop_init_proc_signal_p (glibtop *server); -int glibtop_get_proc_signal_p (glibtop *server, void *closure, glibtop_proc_signal *buf, pid_t pid); +int glibtop_init_proc_signal_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_signal_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_signal *buf, pid_t pid); +int glibtop_init_proc_signal_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_signal_s (glibtop_server *server, glibtop_closure *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 bbbab30a..dbd54f15 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -86,11 +86,11 @@ struct _glibtop_proc_state int glibtop_get_proc_state_l (glibtop_client *client, glibtop_proc_state *buf, pid_t pid); #if GLIBTOP_SUID_PROC_STATE -int glibtop_init_proc_state_p (glibtop *server); -int glibtop_get_proc_state_p (glibtop *server, void *closure, glibtop_proc_state *buf, pid_t pid); +int glibtop_init_proc_state_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_state_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_state *buf, pid_t pid); +int glibtop_init_proc_state_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_state_s (glibtop_server *server, glibtop_closure *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 4b38426b..74e40619 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -83,11 +83,11 @@ struct _glibtop_proc_time int glibtop_get_proc_time_l (glibtop_client *client, glibtop_proc_time *buf, pid_t pid); #if GLIBTOP_SUID_PROC_TIME -int glibtop_init_proc_time_p (glibtop *server); -int glibtop_get_proc_time_p (glibtop *server, void *closure, glibtop_proc_time *buf, pid_t pid); +int glibtop_init_proc_time_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_time_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_time *buf, pid_t pid); +int glibtop_init_proc_time_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_time_s (glibtop_server *server, glibtop_closure *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 effaac98..633b6bdd 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -88,11 +88,11 @@ struct _glibtop_proc_uid int glibtop_get_proc_uid_l (glibtop_client *client, glibtop_proc_uid *buf, pid_t pid); #if GLIBTOP_SUID_PROC_UID -int glibtop_init_proc_uid_p (glibtop *server); -int glibtop_get_proc_uid_p (glibtop *server, void *closure, glibtop_proc_uid *buf, pid_t pid); +int glibtop_init_proc_uid_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_uid_p (glibtop_server *server, glibtop_closure *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, void *closure, glibtop_proc_uid *buf, pid_t pid); +int glibtop_init_proc_uid_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_proc_uid_s (glibtop_server *server, glibtop_closure *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 068464ed..dc8384d0 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -70,11 +70,11 @@ struct _glibtop_sem_limits 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, void *closure, glibtop_sem_limits *buf); +int glibtop_init_sem_limits_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_sem_limits_p (glibtop_server *server, glibtop_closure *closure, glibtop_sem_limits *buf); #else -int glibtop_init_sem_limits_s (glibtop_server *server); -int glibtop_get_sem_limits_s (glibtop_server *server, void *closure, glibtop_sem_limits *buf); +int glibtop_init_sem_limits_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_sem_limits_s (glibtop_server *server, glibtop_closure *closure, glibtop_sem_limits *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index 0995c4f0..1d37ca30 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -60,11 +60,11 @@ struct _glibtop_shm_limits int glibtop_get_shm_limits_l (glibtop_client *client, glibtop_shm_limits *buf); #if GLIBTOP_SUID_SHM_LIMITS -int glibtop_init_shm_limits_p (glibtop *server); -int glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf); +int glibtop_init_shm_limits_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_shm_limits_p (glibtop_server *, glibtop_shm_limits *buf); #else -int glibtop_init_shm_limits_s (glibtop_server *server); -int glibtop_get_shm_limits_s (glibtop_server *server, void *closure, glibtop_shm_limits *buf); +int glibtop_init_shm_limits_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_shm_limits_s (glibtop_server *server, glibtop_closure *closure, glibtop_shm_limits *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h index 0e90e5da..014846ce 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -60,11 +60,11 @@ struct _glibtop_swap 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, void *closure, glibtop_swap *buf); +int glibtop_init_swap_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_swap_p (glibtop_server *server, glibtop_closure *closure, glibtop_swap *buf); #else -int glibtop_init_swap_s (glibtop_server *server); -int glibtop_get_swap_s (glibtop_server *server, void *closure, glibtop_swap *buf); +int glibtop_init_swap_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_swap_s (glibtop_server *server, glibtop_closure *closure, glibtop_swap *buf); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 0e24f0e1..61a82b0c 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -56,11 +56,11 @@ struct _glibtop_uptime 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, void *closure, glibtop_uptime *buf); +int glibtop_init_uptime_p (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_uptime_p (glibtop_server *server, glibtop_closure *closure, glibtop_uptime *buf); #else -int glibtop_init_uptime_s (glibtop_server *server); -int glibtop_get_uptime_s (glibtop_server *server, void *closure, glibtop_uptime *buf); +int glibtop_init_uptime_s (glibtop_server *server, glibtop_closure *closure); +int glibtop_get_uptime_s (glibtop_server *server, glibtop_closure *closure, glibtop_uptime *buf); #endif #ifdef GLIBTOP_NAMES -- cgit v1.2.1