From aa9fafe5c330373ca456ca7ae0fd156e1a0ac492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Wed, 11 Apr 2007 17:52:14 +0000 Subject: Renamed all glibtop_init_xxx functions to _glibtop_init_xxx so they get MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-04-11 Benoît Dejean * *: Renamed all glibtop_init_xxx functions to _glibtop_init_xxx so they get internal visibility. * configure.in: Bumped version number. svn path=/trunk/; revision=2569 --- ChangeLog | 11 ++++++ configure.in | 2 +- include/glibtop/cpu.h | 4 +- include/glibtop/init_hooks.h | 6 +-- include/glibtop/loadavg.h | 4 +- include/glibtop/mem.h | 4 +- include/glibtop/msg_limits.h | 4 +- include/glibtop/netlist.h | 4 +- include/glibtop/netload.h | 4 +- include/glibtop/ppp.h | 4 +- include/glibtop/procargs.h | 4 +- include/glibtop/prockernel.h | 4 +- include/glibtop/proclist.h | 4 +- include/glibtop/procmap.h | 4 +- include/glibtop/procmem.h | 4 +- include/glibtop/procopenfiles.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 | 4 +- include/glibtop/swap.h | 4 +- include/glibtop/uptime.h | 4 +- lib/init.c | 2 +- lib/sysdeps.c | 88 ++++++++++++++++++++--------------------- sysdeps/aix/cpu.c | 2 +- sysdeps/aix/loadavg.c | 2 +- sysdeps/aix/mem.c | 2 +- sysdeps/aix/msg_limits.c | 2 +- sysdeps/aix/netlist.c | 2 +- sysdeps/aix/netload.c | 2 +- sysdeps/aix/open.c | 2 +- sysdeps/aix/ppp.c | 2 +- sysdeps/aix/procargs.c | 2 +- sysdeps/aix/prockernel.c | 2 +- sysdeps/aix/proclist.c | 2 +- sysdeps/aix/procmap.c | 2 +- sysdeps/aix/procmem.c | 2 +- sysdeps/aix/procsegment.c | 2 +- sysdeps/aix/procsignal.c | 2 +- sysdeps/aix/procstate.c | 2 +- sysdeps/aix/proctime.c | 2 +- sysdeps/aix/procuid.c | 2 +- sysdeps/aix/sem_limits.c | 2 +- sysdeps/aix/shm_limits.c | 2 +- sysdeps/aix/swap.c | 2 +- sysdeps/aix/uptime.c | 2 +- sysdeps/bsd/cpu.c | 2 +- sysdeps/bsd/loadavg.c | 2 +- sysdeps/bsd/mem.c | 2 +- sysdeps/bsd/msg_limits.c | 4 +- sysdeps/bsd/netlist.c | 2 +- sysdeps/bsd/netload.c | 2 +- sysdeps/bsd/open.c | 2 +- sysdeps/bsd/ppp.c | 2 +- sysdeps/bsd/procargs.c | 2 +- sysdeps/bsd/prockernel.c | 2 +- sysdeps/bsd/proclist.c | 2 +- sysdeps/bsd/procmap.c | 2 +- sysdeps/bsd/procmem.c | 2 +- sysdeps/bsd/procopenfiles.c | 2 +- sysdeps/bsd/procsegment.c | 2 +- sysdeps/bsd/procsignal.c | 2 +- sysdeps/bsd/procstate.c | 2 +- sysdeps/bsd/proctime.c | 2 +- sysdeps/bsd/procuid.c | 2 +- sysdeps/bsd/sem_limits.c | 4 +- sysdeps/bsd/shm_limits.c | 4 +- sysdeps/bsd/swap.c | 2 +- sysdeps/bsd/uptime.c | 2 +- sysdeps/common/sysdeps_suid.c | 44 ++++++++++----------- sysdeps/freebsd/cpu.c | 2 +- sysdeps/freebsd/loadavg.c | 2 +- sysdeps/freebsd/mem.c | 2 +- sysdeps/freebsd/msg_limits.c | 2 +- sysdeps/freebsd/netlist.c | 2 +- sysdeps/freebsd/netload.c | 2 +- sysdeps/freebsd/open.c | 2 +- sysdeps/freebsd/ppp.c | 2 +- sysdeps/freebsd/procargs.c | 2 +- sysdeps/freebsd/prockernel.c | 2 +- sysdeps/freebsd/proclist.c | 2 +- sysdeps/freebsd/procmap.c | 2 +- sysdeps/freebsd/procmem.c | 2 +- sysdeps/freebsd/procopenfiles.c | 2 +- sysdeps/freebsd/procsegment.c | 2 +- sysdeps/freebsd/procsignal.c | 2 +- sysdeps/freebsd/procstate.c | 2 +- sysdeps/freebsd/proctime.c | 2 +- sysdeps/freebsd/procuid.c | 2 +- sysdeps/freebsd/sem_limits.c | 2 +- sysdeps/freebsd/shm_limits.c | 2 +- sysdeps/freebsd/swap.c | 2 +- sysdeps/freebsd/uptime.c | 2 +- sysdeps/linux/cpu.c | 2 +- sysdeps/linux/loadavg.c | 2 +- sysdeps/linux/mem.c | 2 +- sysdeps/linux/msg_limits.c | 2 +- sysdeps/linux/netlist.c | 2 +- sysdeps/linux/netload.c | 2 +- sysdeps/linux/ppp.c | 2 +- sysdeps/linux/procargs.c | 2 +- sysdeps/linux/prockernel.c | 2 +- sysdeps/linux/proclist.c | 2 +- sysdeps/linux/procmap.c | 2 +- sysdeps/linux/procmem.c | 2 +- sysdeps/linux/procopenfiles.c | 2 +- sysdeps/linux/procsegment.c | 2 +- sysdeps/linux/procsignal.c | 2 +- sysdeps/linux/procstate.c | 2 +- sysdeps/linux/proctime.c | 2 +- sysdeps/linux/procuid.c | 2 +- sysdeps/linux/sem_limits.c | 2 +- sysdeps/linux/shm_limits.c | 2 +- sysdeps/linux/swap.c | 2 +- sysdeps/linux/uptime.c | 2 +- sysdeps/osf1/cpu.c | 2 +- sysdeps/osf1/loadavg.c | 2 +- sysdeps/osf1/mem.c | 2 +- sysdeps/osf1/msg_limits.c | 2 +- sysdeps/osf1/netload.c | 2 +- sysdeps/osf1/open_suid.c | 2 +- sysdeps/osf1/ppp.c | 2 +- sysdeps/osf1/procargs.c | 2 +- sysdeps/osf1/prockernel.c | 2 +- sysdeps/osf1/proclist.c | 2 +- sysdeps/osf1/procmap.c | 2 +- sysdeps/osf1/procmem.c | 2 +- sysdeps/osf1/procsegment.c | 2 +- sysdeps/osf1/procsignal.c | 2 +- sysdeps/osf1/procstate.c | 2 +- sysdeps/osf1/proctime.c | 2 +- sysdeps/osf1/procuid.c | 2 +- sysdeps/osf1/sem_limits.c | 2 +- sysdeps/osf1/shm_limits.c | 2 +- sysdeps/osf1/swap.c | 2 +- sysdeps/osf1/uptime.c | 2 +- sysdeps/solaris/cpu.c | 2 +- sysdeps/solaris/loadavg.c | 2 +- sysdeps/solaris/mem.c | 2 +- sysdeps/solaris/msg_limits.c | 2 +- sysdeps/solaris/netlist.c | 2 +- sysdeps/solaris/netload.c | 2 +- sysdeps/solaris/open_suid.c | 2 +- sysdeps/solaris/ppp.c | 2 +- sysdeps/solaris/procargs.c | 2 +- sysdeps/solaris/prockernel.c | 2 +- sysdeps/solaris/proclist.c | 2 +- sysdeps/solaris/procmap.c | 2 +- sysdeps/solaris/procmem.c | 2 +- sysdeps/solaris/procopenfiles.c | 2 +- sysdeps/solaris/procsegment.c | 2 +- sysdeps/solaris/procsignal.c | 2 +- sysdeps/solaris/procstate.c | 2 +- sysdeps/solaris/proctime.c | 2 +- sysdeps/solaris/procuid.c | 2 +- sysdeps/solaris/sem_limits.c | 2 +- sysdeps/solaris/shm_limits.c | 2 +- sysdeps/solaris/swap.c | 2 +- sysdeps/solaris/uptime.c | 2 +- sysdeps/stub/cpu.c | 2 +- sysdeps/stub/loadavg.c | 2 +- sysdeps/stub/mem.c | 2 +- sysdeps/stub/msg_limits.c | 2 +- sysdeps/stub/netlist.c | 2 +- sysdeps/stub/netload.c | 2 +- sysdeps/stub/ppp.c | 2 +- sysdeps/stub/procargs.c | 2 +- sysdeps/stub/prockernel.c | 2 +- sysdeps/stub/proclist.c | 2 +- sysdeps/stub/procmap.c | 2 +- sysdeps/stub/procmem.c | 2 +- sysdeps/stub/procopenfiles.c | 2 +- sysdeps/stub/procsegment.c | 2 +- sysdeps/stub/procsignal.c | 2 +- sysdeps/stub/procstate.c | 2 +- sysdeps/stub/proctime.c | 2 +- sysdeps/stub/procuid.c | 2 +- sysdeps/stub/sem_limits.c | 2 +- sysdeps/stub/shm_limits.c | 2 +- sysdeps/stub/swap.c | 2 +- sysdeps/stub/uptime.c | 2 +- sysdeps/stub_suid/cpu.c | 2 +- sysdeps/stub_suid/loadavg.c | 2 +- sysdeps/stub_suid/mem.c | 2 +- sysdeps/stub_suid/msg_limits.c | 2 +- sysdeps/stub_suid/netload.c | 2 +- sysdeps/stub_suid/open.c | 2 +- sysdeps/stub_suid/ppp.c | 2 +- sysdeps/stub_suid/procargs.c | 2 +- sysdeps/stub_suid/prockernel.c | 2 +- sysdeps/stub_suid/proclist.c | 2 +- sysdeps/stub_suid/procmap.c | 2 +- sysdeps/stub_suid/procmem.c | 2 +- sysdeps/stub_suid/procsegment.c | 2 +- sysdeps/stub_suid/procsignal.c | 2 +- sysdeps/stub_suid/procstate.c | 2 +- sysdeps/stub_suid/proctime.c | 2 +- sysdeps/stub_suid/procuid.c | 2 +- sysdeps/stub_suid/sem_limits.c | 2 +- sysdeps/stub_suid/shm_limits.c | 2 +- sysdeps/stub_suid/swap.c | 2 +- sysdeps/stub_suid/uptime.c | 2 +- sysdeps/sun4/ppp.c | 2 +- 206 files changed, 307 insertions(+), 296 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f39e256..a1e0b859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-04-11 Benoît Dejean + + * *: + + Renamed all glibtop_init_xxx functions + to _glibtop_init_xxx so they get internal visibility. + + * configure.in: + + Bumped version number. + 2007-03-13 Benoît Dejean * MAINTAINERS: diff --git a/configure.in b/configure.in index a7ac30b7..69c9940c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl m4_define([libgtop_major_version], [2]) m4_define([libgtop_minor_version], [14]) -m4_define([libgtop_micro_version], [8]) +m4_define([libgtop_micro_version], [9]) m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version]) dnl increment if the interface has additions, changes, removals. diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index 88121add..1d673e91 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -92,10 +92,10 @@ void glibtop_get_cpu(glibtop_cpu *buf); void glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf); #if GLIBTOP_SUID_CPU -void glibtop_init_cpu_p (glibtop *server); +void _glibtop_init_cpu_p (glibtop *server); void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf); #else -void glibtop_init_cpu_s (glibtop *server); +void _glibtop_init_cpu_s (glibtop *server); void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf); #endif diff --git a/include/glibtop/init_hooks.h b/include/glibtop/init_hooks.h index f2deef92..35f4d235 100644 --- a/include/glibtop/init_hooks.h +++ b/include/glibtop/init_hooks.h @@ -5,10 +5,10 @@ G_BEGIN_DECLS -typedef void (*glibtop_init_func_t)(glibtop *); +typedef void (*_glibtop_init_func_t)(glibtop *); -extern const glibtop_init_func_t _glibtop_init_hook_s[]; -extern const glibtop_init_func_t _glibtop_init_hook_p[]; +extern const _glibtop_init_func_t _glibtop_init_hook_s[]; +extern const _glibtop_init_func_t _glibtop_init_hook_p[]; G_END_DECLS diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index 8412e8cc..2f7f4c06 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -56,10 +56,10 @@ void glibtop_get_loadavg(glibtop_loadavg *buf); void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf); #if GLIBTOP_SUID_LOADAVG -void glibtop_init_loadavg_p (glibtop *server); +void _glibtop_init_loadavg_p (glibtop *server); void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf); #else -void glibtop_init_loadavg_s (glibtop *server); +void _glibtop_init_loadavg_s (glibtop *server); void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf); #endif diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h index 264dc3f1..00920675 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -64,10 +64,10 @@ void glibtop_get_mem(glibtop_mem *buf); void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf); #if GLIBTOP_SUID_MEM -void glibtop_init_mem_p (glibtop *server); +void _glibtop_init_mem_p (glibtop *server); void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf); #else -void glibtop_init_mem_s (glibtop *server); +void _glibtop_init_mem_s (glibtop *server); void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf); #endif diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h index dd82af71..e90b8032 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -62,10 +62,10 @@ void glibtop_get_msg_limits(glibtop_msg_limits *buf); void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf); #if GLIBTOP_SUID_MSG_LIMITS -void glibtop_init_msg_limits_p (glibtop *server); +void _glibtop_init_msg_limits_p (glibtop *server); void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf); #else -void glibtop_init_msg_limits_s (glibtop *server); +void _glibtop_init_msg_limits_s (glibtop *server); void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf); #endif diff --git a/include/glibtop/netlist.h b/include/glibtop/netlist.h index 6f174d0e..f821c77d 100644 --- a/include/glibtop/netlist.h +++ b/include/glibtop/netlist.h @@ -48,10 +48,10 @@ char** glibtop_get_netlist(glibtop_netlist *buf); char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf); #if GLIBTOP_SUID_NETLIST -void glibtop_init_netlist_p (glibtop *server); +void _glibtop_init_netlist_p (glibtop *server); char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf); #else -void glibtop_init_netlist_s (glibtop *server); +void _glibtop_init_netlist_s (glibtop *server); char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf); #endif diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h index 7a2af998..80e848eb 100644 --- a/include/glibtop/netload.h +++ b/include/glibtop/netload.h @@ -117,10 +117,10 @@ void glibtop_get_netload(glibtop_netload *buf, const char *interface); void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface); #if GLIBTOP_SUID_NETLOAD -void glibtop_init_netload_p (glibtop *server); +void _glibtop_init_netload_p (glibtop *server); void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface); #else -void glibtop_init_netload_s (glibtop *server); +void _glibtop_init_netload_s (glibtop *server); void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface); #endif diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h index f28ae85e..0b39ae32 100644 --- a/include/glibtop/ppp.h +++ b/include/glibtop/ppp.h @@ -60,10 +60,10 @@ void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device); void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device); #if GLIBTOP_SUID_PPP -void glibtop_init_ppp_p (glibtop *server); +void _glibtop_init_ppp_p (glibtop *server); void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device); #else -void glibtop_init_ppp_s (glibtop *server); +void _glibtop_init_ppp_s (glibtop *server); void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device); #endif diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h index 9aed0435..59d4da3f 100644 --- a/include/glibtop/procargs.h +++ b/include/glibtop/procargs.h @@ -51,7 +51,7 @@ glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len); # define glibtop_get_proc_args_r glibtop_get_proc_args_p - void glibtop_init_proc_args_p (glibtop *server); + void _glibtop_init_proc_args_p (glibtop *server); char * glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf, @@ -62,7 +62,7 @@ glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len); # define glibtop_get_proc_args_r glibtop_get_proc_args_s - void glibtop_init_proc_args_s (glibtop *server); + void _glibtop_init_proc_args_s (glibtop *server); char * glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf, diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h index d949a31d..a0f80740 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -73,10 +73,10 @@ void glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid); void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid); #if GLIBTOP_SUID_PROC_KERNEL -void glibtop_init_proc_kernel_p (glibtop *server); +void _glibtop_init_proc_kernel_p (glibtop *server); void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid); #else -void glibtop_init_proc_kernel_s (glibtop *server); +void _glibtop_init_proc_kernel_s (glibtop *server); void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid); #endif diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 27668cf4..ebd00c18 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -74,13 +74,13 @@ glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf, gint64 which, gint64 arg); #if GLIBTOP_SUID_PROCLIST -void glibtop_init_proclist_p (glibtop *server); +void _glibtop_init_proclist_p (glibtop *server); unsigned * glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, gint64 which, gint64 arg); #else -void glibtop_init_proclist_s (glibtop *server); +void _glibtop_init_proclist_s (glibtop *server); unsigned * glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf, diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index 00f611c6..171904ef 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -102,12 +102,12 @@ glibtop_map_entry * glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid); #if GLIBTOP_SUID_PROC_MAP -void glibtop_init_proc_map_p (glibtop *server); +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 -void glibtop_init_proc_map_s (glibtop *server); +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); diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h index 8e7870db..10e12eb4 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -64,10 +64,10 @@ void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid); void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid); #if GLIBTOP_SUID_PROC_MEM -void glibtop_init_proc_mem_p (glibtop *server); +void _glibtop_init_proc_mem_p (glibtop *server); void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid); #else -void glibtop_init_proc_mem_s (glibtop *server); +void _glibtop_init_proc_mem_s (glibtop *server); void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid); #endif diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h index aaa624ff..3509737a 100644 --- a/include/glibtop/procopenfiles.h +++ b/include/glibtop/procopenfiles.h @@ -105,12 +105,12 @@ glibtop_open_files_entry * glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid); #if GLIBTOP_SUID_PROC_FILE -void glibtop_init_proc_open_files_p (glibtop *server); +void _glibtop_init_proc_open_files_p (glibtop *server); glibtop_open_files_entry * glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid); #else -void glibtop_init_proc_open_files_s (glibtop *server); +void _glibtop_init_proc_open_files_s (glibtop *server); glibtop_open_files_entry * glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid); diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h index 5bfc599f..5d2815d9 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -67,10 +67,10 @@ void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid); void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SEGMENT -void glibtop_init_proc_segment_p (glibtop *server); +void _glibtop_init_proc_segment_p (glibtop *server); void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid); #else -void glibtop_init_proc_segment_s (glibtop *server); +void _glibtop_init_proc_segment_s (glibtop *server); void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid); #endif diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h index 3cb449a1..10c3670c 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -58,10 +58,10 @@ void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid); void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid); #if GLIBTOP_SUID_PROC_SIGNAL -void glibtop_init_proc_signal_p (glibtop *server); +void _glibtop_init_proc_signal_p (glibtop *server); void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid); #else -void glibtop_init_proc_signal_s (glibtop *server); +void _glibtop_init_proc_signal_s (glibtop *server); void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid); #endif diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h index 1b48aeb4..7c05628b 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -82,10 +82,10 @@ void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid); void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid); #if GLIBTOP_SUID_PROC_STATE -void glibtop_init_proc_state_p (glibtop *server); +void _glibtop_init_proc_state_p (glibtop *server); void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid); #else -void glibtop_init_proc_state_s (glibtop *server); +void _glibtop_init_proc_state_s (glibtop *server); void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid); #endif diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h index c3a185d6..5f542aea 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -80,10 +80,10 @@ void glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid); void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid); #if GLIBTOP_SUID_PROC_TIME -void glibtop_init_proc_time_p (glibtop *server); +void _glibtop_init_proc_time_p (glibtop *server); void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid); #else -void glibtop_init_proc_time_s (glibtop *server); +void _glibtop_init_proc_time_s (glibtop *server); void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid); #endif diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h index 364a9f6f..16268a2b 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -89,10 +89,10 @@ void glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid); void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid); #if GLIBTOP_SUID_PROC_UID -void glibtop_init_proc_uid_p (glibtop *server); +void _glibtop_init_proc_uid_p (glibtop *server); void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid); #else -void glibtop_init_proc_uid_s (glibtop *server); +void _glibtop_init_proc_uid_s (glibtop *server); void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid); #endif diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h index ab724370..612e07dc 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -68,10 +68,10 @@ void glibtop_get_sem_limits(glibtop_sem_limits *buf); void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf); #if GLIBTOP_SUID_SEM_LIMITS -void glibtop_init_sem_limits_p (glibtop *server); +void _glibtop_init_sem_limits_p (glibtop *server); void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf); #else -void glibtop_init_sem_limits_s (glibtop *server); +void _glibtop_init_sem_limits_s (glibtop *server); void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf); #endif diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index f5edb007..842a1241 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -58,10 +58,10 @@ void glibtop_get_shm_limits(glibtop_shm_limits *buf); void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf); #if GLIBTOP_SUID_SHM_LIMITS -void glibtop_init_shm_limits_p (glibtop *server); +void _glibtop_init_shm_limits_p (glibtop *server); void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf); #else -void glibtop_init_shm_limits_s (glibtop *server); +void _glibtop_init_shm_limits_s (glibtop *server); void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf); #endif diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h index f8bb9c07..e29d9527 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -59,10 +59,10 @@ glibtop_get_swap(glibtop_swap *buf); void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf); #if GLIBTOP_SUID_SWAP -void glibtop_init_swap_p (glibtop *server); +void _glibtop_init_swap_p (glibtop *server); void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf); #else -void glibtop_init_swap_s (glibtop *server); +void _glibtop_init_swap_s (glibtop *server); void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf); #endif diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 0831231b..1b579ed3 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -54,10 +54,10 @@ void glibtop_get_uptime (glibtop_uptime *buf); void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf); #if GLIBTOP_SUID_UPTIME -void glibtop_init_uptime_p (glibtop *server); +void _glibtop_init_uptime_p (glibtop *server); void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf); #else -void glibtop_init_uptime_s (glibtop *server); +void _glibtop_init_uptime_s (glibtop *server); void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf); #endif diff --git a/lib/init.c b/lib/init.c index 8bd7f19b..678714a5 100644 --- a/lib/init.c +++ b/lib/init.c @@ -219,7 +219,7 @@ glibtop * glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags) { glibtop *server; - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server_ptr == NULL) return NULL; diff --git a/lib/sysdeps.c b/lib/sysdeps.c index b7e76320..f008eb6c 100644 --- a/lib/sysdeps.c +++ b/lib/sysdeps.c @@ -48,136 +48,136 @@ GLIBTOP_SUID_NETLOAD + GLIBTOP_SUID_NETLIST + GLIBTOP_SUID_PPP; -const glibtop_init_func_t _glibtop_init_hook_s [] = { +const _glibtop_init_func_t _glibtop_init_hook_s [] = { #if !GLIBTOP_SUID_CPU - glibtop_init_cpu_s, + _glibtop_init_cpu_s, #endif #if !GLIBTOP_SUID_MEM - glibtop_init_mem_s, + _glibtop_init_mem_s, #endif #if !GLIBTOP_SUID_SWAP - glibtop_init_swap_s, + _glibtop_init_swap_s, #endif #if !GLIBTOP_SUID_UPTIME - glibtop_init_uptime_s, + _glibtop_init_uptime_s, #endif #if !GLIBTOP_SUID_LOADAVG - glibtop_init_loadavg_s, + _glibtop_init_loadavg_s, #endif #if !GLIBTOP_SUID_SHM_LIMITS - glibtop_init_shm_limits_s, + _glibtop_init_shm_limits_s, #endif #if !GLIBTOP_SUID_MSG_LIMITS - glibtop_init_msg_limits_s, + _glibtop_init_msg_limits_s, #endif #if !GLIBTOP_SUID_SEM_LIMITS - glibtop_init_sem_limits_s, + _glibtop_init_sem_limits_s, #endif #if !GLIBTOP_SUID_PROCLIST - glibtop_init_proclist_s, + _glibtop_init_proclist_s, #endif #if !GLIBTOP_SUID_PROC_STATE - glibtop_init_proc_state_s, + _glibtop_init_proc_state_s, #endif #if !GLIBTOP_SUID_PROC_UID - glibtop_init_proc_uid_s, + _glibtop_init_proc_uid_s, #endif #if !GLIBTOP_SUID_PROC_MEM - glibtop_init_proc_mem_s, + _glibtop_init_proc_mem_s, #endif #if !GLIBTOP_SUID_PROC_TIME - glibtop_init_proc_time_s, + _glibtop_init_proc_time_s, #endif #if !GLIBTOP_SUID_PROC_SIGNAL - glibtop_init_proc_signal_s, + _glibtop_init_proc_signal_s, #endif #if !GLIBTOP_SUID_PROC_KERNEL - glibtop_init_proc_kernel_s, + _glibtop_init_proc_kernel_s, #endif #if !GLIBTOP_SUID_PROC_SEGMENT - glibtop_init_proc_segment_s, + _glibtop_init_proc_segment_s, #endif #if !GLIBTOP_SUID_PROC_ARGS - glibtop_init_proc_args_s, + _glibtop_init_proc_args_s, #endif #if !GLIBTOP_SUID_PROC_MAP - glibtop_init_proc_map_s, + _glibtop_init_proc_map_s, #endif #if !GLIBTOP_SUID_NETLOAD - glibtop_init_netload_s, + _glibtop_init_netload_s, #endif #if !GLIBTOP_SUID_NETLIST - glibtop_init_netlist_s, + _glibtop_init_netlist_s, #endif #if !GLIBTOP_SUID_PPP - glibtop_init_ppp_s, + _glibtop_init_ppp_s, #endif NULL }; -const glibtop_init_func_t _glibtop_init_hook_p [] = { +const _glibtop_init_func_t _glibtop_init_hook_p [] = { #if GLIBTOP_SUID_CPU - glibtop_init_cpu_p, + _glibtop_init_cpu_p, #endif #if GLIBTOP_SUID_MEM - glibtop_init_mem_p, + _glibtop_init_mem_p, #endif #if GLIBTOP_SUID_SWAP - glibtop_init_swap_p, + _glibtop_init_swap_p, #endif #if GLIBTOP_SUID_UPTIME - glibtop_init_uptime_p, + _glibtop_init_uptime_p, #endif #if GLIBTOP_SUID_LOADAVG - glibtop_init_loadavg_p, + _glibtop_init_loadavg_p, #endif #if GLIBTOP_SUID_SHM_LIMITS - glibtop_init_shm_limits_p, + _glibtop_init_shm_limits_p, #endif #if GLIBTOP_SUID_MSG_LIMITS - glibtop_init_msg_limits_p, + _glibtop_init_msg_limits_p, #endif #if GLIBTOP_SUID_SEM_LIMITS - glibtop_init_sem_limits_p, + _glibtop_init_sem_limits_p, #endif #if GLIBTOP_SUID_PROCLIST - glibtop_init_proclist_p, + _glibtop_init_proclist_p, #endif #if GLIBTOP_SUID_PROC_STATE - glibtop_init_proc_state_p, + _glibtop_init_proc_state_p, #endif #if GLIBTOP_SUID_PROC_UID - glibtop_init_proc_uid_p, + _glibtop_init_proc_uid_p, #endif #if GLIBTOP_SUID_PROC_MEM - glibtop_init_proc_mem_p, + _glibtop_init_proc_mem_p, #endif #if GLIBTOP_SUID_PROC_TIME - glibtop_init_proc_time_p, + _glibtop_init_proc_time_p, #endif #if GLIBTOP_SUID_PROC_SIGNAL - glibtop_init_proc_signal_p, + _glibtop_init_proc_signal_p, #endif #if GLIBTOP_SUID_PROC_KERNEL - glibtop_init_proc_kernel_p, + _glibtop_init_proc_kernel_p, #endif #if GLIBTOP_SUID_PROC_SEGMENT - glibtop_init_proc_segment_p, + _glibtop_init_proc_segment_p, #endif #if GLIBTOP_SUID_PROC_ARGS - glibtop_init_proc_args_p, + _glibtop_init_proc_args_p, #endif #if GLIBTOP_SUID_PROC_MAP - glibtop_init_proc_map_p, + _glibtop_init_proc_map_p, #endif #if GLIBTOP_SUID_NETLOAD - glibtop_init_netload_p, + _glibtop_init_netload_p, #endif #if GLIBTOP_SUID_NETLIST - glibtop_init_netlist_p, + _glibtop_init_netlist_p, #endif #if GLIBTOP_SUID_PPP - glibtop_init_ppp_p, + _glibtop_init_ppp_p, #endif NULL }; diff --git a/sysdeps/aix/cpu.c b/sysdeps/aix/cpu.c index 7cd4ca51..b67a90e3 100644 --- a/sysdeps/aix/cpu.c +++ b/sysdeps/aix/cpu.c @@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_cpu = /* Init function. */ void -glibtop_init_cpu_p (glibtop *server) +_glibtop_init_cpu_p (glibtop *server) { off_t result; diff --git a/sysdeps/aix/loadavg.c b/sysdeps/aix/loadavg.c index b2153f50..dbdeeea5 100644 --- a/sysdeps/aix/loadavg.c +++ b/sysdeps/aix/loadavg.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = /* Init function. */ void -glibtop_init_loadavg_p (glibtop *server) +_glibtop_init_loadavg_p (glibtop *server) { int result; diff --git a/sysdeps/aix/mem.c b/sysdeps/aix/mem.c index 9db0e56d..32057b9e 100644 --- a/sysdeps/aix/mem.c +++ b/sysdeps/aix/mem.c @@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_mem = /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { server->sysdeps.mem = _glibtop_sysdeps_mem; } diff --git a/sysdeps/aix/msg_limits.c b/sysdeps/aix/msg_limits.c index a73b4d0f..9704f911 100644 --- a/sysdeps/aix/msg_limits.c +++ b/sysdeps/aix/msg_limits.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = /* Init function. */ void -glibtop_init_msg_limits_p (glibtop *server) +_glibtop_init_msg_limits_p (glibtop *server) { off_t result; diff --git a/sysdeps/aix/netlist.c b/sysdeps/aix/netlist.c index eb6bede3..fce76fd4 100644 --- a/sysdeps/aix/netlist.c +++ b/sysdeps/aix/netlist.c @@ -25,7 +25,7 @@ static const unsigned long _glibtop_sysdeps_netlist = 0; /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/aix/netload.c b/sysdeps/aix/netload.c index f7bf12f5..a4e65581 100644 --- a/sysdeps/aix/netload.c +++ b/sysdeps/aix/netload.c @@ -81,7 +81,7 @@ static void get_ifaddr(glibtop* server, struct ifaddr* next, long* addr, long* m /* Init function. */ void -glibtop_init_netload_p (glibtop *server) +_glibtop_init_netload_p (glibtop *server) { off_t result; off_t addr; diff --git a/sysdeps/aix/open.c b/sysdeps/aix/open.c index e1e206f0..447bed03 100644 --- a/sysdeps/aix/open.c +++ b/sysdeps/aix/open.c @@ -34,7 +34,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/aix/ppp.c b/sysdeps/aix/ppp.c index 81fe2b68..d7b510ef 100644 --- a/sysdeps/aix/ppp.c +++ b/sysdeps/aix/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/aix/procargs.c b/sysdeps/aix/procargs.c index 44099b62..a79f26d2 100644 --- a/sysdeps/aix/procargs.c +++ b/sysdeps/aix/procargs.c @@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = /* Init function. */ void -glibtop_init_proc_args_s (glibtop *server) +_glibtop_init_proc_args_s (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/aix/prockernel.c b/sysdeps/aix/prockernel.c index 197da4ce..61cb6ca8 100644 --- a/sysdeps/aix/prockernel.c +++ b/sysdeps/aix/prockernel.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = /* Init function. */ void -glibtop_init_proc_kernel_s (glibtop *server) +_glibtop_init_proc_kernel_s (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/aix/proclist.c b/sysdeps/aix/proclist.c index af23918c..6603b862 100644 --- a/sysdeps/aix/proclist.c +++ b/sysdeps/aix/proclist.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_s (glibtop *server) +_glibtop_init_proclist_s (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/aix/procmap.c b/sysdeps/aix/procmap.c index 51a53f6d..ba6ce89a 100644 --- a/sysdeps/aix/procmap.c +++ b/sysdeps/aix/procmap.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_map = 0; /* Init function. */ void -glibtop_init_proc_map_s (glibtop *server) +_glibtop_init_proc_map_s (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/aix/procmem.c b/sysdeps/aix/procmem.c index bb569fb7..e2455809 100644 --- a/sysdeps/aix/procmem.c +++ b/sysdeps/aix/procmem.c @@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = /* Init function. */ void -glibtop_init_proc_mem_s (glibtop *server) +_glibtop_init_proc_mem_s (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem; } diff --git a/sysdeps/aix/procsegment.c b/sysdeps/aix/procsegment.c index 9936aa22..b5dd9a2a 100644 --- a/sysdeps/aix/procsegment.c +++ b/sysdeps/aix/procsegment.c @@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = /* Init function. */ void -glibtop_init_proc_segment_s (glibtop *server) +_glibtop_init_proc_segment_s (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/aix/procsignal.c b/sysdeps/aix/procsignal.c index f1865e91..3c43a520 100644 --- a/sysdeps/aix/procsignal.c +++ b/sysdeps/aix/procsignal.c @@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_s (glibtop *server) +_glibtop_init_proc_signal_s (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/aix/procstate.c b/sysdeps/aix/procstate.c index 5973d5f3..c98c7ca0 100644 --- a/sysdeps/aix/procstate.c +++ b/sysdeps/aix/procstate.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = /* Init function. */ void -glibtop_init_proc_state_s (glibtop *server) +_glibtop_init_proc_state_s (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/aix/proctime.c b/sysdeps/aix/proctime.c index 4698ffb2..10494745 100644 --- a/sysdeps/aix/proctime.c +++ b/sysdeps/aix/proctime.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = /* Init function. */ void -glibtop_init_proc_time_s (glibtop *server) +_glibtop_init_proc_time_s (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; } diff --git a/sysdeps/aix/procuid.c b/sysdeps/aix/procuid.c index f60bf257..29546e4e 100644 --- a/sysdeps/aix/procuid.c +++ b/sysdeps/aix/procuid.c @@ -42,7 +42,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = /* Init function. */ void -glibtop_init_proc_uid_s (glibtop *server) +_glibtop_init_proc_uid_s (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } diff --git a/sysdeps/aix/sem_limits.c b/sysdeps/aix/sem_limits.c index 80a10a20..118a3420 100644 --- a/sysdeps/aix/sem_limits.c +++ b/sysdeps/aix/sem_limits.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = /* Init function. */ void -glibtop_init_sem_limits_p (glibtop *server) +_glibtop_init_sem_limits_p (glibtop *server) { off_t result; diff --git a/sysdeps/aix/shm_limits.c b/sysdeps/aix/shm_limits.c index ea663ae4..4815d08d 100644 --- a/sysdeps/aix/shm_limits.c +++ b/sysdeps/aix/shm_limits.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = /* Init function. */ void -glibtop_init_shm_limits_p (glibtop *server) +_glibtop_init_shm_limits_p (glibtop *server) { int result; diff --git a/sysdeps/aix/swap.c b/sysdeps/aix/swap.c index bdd64ccc..f226a512 100644 --- a/sysdeps/aix/swap.c +++ b/sysdeps/aix/swap.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_swap = /* Init function. */ void -glibtop_init_swap_s (glibtop *server) +_glibtop_init_swap_s (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap; } diff --git a/sysdeps/aix/uptime.c b/sysdeps/aix/uptime.c index a7688425..a73260a5 100644 --- a/sysdeps/aix/uptime.c +++ b/sysdeps/aix/uptime.c @@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_uptime = /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/bsd/cpu.c b/sysdeps/bsd/cpu.c index 522ad334..8a7f2f78 100644 --- a/sysdeps/bsd/cpu.c +++ b/sysdeps/bsd/cpu.c @@ -58,7 +58,7 @@ static int mib2 [] = { CTL_KERN, KERN_CP_TIME }; /* Init function. */ void -glibtop_init_cpu_p (glibtop *server) +_glibtop_init_cpu_p (glibtop *server) { #ifndef KERN_CP_TIME if (kvm_nlist (server->machine.kd, nlst) < 0) { diff --git a/sysdeps/bsd/loadavg.c b/sysdeps/bsd/loadavg.c index c3918b79..6bee9344 100644 --- a/sysdeps/bsd/loadavg.c +++ b/sysdeps/bsd/loadavg.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = /* Init function. */ void -glibtop_init_loadavg_p (glibtop *server) +_glibtop_init_loadavg_p (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/bsd/mem.c b/sysdeps/bsd/mem.c index 868e83ac..3043c407 100644 --- a/sysdeps/bsd/mem.c +++ b/sysdeps/bsd/mem.c @@ -88,7 +88,7 @@ static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP }; /* Init function. */ void -glibtop_init_mem_p (glibtop *server) +_glibtop_init_mem_p (glibtop *server) { register int pagesize; diff --git a/sysdeps/bsd/msg_limits.c b/sysdeps/bsd/msg_limits.c index 488e7fce..8999f7ba 100644 --- a/sysdeps/bsd/msg_limits.c +++ b/sysdeps/bsd/msg_limits.c @@ -30,7 +30,7 @@ /* Older versions of BSDI don't seem to have this. */ void -glibtop_init_msg_limits_p (glibtop *server) +_glibtop_init_msg_limits_p (glibtop *server) { } void @@ -73,7 +73,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_msg_limits_p (glibtop *server) +_glibtop_init_msg_limits_p (glibtop *server) { if (kvm_nlist (server->machine.kd, nlst) < 0) { glibtop_warn_io_r (server, "kvm_nlist (msg_limits)"); diff --git a/sysdeps/bsd/netlist.c b/sysdeps/bsd/netlist.c index 08c4557f..ab329803 100644 --- a/sysdeps/bsd/netlist.c +++ b/sysdeps/bsd/netlist.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netlist = (1 << GLIBTOP_NETLIST_NUMB /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/bsd/netload.c b/sysdeps/bsd/netload.c index f368018f..6dd1a6d6 100644 --- a/sysdeps/bsd/netload.c +++ b/sysdeps/bsd/netload.c @@ -68,7 +68,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_netload_p (glibtop *server) +_glibtop_init_netload_p (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload; diff --git a/sysdeps/bsd/open.c b/sysdeps/bsd/open.c index 4c7d1ef8..52255ab5 100644 --- a/sysdeps/bsd/open.c +++ b/sysdeps/bsd/open.c @@ -30,7 +30,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/bsd/ppp.c b/sysdeps/bsd/ppp.c index 514c3145..3d9f646e 100644 --- a/sysdeps/bsd/ppp.c +++ b/sysdeps/bsd/ppp.c @@ -70,7 +70,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_ppp_p (glibtop *server) +_glibtop_init_ppp_p (glibtop *server) { #ifdef HAVE_I4B #ifdef HAVE_I4B_ACCT diff --git a/sysdeps/bsd/procargs.c b/sysdeps/bsd/procargs.c index 54b39243..52242ef2 100644 --- a/sysdeps/bsd/procargs.c +++ b/sysdeps/bsd/procargs.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = /* Init function. */ void -glibtop_init_proc_args_p (glibtop *server) +_glibtop_init_proc_args_p (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/bsd/prockernel.c b/sysdeps/bsd/prockernel.c index ccd72c27..2bdfae5f 100644 --- a/sysdeps/bsd/prockernel.c +++ b/sysdeps/bsd/prockernel.c @@ -79,7 +79,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel_wchan = /* Init function. */ void -glibtop_init_proc_kernel_p (glibtop *server) +_glibtop_init_proc_kernel_p (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel_pstats | _glibtop_sysdeps_proc_kernel_pcb | diff --git a/sysdeps/bsd/proclist.c b/sysdeps/bsd/proclist.c index d0a681d2..7b7f13e8 100644 --- a/sysdeps/bsd/proclist.c +++ b/sysdeps/bsd/proclist.c @@ -51,7 +51,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_p (glibtop *server) +_glibtop_init_proclist_p (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/bsd/procmap.c b/sysdeps/bsd/procmap.c index cf524c6d..96691a98 100644 --- a/sysdeps/bsd/procmap.c +++ b/sysdeps/bsd/procmap.c @@ -86,7 +86,7 @@ static const unsigned long _glibtop_sysdeps_map_entry = /* Init function. */ void -glibtop_init_proc_map_p (glibtop *server) +_glibtop_init_proc_map_p (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/bsd/procmem.c b/sysdeps/bsd/procmem.c index 88acbb96..a7649d4e 100644 --- a/sysdeps/bsd/procmem.c +++ b/sysdeps/bsd/procmem.c @@ -90,7 +90,7 @@ static int pageshift; /* log base 2 of the pagesize */ /* Init function. */ void -glibtop_init_proc_mem_p (glibtop *server) +_glibtop_init_proc_mem_p (glibtop *server) { register int pagesize; diff --git a/sysdeps/bsd/procopenfiles.c b/sysdeps/bsd/procopenfiles.c index b3211fac..1f163bbc 100644 --- a/sysdeps/bsd/procopenfiles.c +++ b/sysdeps/bsd/procopenfiles.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_open_files = /* Init function. */ void -glibtop_init_proc_open_files_s (glibtop *server) +_glibtop_init_proc_open_files_s (glibtop *server) { server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; } diff --git a/sysdeps/bsd/procsegment.c b/sysdeps/bsd/procsegment.c index c73a391c..2a629c17 100644 --- a/sysdeps/bsd/procsegment.c +++ b/sysdeps/bsd/procsegment.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = 0; /* Init function. */ void -glibtop_init_proc_segment_p (glibtop *server) +_glibtop_init_proc_segment_p (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/bsd/procsignal.c b/sysdeps/bsd/procsignal.c index 245dd7c3..a3474353 100644 --- a/sysdeps/bsd/procsignal.c +++ b/sysdeps/bsd/procsignal.c @@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_p (glibtop *server) +_glibtop_init_proc_signal_p (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/bsd/procstate.c b/sysdeps/bsd/procstate.c index 6ff32ffc..96f39edc 100644 --- a/sysdeps/bsd/procstate.c +++ b/sysdeps/bsd/procstate.c @@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_proc_state_new = /* Init function. */ void -glibtop_init_proc_state_p (glibtop *server) +_glibtop_init_proc_state_p (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state | _glibtop_sysdeps_proc_state_new; diff --git a/sysdeps/bsd/proctime.c b/sysdeps/bsd/proctime.c index 2f555648..ccaf016f 100644 --- a/sysdeps/bsd/proctime.c +++ b/sysdeps/bsd/proctime.c @@ -43,7 +43,7 @@ static const unsigned long _glibtop_sysdeps_proc_time_user = /* Init function. */ void -glibtop_init_proc_time_p (glibtop *server) +_glibtop_init_proc_time_p (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time | _glibtop_sysdeps_proc_time_user; diff --git a/sysdeps/bsd/procuid.c b/sysdeps/bsd/procuid.c index 1f70bd41..e2bb0e24 100644 --- a/sysdeps/bsd/procuid.c +++ b/sysdeps/bsd/procuid.c @@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid_groups = /* Init function. */ void -glibtop_init_proc_uid_p (glibtop *server) +_glibtop_init_proc_uid_p (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid | _glibtop_sysdeps_proc_uid_groups; diff --git a/sysdeps/bsd/sem_limits.c b/sysdeps/bsd/sem_limits.c index 58f7ea73..43b30f72 100644 --- a/sysdeps/bsd/sem_limits.c +++ b/sysdeps/bsd/sem_limits.c @@ -30,7 +30,7 @@ /* Older versions of BSDI don't seem to have this. */ void -glibtop_init_sem_limits_p (glibtop *server) +_glibtop_init_sem_limits_p (glibtop *server) { } void @@ -75,7 +75,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_sem_limits_p (glibtop *server) +_glibtop_init_sem_limits_p (glibtop *server) { if (kvm_nlist (server->machine.kd, nlst) < 0) { glibtop_warn_io_r (server, "kvm_nlist (sem_limits)"); diff --git a/sysdeps/bsd/shm_limits.c b/sysdeps/bsd/shm_limits.c index bf159f21..dbe4d90c 100644 --- a/sysdeps/bsd/shm_limits.c +++ b/sysdeps/bsd/shm_limits.c @@ -30,7 +30,7 @@ /* Older versions of BSDI don't seem to have this. */ void -glibtop_init_shm_limits_p (glibtop *server) +_glibtop_init_shm_limits_p (glibtop *server) { } void @@ -73,7 +73,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_shm_limits_p (glibtop *server) +_glibtop_init_shm_limits_p (glibtop *server) { if (kvm_nlist (server->machine.kd, nlst) < 0) { glibtop_warn_io_r (server, "kvm_nlist (shm_limits)"); diff --git a/sysdeps/bsd/swap.c b/sysdeps/bsd/swap.c index 6ea02d35..0ac9cd3d 100644 --- a/sysdeps/bsd/swap.c +++ b/sysdeps/bsd/swap.c @@ -90,7 +90,7 @@ static struct nlist nlst2 [] = { /* Init function. */ void -glibtop_init_swap_p (glibtop *server) +_glibtop_init_swap_p (glibtop *server) { #if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__) #if __FreeBSD__ < 4 || defined(__bsdi__) diff --git a/sysdeps/bsd/uptime.c b/sysdeps/bsd/uptime.c index b185004f..f17b5ea9 100644 --- a/sysdeps/bsd/uptime.c +++ b/sysdeps/bsd/uptime.c @@ -38,7 +38,7 @@ static const unsigned long _required_cpu_flags = /* Init function. */ void -glibtop_init_uptime_p (glibtop *server) +_glibtop_init_uptime_p (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/common/sysdeps_suid.c b/sysdeps/common/sysdeps_suid.c index dddb06b3..b244d12e 100644 --- a/sysdeps/common/sysdeps_suid.c +++ b/sysdeps/common/sysdeps_suid.c @@ -26,69 +26,69 @@ #include #include -const glibtop_init_func_t _glibtop_init_hook_p [] = { +const _glibtop_init_func_t _glibtop_init_hook_p [] = { #if GLIBTOP_SUID_CPU - glibtop_init_cpu_p, + _glibtop_init_cpu_p, #endif #if GLIBTOP_SUID_MEM - glibtop_init_mem_p, + _glibtop_init_mem_p, #endif #if GLIBTOP_SUID_SWAP - glibtop_init_swap_p, + _glibtop_init_swap_p, #endif #if GLIBTOP_SUID_UPTIME - glibtop_init_uptime_p, + _glibtop_init_uptime_p, #endif #if GLIBTOP_SUID_LOADAVG - glibtop_init_loadavg_p, + _glibtop_init_loadavg_p, #endif #if GLIBTOP_SUID_SHM_LIMITS - glibtop_init_shm_limits_p, + _glibtop_init_shm_limits_p, #endif #if GLIBTOP_SUID_MSG_LIMITS - glibtop_init_msg_limits_p, + _glibtop_init_msg_limits_p, #endif #if GLIBTOP_SUID_SEM_LIMITS - glibtop_init_sem_limits_p, + _glibtop_init_sem_limits_p, #endif #if GLIBTOP_SUID_PROCLIST - glibtop_init_proclist_p, + _glibtop_init_proclist_p, #endif #if GLIBTOP_SUID_PROC_STATE - glibtop_init_proc_state_p, + _glibtop_init_proc_state_p, #endif #if GLIBTOP_SUID_PROC_UID - glibtop_init_proc_uid_p, + _glibtop_init_proc_uid_p, #endif #if GLIBTOP_SUID_PROC_MEM - glibtop_init_proc_mem_p, + _glibtop_init_proc_mem_p, #endif #if GLIBTOP_SUID_PROC_TIME - glibtop_init_proc_time_p, + _glibtop_init_proc_time_p, #endif #if GLIBTOP_SUID_PROC_SIGNAL - glibtop_init_proc_signal_p, + _glibtop_init_proc_signal_p, #endif #if GLIBTOP_SUID_PROC_KERNEL - glibtop_init_proc_kernel_p, + _glibtop_init_proc_kernel_p, #endif #if GLIBTOP_SUID_PROC_SEGMENT - glibtop_init_proc_segment_p, + _glibtop_init_proc_segment_p, #endif #if GLIBTOP_SUID_PROC_ARGS - glibtop_init_proc_args_p, + _glibtop_init_proc_args_p, #endif #if GLIBTOP_SUID_PROC_MAP - glibtop_init_proc_map_p, + _glibtop_init_proc_map_p, #endif #if GLIBTOP_SUID_NETLOAD - glibtop_init_netload_p, + _glibtop_init_netload_p, #endif #if GLIBTOP_SUID_NETLIST - glibtop_init_netlist_p, + _glibtop_init_netlist_p, #endif #if GLIBTOP_SUID_PPP - glibtop_init_ppp_p, + _glibtop_init_ppp_p, #endif NULL }; diff --git a/sysdeps/freebsd/cpu.c b/sysdeps/freebsd/cpu.c index 0b98a985..9577703d 100644 --- a/sysdeps/freebsd/cpu.c +++ b/sysdeps/freebsd/cpu.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_cpu_smp = /* Init function. */ void -glibtop_init_cpu_s (glibtop *server) +_glibtop_init_cpu_s (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu; diff --git a/sysdeps/freebsd/loadavg.c b/sysdeps/freebsd/loadavg.c index 5cd690d1..91c61854 100644 --- a/sysdeps/freebsd/loadavg.c +++ b/sysdeps/freebsd/loadavg.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_last_pid = /* Init function. */ void -glibtop_init_loadavg_s (glibtop *server) +_glibtop_init_loadavg_s (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg | _glibtop_sysdeps_last_pid; diff --git a/sysdeps/freebsd/mem.c b/sysdeps/freebsd/mem.c index 35af5b5f..71a4a60f 100644 --- a/sysdeps/freebsd/mem.c +++ b/sysdeps/freebsd/mem.c @@ -38,7 +38,7 @@ static int pagesize; /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { pagesize = getpagesize (); diff --git a/sysdeps/freebsd/msg_limits.c b/sysdeps/freebsd/msg_limits.c index c7263923..a9c44127 100644 --- a/sysdeps/freebsd/msg_limits.c +++ b/sysdeps/freebsd/msg_limits.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = /* Init function. */ void -glibtop_init_msg_limits_s (glibtop *server) +_glibtop_init_msg_limits_s (glibtop *server) { server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } diff --git a/sysdeps/freebsd/netlist.c b/sysdeps/freebsd/netlist.c index 08c4557f..ab329803 100644 --- a/sysdeps/freebsd/netlist.c +++ b/sysdeps/freebsd/netlist.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netlist = (1 << GLIBTOP_NETLIST_NUMB /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/freebsd/netload.c b/sysdeps/freebsd/netload.c index 37dab068..7359ce0a 100644 --- a/sysdeps/freebsd/netload.c +++ b/sysdeps/freebsd/netload.c @@ -75,7 +75,7 @@ static struct nlist nlst [] = /* Init function. */ void -glibtop_init_netload_p (glibtop *server) +_glibtop_init_netload_p (glibtop *server) { if (kvm_nlist (server->machine.kd, nlst) < 0) { glibtop_warn_io_r (server, "kvm_nlist"); diff --git a/sysdeps/freebsd/open.c b/sysdeps/freebsd/open.c index 743b69f0..0627026b 100644 --- a/sysdeps/freebsd/open.c +++ b/sysdeps/freebsd/open.c @@ -31,7 +31,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/freebsd/ppp.c b/sysdeps/freebsd/ppp.c index f3d6a49b..6a0beb63 100644 --- a/sysdeps/freebsd/ppp.c +++ b/sysdeps/freebsd/ppp.c @@ -66,7 +66,7 @@ static struct nlist nlst [] = { /* Init function. */ void -glibtop_init_ppp_p (glibtop *server) +_glibtop_init_ppp_p (glibtop *server) { #ifdef HAVE_I4B #ifdef HAVE_I4B_ACCT diff --git a/sysdeps/freebsd/procargs.c b/sysdeps/freebsd/procargs.c index 66657719..791afb7d 100644 --- a/sysdeps/freebsd/procargs.c +++ b/sysdeps/freebsd/procargs.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = /* Init function. */ void -glibtop_init_proc_args_p (glibtop *server) +_glibtop_init_proc_args_p (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/freebsd/prockernel.c b/sysdeps/freebsd/prockernel.c index 52b568b2..533725c0 100644 --- a/sysdeps/freebsd/prockernel.c +++ b/sysdeps/freebsd/prockernel.c @@ -55,7 +55,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel_wchan = /* Init function. */ void -glibtop_init_proc_kernel_p (glibtop *server) +_glibtop_init_proc_kernel_p (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel_pstats | _glibtop_sysdeps_proc_kernel_wchan; diff --git a/sysdeps/freebsd/proclist.c b/sysdeps/freebsd/proclist.c index 52adf941..f335de8c 100644 --- a/sysdeps/freebsd/proclist.c +++ b/sysdeps/freebsd/proclist.c @@ -56,7 +56,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_p (glibtop *server) +_glibtop_init_proclist_p (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/freebsd/procmap.c b/sysdeps/freebsd/procmap.c index 13e3b425..a82b2f02 100644 --- a/sysdeps/freebsd/procmap.c +++ b/sysdeps/freebsd/procmap.c @@ -118,7 +118,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode, /* Init function. */ void -glibtop_init_proc_map_p (glibtop *server) +_glibtop_init_proc_map_p (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/freebsd/procmem.c b/sysdeps/freebsd/procmem.c index f4220230..c5841498 100644 --- a/sysdeps/freebsd/procmem.c +++ b/sysdeps/freebsd/procmem.c @@ -58,7 +58,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem_share = /* Init function. */ void -glibtop_init_proc_mem_p (glibtop *server) +_glibtop_init_proc_mem_p (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem | _glibtop_sysdeps_proc_mem_share; diff --git a/sysdeps/freebsd/procopenfiles.c b/sysdeps/freebsd/procopenfiles.c index 88024437..be5d20db 100644 --- a/sysdeps/freebsd/procopenfiles.c +++ b/sysdeps/freebsd/procopenfiles.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_open_files = /* Init function. */ void -glibtop_init_proc_open_files_s (glibtop *server) +_glibtop_init_proc_open_files_s (glibtop *server) { server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; } diff --git a/sysdeps/freebsd/procsegment.c b/sysdeps/freebsd/procsegment.c index 48bdded8..e9b1de8a 100644 --- a/sysdeps/freebsd/procsegment.c +++ b/sysdeps/freebsd/procsegment.c @@ -39,7 +39,7 @@ static int pagesize; /* Init function. */ void -glibtop_init_proc_segment_p (glibtop *server) +_glibtop_init_proc_segment_p (glibtop *server) { pagesize = getpagesize (); server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; diff --git a/sysdeps/freebsd/procsignal.c b/sysdeps/freebsd/procsignal.c index fdec2376..8d49fe9a 100644 --- a/sysdeps/freebsd/procsignal.c +++ b/sysdeps/freebsd/procsignal.c @@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_p (glibtop *server) +_glibtop_init_proc_signal_p (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/freebsd/procstate.c b/sysdeps/freebsd/procstate.c index bafdf921..786771a2 100644 --- a/sysdeps/freebsd/procstate.c +++ b/sysdeps/freebsd/procstate.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = /* Init function. */ void -glibtop_init_proc_state_p (glibtop *server) +_glibtop_init_proc_state_p (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c index 187eb490..5c10aafe 100644 --- a/sysdeps/freebsd/proctime.c +++ b/sysdeps/freebsd/proctime.c @@ -42,7 +42,7 @@ static const unsigned long _glibtop_sysdeps_proc_time_user = /* Init function. */ void -glibtop_init_proc_time_p (glibtop *server) +_glibtop_init_proc_time_p (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time | _glibtop_sysdeps_proc_time_user; diff --git a/sysdeps/freebsd/procuid.c b/sysdeps/freebsd/procuid.c index 806e8348..2e712bc5 100644 --- a/sysdeps/freebsd/procuid.c +++ b/sysdeps/freebsd/procuid.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = /* Init function. */ void -glibtop_init_proc_uid_p (glibtop *server) +_glibtop_init_proc_uid_p (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } diff --git a/sysdeps/freebsd/sem_limits.c b/sysdeps/freebsd/sem_limits.c index 52c53318..71f78db8 100644 --- a/sysdeps/freebsd/sem_limits.c +++ b/sysdeps/freebsd/sem_limits.c @@ -37,7 +37,7 @@ static unsigned long _glibtop_sysdeps_sem_limits = /* Init function. */ void -glibtop_init_sem_limits_s (glibtop *server) +_glibtop_init_sem_limits_s (glibtop *server) { server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } diff --git a/sysdeps/freebsd/shm_limits.c b/sysdeps/freebsd/shm_limits.c index 15963ccc..d5d4df36 100644 --- a/sysdeps/freebsd/shm_limits.c +++ b/sysdeps/freebsd/shm_limits.c @@ -35,7 +35,7 @@ static unsigned long _glibtop_sysdeps_shm_limits = /* Init function. */ void -glibtop_init_shm_limits_s (glibtop *server) +_glibtop_init_shm_limits_s (glibtop *server) { server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } diff --git a/sysdeps/freebsd/swap.c b/sysdeps/freebsd/swap.c index f7c1b2dd..c9e3545b 100644 --- a/sysdeps/freebsd/swap.c +++ b/sysdeps/freebsd/swap.c @@ -38,7 +38,7 @@ static int pagesize; /* Init function. */ void -glibtop_init_swap_p (glibtop *server) +_glibtop_init_swap_p (glibtop *server) { pagesize = getpagesize (); diff --git a/sysdeps/freebsd/uptime.c b/sysdeps/freebsd/uptime.c index 16f540f5..2c333e41 100644 --- a/sysdeps/freebsd/uptime.c +++ b/sysdeps/freebsd/uptime.c @@ -42,7 +42,7 @@ static const unsigned long _required_cpu_flags = /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c index 13464772..16c2ca9c 100644 --- a/sysdeps/linux/cpu.c +++ b/sysdeps/linux/cpu.c @@ -46,7 +46,7 @@ static const unsigned long _glibtop_sysdeps_cpu_smp_2_6 = /* Init function. */ void -glibtop_init_cpu_s (glibtop *server) +_glibtop_init_cpu_s (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu; diff --git a/sysdeps/linux/loadavg.c b/sysdeps/linux/loadavg.c index bc4f74c0..0e0a827b 100644 --- a/sysdeps/linux/loadavg.c +++ b/sysdeps/linux/loadavg.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_loadavg_tasks = /* Init function. */ void -glibtop_init_loadavg_s (glibtop *server) +_glibtop_init_loadavg_s (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/linux/mem.c b/sysdeps/linux/mem.c index a8ed5ae6..b8fa63f9 100644 --- a/sysdeps/linux/mem.c +++ b/sysdeps/linux/mem.c @@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_mem = /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { server->sysdeps.mem = _glibtop_sysdeps_mem; } diff --git a/sysdeps/linux/msg_limits.c b/sysdeps/linux/msg_limits.c index 04b54f81..e579ae6a 100644 --- a/sysdeps/linux/msg_limits.c +++ b/sysdeps/linux/msg_limits.c @@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = /* Init function. */ void -glibtop_init_msg_limits_s (glibtop *server) +_glibtop_init_msg_limits_s (glibtop *server) { server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } diff --git a/sysdeps/linux/netlist.c b/sysdeps/linux/netlist.c index a1602702..9563ae45 100644 --- a/sysdeps/linux/netlist.c +++ b/sysdeps/linux/netlist.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_netlist = (1 << GLIBTOP_NETLIST_NUMB /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c index b6e090c0..5ea9c487 100644 --- a/sysdeps/linux/netload.c +++ b/sysdeps/linux/netload.c @@ -113,7 +113,7 @@ static const unsigned long _glibtop_sysdeps_netload_6 = /* Init function. */ void -glibtop_init_netload_s (glibtop *server) +_glibtop_init_netload_s (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload | _glibtop_sysdeps_netload_data | diff --git a/sysdeps/linux/ppp.c b/sysdeps/linux/ppp.c index 953eccc3..a3ad267d 100644 --- a/sysdeps/linux/ppp.c +++ b/sysdeps/linux/ppp.c @@ -46,7 +46,7 @@ static const unsigned long _glibtop_sysdeps_ppp = /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/linux/procargs.c b/sysdeps/linux/procargs.c index 50f5f9b6..d0db1860 100644 --- a/sysdeps/linux/procargs.c +++ b/sysdeps/linux/procargs.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = /* Init function. */ void -glibtop_init_proc_args_s (glibtop *server) +_glibtop_init_proc_args_s (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/linux/prockernel.c b/sysdeps/linux/prockernel.c index 5a918f4a..536037cd 100644 --- a/sysdeps/linux/prockernel.c +++ b/sysdeps/linux/prockernel.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = /* Init function. */ void -glibtop_init_proc_kernel_s (glibtop *server) +_glibtop_init_proc_kernel_s (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/linux/proclist.c b/sysdeps/linux/proclist.c index b4c45bba..9955a8ba 100644 --- a/sysdeps/linux/proclist.c +++ b/sysdeps/linux/proclist.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_s (glibtop *server) +_glibtop_init_proclist_s (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/linux/procmap.c b/sysdeps/linux/procmap.c index 322784ea..05d1e7b0 100644 --- a/sysdeps/linux/procmap.c +++ b/sysdeps/linux/procmap.c @@ -58,7 +58,7 @@ static const unsigned long _glibtop_sysdeps_map_entry_smaps = /* Init function. */ void -glibtop_init_proc_map_s (glibtop *server) +_glibtop_init_proc_map_s (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/linux/procmem.c b/sysdeps/linux/procmem.c index 07a58b6c..875a39ef 100644 --- a/sysdeps/linux/procmem.c +++ b/sysdeps/linux/procmem.c @@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem_statm = /* Init function. */ void -glibtop_init_proc_mem_s (glibtop *server) +_glibtop_init_proc_mem_s (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem | _glibtop_sysdeps_proc_mem_statm; diff --git a/sysdeps/linux/procopenfiles.c b/sysdeps/linux/procopenfiles.c index 54f74254..1f4b6474 100644 --- a/sysdeps/linux/procopenfiles.c +++ b/sysdeps/linux/procopenfiles.c @@ -42,7 +42,7 @@ static const unsigned long _glibtop_sysdeps_proc_open_files = /* Init function. */ void -glibtop_init_proc_open_files_s (glibtop *server) +_glibtop_init_proc_open_files_s (glibtop *server) { server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; } diff --git a/sysdeps/linux/procsegment.c b/sysdeps/linux/procsegment.c index b78f4a7d..822ec7c5 100644 --- a/sysdeps/linux/procsegment.c +++ b/sysdeps/linux/procsegment.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment_statm = /* Init function. */ void -glibtop_init_proc_segment_s (glibtop *server) +_glibtop_init_proc_segment_s (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment | _glibtop_sysdeps_proc_segment_statm; diff --git a/sysdeps/linux/procsignal.c b/sysdeps/linux/procsignal.c index 290d7b4d..5a0a63d7 100644 --- a/sysdeps/linux/procsignal.c +++ b/sysdeps/linux/procsignal.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_s (glibtop *server) +_glibtop_init_proc_signal_s (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/linux/procstate.c b/sysdeps/linux/procstate.c index 5bcb9d47..13ba070c 100644 --- a/sysdeps/linux/procstate.c +++ b/sysdeps/linux/procstate.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_state_uid = /* Init function. */ void -glibtop_init_proc_state_s (glibtop *server) +_glibtop_init_proc_state_s (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state | _glibtop_sysdeps_proc_state_uid; diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c index 8e095ab7..07b2a855 100644 --- a/sysdeps/linux/proctime.c +++ b/sysdeps/linux/proctime.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proc_time_smp = /* Init function. */ void -glibtop_init_proc_time_s (glibtop *server) +_glibtop_init_proc_time_s (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; diff --git a/sysdeps/linux/procuid.c b/sysdeps/linux/procuid.c index e20a3cd5..5d11002b 100644 --- a/sysdeps/linux/procuid.c +++ b/sysdeps/linux/procuid.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid_stat = /* Init function. */ void -glibtop_init_proc_uid_s (glibtop *server) +_glibtop_init_proc_uid_s (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid | _glibtop_sysdeps_proc_uid_stat; diff --git a/sysdeps/linux/sem_limits.c b/sysdeps/linux/sem_limits.c index 9f15bb70..3c4a6a6b 100644 --- a/sysdeps/linux/sem_limits.c +++ b/sysdeps/linux/sem_limits.c @@ -50,7 +50,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = /* Init function. */ void -glibtop_init_sem_limits_s (glibtop *server) +_glibtop_init_sem_limits_s (glibtop *server) { server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } diff --git a/sysdeps/linux/shm_limits.c b/sysdeps/linux/shm_limits.c index eeb15a9d..2d392852 100644 --- a/sysdeps/linux/shm_limits.c +++ b/sysdeps/linux/shm_limits.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = /* Init function. */ void -glibtop_init_shm_limits_s (glibtop *server) +_glibtop_init_shm_limits_s (glibtop *server) { server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } diff --git a/sysdeps/linux/swap.c b/sysdeps/linux/swap.c index c6a84e7e..11881b86 100644 --- a/sysdeps/linux/swap.c +++ b/sysdeps/linux/swap.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_swap_paging = /* Init function. */ void -glibtop_init_swap_s (glibtop *server) +_glibtop_init_swap_s (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap | _glibtop_sysdeps_swap_paging; diff --git a/sysdeps/linux/uptime.c b/sysdeps/linux/uptime.c index e48ea38b..5a39ca70 100644 --- a/sysdeps/linux/uptime.c +++ b/sysdeps/linux/uptime.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_uptime = /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/osf1/cpu.c b/sysdeps/osf1/cpu.c index 0df08cdd..70d551c6 100644 --- a/sysdeps/osf1/cpu.c +++ b/sysdeps/osf1/cpu.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_cpu = /* Init function. */ void -glibtop_init_cpu_s (glibtop *server) +_glibtop_init_cpu_s (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu; } diff --git a/sysdeps/osf1/loadavg.c b/sysdeps/osf1/loadavg.c index 5a00a46c..6641cca9 100644 --- a/sysdeps/osf1/loadavg.c +++ b/sysdeps/osf1/loadavg.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = /* Init function. */ void -glibtop_init_loadavg_s (glibtop *server) +_glibtop_init_loadavg_s (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/osf1/mem.c b/sysdeps/osf1/mem.c index 24cf6ed2..f9618abc 100644 --- a/sysdeps/osf1/mem.c +++ b/sysdeps/osf1/mem.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_mem = /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { server->sysdeps.mem = _glibtop_sysdeps_mem; } diff --git a/sysdeps/osf1/msg_limits.c b/sysdeps/osf1/msg_limits.c index 2947d5cf..e28dd82b 100644 --- a/sysdeps/osf1/msg_limits.c +++ b/sysdeps/osf1/msg_limits.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = /* Init function. */ void -glibtop_init_msg_limits_s (glibtop *server) +_glibtop_init_msg_limits_s (glibtop *server) { server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } diff --git a/sysdeps/osf1/netload.c b/sysdeps/osf1/netload.c index 2ddc7ac0..eefacf51 100644 --- a/sysdeps/osf1/netload.c +++ b/sysdeps/osf1/netload.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0; /* Init function. */ void -glibtop_init_netload_p (glibtop *server) +_glibtop_init_netload_p (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload; } diff --git a/sysdeps/osf1/open_suid.c b/sysdeps/osf1/open_suid.c index 1d33a103..bc45ef15 100644 --- a/sysdeps/osf1/open_suid.c +++ b/sysdeps/osf1/open_suid.c @@ -34,7 +34,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/osf1/ppp.c b/sysdeps/osf1/ppp.c index 81fe2b68..d7b510ef 100644 --- a/sysdeps/osf1/ppp.c +++ b/sysdeps/osf1/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/osf1/procargs.c b/sysdeps/osf1/procargs.c index 45a8a6b6..42029eb5 100644 --- a/sysdeps/osf1/procargs.c +++ b/sysdeps/osf1/procargs.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = 0; /* Init function. */ void -glibtop_init_proc_args_p (glibtop *server) +_glibtop_init_proc_args_p (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/osf1/prockernel.c b/sysdeps/osf1/prockernel.c index 726fad8c..77f867ab 100644 --- a/sysdeps/osf1/prockernel.c +++ b/sysdeps/osf1/prockernel.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0; /* Init function. */ void -glibtop_init_proc_kernel_p (glibtop *server) +_glibtop_init_proc_kernel_p (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/osf1/proclist.c b/sysdeps/osf1/proclist.c index a88a2cdb..7d5f5bd3 100644 --- a/sysdeps/osf1/proclist.c +++ b/sysdeps/osf1/proclist.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_p (glibtop *server) +_glibtop_init_proclist_p (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/osf1/procmap.c b/sysdeps/osf1/procmap.c index d7c9cba1..490eeab4 100644 --- a/sysdeps/osf1/procmap.c +++ b/sysdeps/osf1/procmap.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_map = 0; /* Init function. */ void -glibtop_init_proc_map_p (glibtop *server) +_glibtop_init_proc_map_p (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/osf1/procmem.c b/sysdeps/osf1/procmem.c index 37c1c8dd..59e4a4b7 100644 --- a/sysdeps/osf1/procmem.c +++ b/sysdeps/osf1/procmem.c @@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = /* Init function. */ void -glibtop_init_proc_mem_p (glibtop *server) +_glibtop_init_proc_mem_p (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem; } diff --git a/sysdeps/osf1/procsegment.c b/sysdeps/osf1/procsegment.c index f775b4fa..ebd9364a 100644 --- a/sysdeps/osf1/procsegment.c +++ b/sysdeps/osf1/procsegment.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = /* Init function. */ void -glibtop_init_proc_segment_p (glibtop *server) +_glibtop_init_proc_segment_p (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/osf1/procsignal.c b/sysdeps/osf1/procsignal.c index 884ce277..58d7430d 100644 --- a/sysdeps/osf1/procsignal.c +++ b/sysdeps/osf1/procsignal.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_p (glibtop *server) +_glibtop_init_proc_signal_p (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/osf1/procstate.c b/sysdeps/osf1/procstate.c index 6289afdb..f0f4ae1f 100644 --- a/sysdeps/osf1/procstate.c +++ b/sysdeps/osf1/procstate.c @@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = /* Init function. */ void -glibtop_init_proc_state_p (glibtop *server) +_glibtop_init_proc_state_p (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/osf1/proctime.c b/sysdeps/osf1/proctime.c index ac230457..d51e20bb 100644 --- a/sysdeps/osf1/proctime.c +++ b/sysdeps/osf1/proctime.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = /* Init function. */ void -glibtop_init_proc_time_p (glibtop *server) +_glibtop_init_proc_time_p (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; } diff --git a/sysdeps/osf1/procuid.c b/sysdeps/osf1/procuid.c index 9e0de9ee..daa06e21 100644 --- a/sysdeps/osf1/procuid.c +++ b/sysdeps/osf1/procuid.c @@ -44,7 +44,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = /* Init function. */ void -glibtop_init_proc_uid_p (glibtop *server) +_glibtop_init_proc_uid_p (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } diff --git a/sysdeps/osf1/sem_limits.c b/sysdeps/osf1/sem_limits.c index a0d2e8f5..8cb07962 100644 --- a/sysdeps/osf1/sem_limits.c +++ b/sysdeps/osf1/sem_limits.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = /* Init function. */ void -glibtop_init_sem_limits_s (glibtop *server) +_glibtop_init_sem_limits_s (glibtop *server) { server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } diff --git a/sysdeps/osf1/shm_limits.c b/sysdeps/osf1/shm_limits.c index 5d60e3d1..2a34c484 100644 --- a/sysdeps/osf1/shm_limits.c +++ b/sysdeps/osf1/shm_limits.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = /* Init function. */ void -glibtop_init_shm_limits_s (glibtop *server) +_glibtop_init_shm_limits_s (glibtop *server) { server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } diff --git a/sysdeps/osf1/swap.c b/sysdeps/osf1/swap.c index 0c3be33e..ba28ab31 100644 --- a/sysdeps/osf1/swap.c +++ b/sysdeps/osf1/swap.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_swap = /* Init function. */ void -glibtop_init_swap_s (glibtop *server) +_glibtop_init_swap_s (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap; } diff --git a/sysdeps/osf1/uptime.c b/sysdeps/osf1/uptime.c index 0fd5ca60..826b4428 100644 --- a/sysdeps/osf1/uptime.c +++ b/sysdeps/osf1/uptime.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_uptime = /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/solaris/cpu.c b/sysdeps/solaris/cpu.c index 4c042a6c..0a54426a 100644 --- a/sysdeps/solaris/cpu.c +++ b/sysdeps/solaris/cpu.c @@ -43,7 +43,7 @@ static const unsigned long _glibtop_sysdeps_cpu_all = /* Init function. */ void -glibtop_init_cpu_s (glibtop *server) +_glibtop_init_cpu_s (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu_all; } diff --git a/sysdeps/solaris/loadavg.c b/sysdeps/solaris/loadavg.c index 6d411425..9c7b6d46 100644 --- a/sysdeps/solaris/loadavg.c +++ b/sysdeps/solaris/loadavg.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = /* Init function. */ void -glibtop_init_loadavg_s (glibtop *server) +_glibtop_init_loadavg_s (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/solaris/mem.c b/sysdeps/solaris/mem.c index 046f1e4e..0c298fdd 100644 --- a/sysdeps/solaris/mem.c +++ b/sysdeps/solaris/mem.c @@ -31,7 +31,7 @@ /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { server->sysdeps.mem = (1L << GLIBTOP_MEM_TOTAL) | (1L << GLIBTOP_MEM_FREE) diff --git a/sysdeps/solaris/msg_limits.c b/sysdeps/solaris/msg_limits.c index de945d2e..787e8925 100644 --- a/sysdeps/solaris/msg_limits.c +++ b/sysdeps/solaris/msg_limits.c @@ -44,7 +44,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = 0; /* Init function. */ void -glibtop_init_msg_limits_p (glibtop *server) +_glibtop_init_msg_limits_p (glibtop *server) { #if GLIBTOP_SOLARIS_RELEASE < 51000 diff --git a/sysdeps/solaris/netlist.c b/sysdeps/solaris/netlist.c index 2e6923ee..a5280f5b 100644 --- a/sysdeps/solaris/netlist.c +++ b/sysdeps/solaris/netlist.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_netlist = (1 << GLIBTOP_NETLIST_NUMB /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/solaris/netload.c b/sysdeps/solaris/netload.c index d55f5065..0bdf7ade 100644 --- a/sysdeps/solaris/netload.c +++ b/sysdeps/solaris/netload.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0; /* Init function. */ void -glibtop_init_netload_s (glibtop *server) +_glibtop_init_netload_s (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload; } diff --git a/sysdeps/solaris/open_suid.c b/sysdeps/solaris/open_suid.c index 953374e9..aaafd600 100644 --- a/sysdeps/solaris/open_suid.c +++ b/sysdeps/solaris/open_suid.c @@ -35,7 +35,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/solaris/ppp.c b/sysdeps/solaris/ppp.c index 81fe2b68..d7b510ef 100644 --- a/sysdeps/solaris/ppp.c +++ b/sysdeps/solaris/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/solaris/procargs.c b/sysdeps/solaris/procargs.c index b94ca3ed..6c668def 100644 --- a/sysdeps/solaris/procargs.c +++ b/sysdeps/solaris/procargs.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = /* Init function. */ void -glibtop_init_proc_args_s (glibtop *server) +_glibtop_init_proc_args_s (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/solaris/prockernel.c b/sysdeps/solaris/prockernel.c index 772c5c37..f37d8923 100644 --- a/sysdeps/solaris/prockernel.c +++ b/sysdeps/solaris/prockernel.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0; /* Init function. */ void -glibtop_init_proc_kernel_s (glibtop *server) +_glibtop_init_proc_kernel_s (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/solaris/proclist.c b/sysdeps/solaris/proclist.c index cd1e8a1a..c0f6075a 100644 --- a/sysdeps/solaris/proclist.c +++ b/sysdeps/solaris/proclist.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proclist = /* Init function. */ void -glibtop_init_proclist_s (glibtop *server) +_glibtop_init_proclist_s (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/solaris/procmap.c b/sysdeps/solaris/procmap.c index b545cb01..85f3ff3b 100644 --- a/sysdeps/solaris/procmap.c +++ b/sysdeps/solaris/procmap.c @@ -43,7 +43,7 @@ static const unsigned long _glibtop_sysdeps_map_device = /* Init function. */ void -glibtop_init_proc_map_s (glibtop *server) +_glibtop_init_proc_map_s (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/solaris/procmem.c b/sysdeps/solaris/procmem.c index df52652c..92aca002 100644 --- a/sysdeps/solaris/procmem.c +++ b/sysdeps/solaris/procmem.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = /* Init function. */ void -glibtop_init_proc_mem_s (glibtop *server) +_glibtop_init_proc_mem_s (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem; } diff --git a/sysdeps/solaris/procopenfiles.c b/sysdeps/solaris/procopenfiles.c index 82dda2bc..9f5e8fec 100644 --- a/sysdeps/solaris/procopenfiles.c +++ b/sysdeps/solaris/procopenfiles.c @@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_proc_open_files = /* Init function. */ void -glibtop_init_proc_open_files_s (glibtop *server) +_glibtop_init_proc_open_files_s (glibtop *server) { server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; } diff --git a/sysdeps/solaris/procsegment.c b/sysdeps/solaris/procsegment.c index f0ffe314..72e3b45c 100644 --- a/sysdeps/solaris/procsegment.c +++ b/sysdeps/solaris/procsegment.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = 0; /* Init function. */ void -glibtop_init_proc_segment_s (glibtop *server) +_glibtop_init_proc_segment_s (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/solaris/procsignal.c b/sysdeps/solaris/procsignal.c index 8121c561..c80f904d 100644 --- a/sysdeps/solaris/procsignal.c +++ b/sysdeps/solaris/procsignal.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Init function. */ void -glibtop_init_proc_signal_s (glibtop *server) +_glibtop_init_proc_signal_s (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/solaris/procstate.c b/sysdeps/solaris/procstate.c index 01b0f488..043059a1 100644 --- a/sysdeps/solaris/procstate.c +++ b/sysdeps/solaris/procstate.c @@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = /* Init function. */ void -glibtop_init_proc_state_s (glibtop *server) +_glibtop_init_proc_state_s (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/solaris/proctime.c b/sysdeps/solaris/proctime.c index 01374b8c..525a582f 100644 --- a/sysdeps/solaris/proctime.c +++ b/sysdeps/solaris/proctime.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = /* Init function. */ void -glibtop_init_proc_time_s (glibtop *server) +_glibtop_init_proc_time_s (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; } diff --git a/sysdeps/solaris/procuid.c b/sysdeps/solaris/procuid.c index bff06439..5441a493 100644 --- a/sysdeps/solaris/procuid.c +++ b/sysdeps/solaris/procuid.c @@ -45,7 +45,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid_prcred = /* Init function. */ void -glibtop_init_proc_uid_s (glibtop *server) +_glibtop_init_proc_uid_s (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid_psinfo + _glibtop_sysdeps_proc_uid_prcred; diff --git a/sysdeps/solaris/sem_limits.c b/sysdeps/solaris/sem_limits.c index 28a66fd9..81c92f35 100644 --- a/sysdeps/solaris/sem_limits.c +++ b/sysdeps/solaris/sem_limits.c @@ -46,7 +46,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = 0; /* Init function. */ void -glibtop_init_sem_limits_p (glibtop *server) +_glibtop_init_sem_limits_p (glibtop *server) { #if GLIBTOP_SOLARIS_RELEASE < 51000 diff --git a/sysdeps/solaris/shm_limits.c b/sysdeps/solaris/shm_limits.c index b8d31f9a..22e2cace 100644 --- a/sysdeps/solaris/shm_limits.c +++ b/sysdeps/solaris/shm_limits.c @@ -46,7 +46,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = /* Init function. */ void -glibtop_init_shm_limits_p (glibtop *server) +_glibtop_init_shm_limits_p (glibtop *server) { #if GLIBTOP_SOLARIS_RELEASE < 51000 diff --git a/sysdeps/solaris/swap.c b/sysdeps/solaris/swap.c index 9c2b9c58..a2e297f0 100644 --- a/sysdeps/solaris/swap.c +++ b/sysdeps/solaris/swap.c @@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_swap = /* Init function. */ void -glibtop_init_swap_s (glibtop *server) +_glibtop_init_swap_s (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap; } diff --git a/sysdeps/solaris/uptime.c b/sysdeps/solaris/uptime.c index 53a3687e..2649dba8 100644 --- a/sysdeps/solaris/uptime.c +++ b/sysdeps/solaris/uptime.c @@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_uptime = /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/stub/cpu.c b/sysdeps/stub/cpu.c index 0236b66e..7384124c 100644 --- a/sysdeps/stub/cpu.c +++ b/sysdeps/stub/cpu.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_cpu = 0; /* Init function. */ void -glibtop_init_cpu_s (glibtop *server) +_glibtop_init_cpu_s (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu; } diff --git a/sysdeps/stub/loadavg.c b/sysdeps/stub/loadavg.c index 554e4433..4037c7d5 100644 --- a/sysdeps/stub/loadavg.c +++ b/sysdeps/stub/loadavg.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = 0; /* Init function. */ void -glibtop_init_loadavg_s (glibtop *server) +_glibtop_init_loadavg_s (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/stub/mem.c b/sysdeps/stub/mem.c index ef0cccac..764b0cc3 100644 --- a/sysdeps/stub/mem.c +++ b/sysdeps/stub/mem.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_mem = 0; /* Init function. */ void -glibtop_init_mem_s (glibtop *server) +_glibtop_init_mem_s (glibtop *server) { server->sysdeps.mem = _glibtop_sysdeps_mem; } diff --git a/sysdeps/stub/msg_limits.c b/sysdeps/stub/msg_limits.c index 44341f7d..08e051ca 100644 --- a/sysdeps/stub/msg_limits.c +++ b/sysdeps/stub/msg_limits.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = 0; /* Init function. */ void -glibtop_init_msg_limits_s (glibtop *server) +_glibtop_init_msg_limits_s (glibtop *server) { server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } diff --git a/sysdeps/stub/netlist.c b/sysdeps/stub/netlist.c index eb6bede3..fce76fd4 100644 --- a/sysdeps/stub/netlist.c +++ b/sysdeps/stub/netlist.c @@ -25,7 +25,7 @@ static const unsigned long _glibtop_sysdeps_netlist = 0; /* Init function. */ void -glibtop_init_netlist_s (glibtop *server) +_glibtop_init_netlist_s (glibtop *server) { server->sysdeps.netlist = _glibtop_sysdeps_netlist; } diff --git a/sysdeps/stub/netload.c b/sysdeps/stub/netload.c index d55f5065..0bdf7ade 100644 --- a/sysdeps/stub/netload.c +++ b/sysdeps/stub/netload.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0; /* Init function. */ void -glibtop_init_netload_s (glibtop *server) +_glibtop_init_netload_s (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload; } diff --git a/sysdeps/stub/ppp.c b/sysdeps/stub/ppp.c index 81fe2b68..d7b510ef 100644 --- a/sysdeps/stub/ppp.c +++ b/sysdeps/stub/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/stub/procargs.c b/sysdeps/stub/procargs.c index 90aa80d4..f408bbfa 100644 --- a/sysdeps/stub/procargs.c +++ b/sysdeps/stub/procargs.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = 0; /* Init function. */ void -glibtop_init_proc_args_s (glibtop *server) +_glibtop_init_proc_args_s (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/stub/prockernel.c b/sysdeps/stub/prockernel.c index 772c5c37..f37d8923 100644 --- a/sysdeps/stub/prockernel.c +++ b/sysdeps/stub/prockernel.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0; /* Init function. */ void -glibtop_init_proc_kernel_s (glibtop *server) +_glibtop_init_proc_kernel_s (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/stub/proclist.c b/sysdeps/stub/proclist.c index 2d5cb221..663d8a5f 100644 --- a/sysdeps/stub/proclist.c +++ b/sysdeps/stub/proclist.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proclist = 0; /* Init function. */ void -glibtop_init_proclist_s (glibtop *server) +_glibtop_init_proclist_s (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/stub/procmap.c b/sysdeps/stub/procmap.c index 772e4df2..9da252f9 100644 --- a/sysdeps/stub/procmap.c +++ b/sysdeps/stub/procmap.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_map = 0; /* Init function. */ void -glibtop_init_proc_map_s (glibtop *server) +_glibtop_init_proc_map_s (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/stub/procmem.c b/sysdeps/stub/procmem.c index aaaaa28c..e2bd59df 100644 --- a/sysdeps/stub/procmem.c +++ b/sysdeps/stub/procmem.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = 0; /* Init function. */ void -glibtop_init_proc_mem_s (glibtop *server) +_glibtop_init_proc_mem_s (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem; } diff --git a/sysdeps/stub/procopenfiles.c b/sysdeps/stub/procopenfiles.c index 47668cae..deb87c0d 100644 --- a/sysdeps/stub/procopenfiles.c +++ b/sysdeps/stub/procopenfiles.c @@ -29,7 +29,7 @@ /* Init function. */ void -glibtop_init_proc_open_files_s (glibtop *server) +_glibtop_init_proc_open_files_s (glibtop *server) { server->sysdeps.proc_open_files = 0; } diff --git a/sysdeps/stub/procsegment.c b/sysdeps/stub/procsegment.c index f0ffe314..72e3b45c 100644 --- a/sysdeps/stub/procsegment.c +++ b/sysdeps/stub/procsegment.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = 0; /* Init function. */ void -glibtop_init_proc_segment_s (glibtop *server) +_glibtop_init_proc_segment_s (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/stub/procsignal.c b/sysdeps/stub/procsignal.c index a0616f30..98d2b07e 100644 --- a/sysdeps/stub/procsignal.c +++ b/sysdeps/stub/procsignal.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = 0; /* Init function. */ void -glibtop_init_proc_signal_s (glibtop *server) +_glibtop_init_proc_signal_s (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/stub/procstate.c b/sysdeps/stub/procstate.c index 23346fbf..2abd4a13 100644 --- a/sysdeps/stub/procstate.c +++ b/sysdeps/stub/procstate.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = 0; /* Init function. */ void -glibtop_init_proc_state_s (glibtop *server) +_glibtop_init_proc_state_s (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/stub/proctime.c b/sysdeps/stub/proctime.c index 108b4618..15821a02 100644 --- a/sysdeps/stub/proctime.c +++ b/sysdeps/stub/proctime.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = 0; /* Init function. */ void -glibtop_init_proc_time_s (glibtop *server) +_glibtop_init_proc_time_s (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; } diff --git a/sysdeps/stub/procuid.c b/sysdeps/stub/procuid.c index 3e0a15d1..5f883a28 100644 --- a/sysdeps/stub/procuid.c +++ b/sysdeps/stub/procuid.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = 0; /* Init function. */ void -glibtop_init_proc_uid_s (glibtop *server) +_glibtop_init_proc_uid_s (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } diff --git a/sysdeps/stub/sem_limits.c b/sysdeps/stub/sem_limits.c index 00a706d9..1b06e31d 100644 --- a/sysdeps/stub/sem_limits.c +++ b/sysdeps/stub/sem_limits.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = 0; /* Init function. */ void -glibtop_init_sem_limits_s (glibtop *server) +_glibtop_init_sem_limits_s (glibtop *server) { server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } diff --git a/sysdeps/stub/shm_limits.c b/sysdeps/stub/shm_limits.c index 1b53c86e..53984022 100644 --- a/sysdeps/stub/shm_limits.c +++ b/sysdeps/stub/shm_limits.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = 0; /* Init function. */ void -glibtop_init_shm_limits_s (glibtop *server) +_glibtop_init_shm_limits_s (glibtop *server) { server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } diff --git a/sysdeps/stub/swap.c b/sysdeps/stub/swap.c index 7ca7e003..e743a3e4 100644 --- a/sysdeps/stub/swap.c +++ b/sysdeps/stub/swap.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_swap = 0; /* Init function. */ void -glibtop_init_swap_s (glibtop *server) +_glibtop_init_swap_s (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap; } diff --git a/sysdeps/stub/uptime.c b/sysdeps/stub/uptime.c index 7d090945..2ca0ac58 100644 --- a/sysdeps/stub/uptime.c +++ b/sysdeps/stub/uptime.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_uptime = 0; /* Init function. */ void -glibtop_init_uptime_s (glibtop *server) +_glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/stub_suid/cpu.c b/sysdeps/stub_suid/cpu.c index 281254d0..9b307622 100644 --- a/sysdeps/stub_suid/cpu.c +++ b/sysdeps/stub_suid/cpu.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_cpu = 0; /* Init function. */ void -glibtop_init_cpu_p (glibtop *server) +_glibtop_init_cpu_p (glibtop *server) { server->sysdeps.cpu = _glibtop_sysdeps_cpu; } diff --git a/sysdeps/stub_suid/loadavg.c b/sysdeps/stub_suid/loadavg.c index bb804bac..d01ffcf0 100644 --- a/sysdeps/stub_suid/loadavg.c +++ b/sysdeps/stub_suid/loadavg.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = 0; /* Init function. */ void -glibtop_init_loadavg_p (glibtop *server) +_glibtop_init_loadavg_p (glibtop *server) { server->sysdeps.loadavg = _glibtop_sysdeps_loadavg; } diff --git a/sysdeps/stub_suid/mem.c b/sysdeps/stub_suid/mem.c index 940aedd7..1ce54b26 100644 --- a/sysdeps/stub_suid/mem.c +++ b/sysdeps/stub_suid/mem.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_mem = 0; /* Init function. */ void -glibtop_init_mem_p (glibtop *server) +_glibtop_init_mem_p (glibtop *server) { server->sysdeps.mem = _glibtop_sysdeps_mem; } diff --git a/sysdeps/stub_suid/msg_limits.c b/sysdeps/stub_suid/msg_limits.c index 697cec63..53e41957 100644 --- a/sysdeps/stub_suid/msg_limits.c +++ b/sysdeps/stub_suid/msg_limits.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = 0; /* Init function. */ void -glibtop_init_msg_limits_p (glibtop *server) +_glibtop_init_msg_limits_p (glibtop *server) { server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits; } diff --git a/sysdeps/stub_suid/netload.c b/sysdeps/stub_suid/netload.c index 2ddc7ac0..eefacf51 100644 --- a/sysdeps/stub_suid/netload.c +++ b/sysdeps/stub_suid/netload.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0; /* Init function. */ void -glibtop_init_netload_p (glibtop *server) +_glibtop_init_netload_p (glibtop *server) { server->sysdeps.netload = _glibtop_sysdeps_netload; } diff --git a/sysdeps/stub_suid/open.c b/sysdeps/stub_suid/open.c index 715576d0..6a829b08 100644 --- a/sysdeps/stub_suid/open.c +++ b/sysdeps/stub_suid/open.c @@ -30,7 +30,7 @@ void glibtop_init_p (glibtop *server, const unsigned long features, const unsigned flags) { - const glibtop_init_func_t *init_fkt; + const _glibtop_init_func_t *init_fkt; if (server == NULL) glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); diff --git a/sysdeps/stub_suid/ppp.c b/sysdeps/stub_suid/ppp.c index 92fb37a3..7e7ee1a7 100644 --- a/sysdeps/stub_suid/ppp.c +++ b/sysdeps/stub_suid/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_p (glibtop *server) +_glibtop_init_ppp_p (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } diff --git a/sysdeps/stub_suid/procargs.c b/sysdeps/stub_suid/procargs.c index 45a8a6b6..42029eb5 100644 --- a/sysdeps/stub_suid/procargs.c +++ b/sysdeps/stub_suid/procargs.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = 0; /* Init function. */ void -glibtop_init_proc_args_p (glibtop *server) +_glibtop_init_proc_args_p (glibtop *server) { server->sysdeps.proc_args = _glibtop_sysdeps_proc_args; } diff --git a/sysdeps/stub_suid/prockernel.c b/sysdeps/stub_suid/prockernel.c index 726fad8c..77f867ab 100644 --- a/sysdeps/stub_suid/prockernel.c +++ b/sysdeps/stub_suid/prockernel.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0; /* Init function. */ void -glibtop_init_proc_kernel_p (glibtop *server) +_glibtop_init_proc_kernel_p (glibtop *server) { server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel; } diff --git a/sysdeps/stub_suid/proclist.c b/sysdeps/stub_suid/proclist.c index 19c99116..a633f2c6 100644 --- a/sysdeps/stub_suid/proclist.c +++ b/sysdeps/stub_suid/proclist.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proclist = 0; /* Init function. */ void -glibtop_init_proclist_p (glibtop *server) +_glibtop_init_proclist_p (glibtop *server) { server->sysdeps.proclist = _glibtop_sysdeps_proclist; } diff --git a/sysdeps/stub_suid/procmap.c b/sysdeps/stub_suid/procmap.c index d7c9cba1..490eeab4 100644 --- a/sysdeps/stub_suid/procmap.c +++ b/sysdeps/stub_suid/procmap.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_map = 0; /* Init function. */ void -glibtop_init_proc_map_p (glibtop *server) +_glibtop_init_proc_map_p (glibtop *server) { server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } diff --git a/sysdeps/stub_suid/procmem.c b/sysdeps/stub_suid/procmem.c index c2e15b61..4d5d5ea8 100644 --- a/sysdeps/stub_suid/procmem.c +++ b/sysdeps/stub_suid/procmem.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = 0; /* Init function. */ void -glibtop_init_proc_mem_p (glibtop *server) +_glibtop_init_proc_mem_p (glibtop *server) { server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem; } diff --git a/sysdeps/stub_suid/procsegment.c b/sysdeps/stub_suid/procsegment.c index 76f1e2ab..5bbbd686 100644 --- a/sysdeps/stub_suid/procsegment.c +++ b/sysdeps/stub_suid/procsegment.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = 0; /* Init function. */ void -glibtop_init_proc_segment_p (glibtop *server) +_glibtop_init_proc_segment_p (glibtop *server) { server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment; } diff --git a/sysdeps/stub_suid/procsignal.c b/sysdeps/stub_suid/procsignal.c index 32e236b8..07cf53bc 100644 --- a/sysdeps/stub_suid/procsignal.c +++ b/sysdeps/stub_suid/procsignal.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = 0; /* Init function. */ void -glibtop_init_proc_signal_p (glibtop *server) +_glibtop_init_proc_signal_p (glibtop *server) { server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal; } diff --git a/sysdeps/stub_suid/procstate.c b/sysdeps/stub_suid/procstate.c index 9cf61863..892a760f 100644 --- a/sysdeps/stub_suid/procstate.c +++ b/sysdeps/stub_suid/procstate.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = 0; /* Init function. */ void -glibtop_init_proc_state_p (glibtop *server) +_glibtop_init_proc_state_p (glibtop *server) { server->sysdeps.proc_state = _glibtop_sysdeps_proc_state; } diff --git a/sysdeps/stub_suid/proctime.c b/sysdeps/stub_suid/proctime.c index 5c08fd26..9b674197 100644 --- a/sysdeps/stub_suid/proctime.c +++ b/sysdeps/stub_suid/proctime.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = 0; /* Init function. */ void -glibtop_init_proc_time_p (glibtop *server) +_glibtop_init_proc_time_p (glibtop *server) { server->sysdeps.proc_time = _glibtop_sysdeps_proc_time; } diff --git a/sysdeps/stub_suid/procuid.c b/sysdeps/stub_suid/procuid.c index c7436c35..f5499d4a 100644 --- a/sysdeps/stub_suid/procuid.c +++ b/sysdeps/stub_suid/procuid.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = 0; /* Init function. */ void -glibtop_init_proc_uid_p (glibtop *server) +_glibtop_init_proc_uid_p (glibtop *server) { server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } diff --git a/sysdeps/stub_suid/sem_limits.c b/sysdeps/stub_suid/sem_limits.c index e7946146..f3864d50 100644 --- a/sysdeps/stub_suid/sem_limits.c +++ b/sysdeps/stub_suid/sem_limits.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits = 0; /* Init function. */ void -glibtop_init_sem_limits_p (glibtop *server) +_glibtop_init_sem_limits_p (glibtop *server) { server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits; } diff --git a/sysdeps/stub_suid/shm_limits.c b/sysdeps/stub_suid/shm_limits.c index f36e2083..71c2130b 100644 --- a/sysdeps/stub_suid/shm_limits.c +++ b/sysdeps/stub_suid/shm_limits.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits = 0; /* Init function. */ void -glibtop_init_shm_limits_p (glibtop *server) +_glibtop_init_shm_limits_p (glibtop *server) { server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits; } diff --git a/sysdeps/stub_suid/swap.c b/sysdeps/stub_suid/swap.c index 6505e15e..2f6d4366 100644 --- a/sysdeps/stub_suid/swap.c +++ b/sysdeps/stub_suid/swap.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_swap = 0; /* Init function. */ void -glibtop_init_swap_p (glibtop *server) +_glibtop_init_swap_p (glibtop *server) { server->sysdeps.swap = _glibtop_sysdeps_swap; } diff --git a/sysdeps/stub_suid/uptime.c b/sysdeps/stub_suid/uptime.c index f30452e3..ba6156c8 100644 --- a/sysdeps/stub_suid/uptime.c +++ b/sysdeps/stub_suid/uptime.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_uptime = 0; /* Init function. */ void -glibtop_init_uptime_p (glibtop *server) +_glibtop_init_uptime_p (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } diff --git a/sysdeps/sun4/ppp.c b/sysdeps/sun4/ppp.c index 81fe2b68..d7b510ef 100644 --- a/sysdeps/sun4/ppp.c +++ b/sysdeps/sun4/ppp.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0; /* Init function. */ void -glibtop_init_ppp_s (glibtop *server) +_glibtop_init_ppp_s (glibtop *server) { server->sysdeps.ppp = _glibtop_sysdeps_ppp; } -- cgit v1.2.1