oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added `void *closure' argument to all sysdeps functions.

Browse Source 
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'.
This commit is contained in:
Martin Baulig
2001-04-20 17:12:11 +00:00
committed by Martin Baulig
parent bcc4ec968e
commit f4fc67f85c
28 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/glibtop/cpu.h
View File

@@ -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

2
include/glibtop/fsusage.h
View File

@@ -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

2
include/glibtop/inodedb.h
View File

@@ -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

4
include/glibtop/interfaces.h
View File

@@ -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

4
include/glibtop/loadavg.h
View File

@@ -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

4
include/glibtop/mem.h
View File

@@ -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

2
include/glibtop/mountlist.h
View File

@@ -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

4
include/glibtop/msg_limits.h
View File

@@ -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

4
include/glibtop/netinfo.h
View File

@@ -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

4
include/glibtop/netload.h
View File

@@ -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

4
include/glibtop/open.h
View File

@@ -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

4
include/glibtop/ppp.h
View File

@@ -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

4
include/glibtop/procargs.h
View File

@@ -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

4
include/glibtop/proccwd.h
View File

@@ -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

4
include/glibtop/prockernel.h
View File

@@ -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

4
include/glibtop/proclist.h
View File

@@ -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

4
include/glibtop/procmap.h
View File

@@ -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

4
include/glibtop/procmem.h
View File

@@ -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

4
include/glibtop/procsegment.h
View File

@@ -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

4
include/glibtop/procsignal.h
View File

@@ -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

4
include/glibtop/procstate.h
View File

@@ -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

4
include/glibtop/proctime.h
View File

@@ -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

4
include/glibtop/procuid.h
View File

@@ -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

4
include/glibtop/sem_limits.h
View File

@@ -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

2
include/glibtop/shm_limits.h
View File

@@ -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

4
include/glibtop/swap.h
View File

@@ -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

4
include/glibtop/uptime.h
View File

@@ -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