Renamed all glibtop_init_xxx functions to _glibtop_init_xxx so they get

2007-04-11  Benoît Dejean  <benoit@placenet.org>

	* *:
	
	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

@@ -1,3 +1,14 @@
+2007-04-11  Benoît Dejean  <benoit@placenet.org>
+
+	* *:
+	
+	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  <benoit@placenet.org>
 
 	* MAINTAINERS:

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.

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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,

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
 

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,

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);

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
 

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);

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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;

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
 };

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;
 

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;
 

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;
 }

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;
 

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;
 }

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;

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)");

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 

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;
 

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;
 }

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;
 }

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) {

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;
 }

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;
 

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)");

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;
 }

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;
 

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)");

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

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;
 }

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 |

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;
 }

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;
 }

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;
 

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;
 }

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;
 }

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;
 }

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;

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;

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;

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)");

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)");

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__)

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;
 }

sysdeps/common/sysdeps_suid.c

@@ -26,69 +26,69 @@
 #include <glibtop/sysdeps.h>
 #include <glibtop/init_hooks.h>
 
-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
 };

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;
 

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;

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 ();
 

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;
 }

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;
 }

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");

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)");

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

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;
 }

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;

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;
 }

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;
 }

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;

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;
 }

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;

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;
 }

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;
 }

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;

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;
 }

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;
 }

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;
 }

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 ();
 

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;
 }

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;
 

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;
 }

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;
 }

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;
 }