diff options
| author | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-02 09:47:21 +0000 |
|---|---|---|
| committer | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-02 09:47:21 +0000 |
| commit | 78cb7832c50f0cbb8225a201d46539198cf99a25 (patch) | |
| tree | 907169723e04fa7a360739f8ca00c714e7104efd /lib | |
| parent | b3979e69426cd74386ed9fc6e99f55a4ec353b88 (diff) | |
| download | libgtop-78cb7832c50f0cbb8225a201d46539198cf99a25.tar.gz | |
Moved _glibtop_init_hook_[sp] declaration to private glibtop/init_hooks.h.
* configure.in:
* include/glibtop/Makefile.am:
* include/glibtop/glibtop-server.h:
* include/glibtop/init_hooks.h:
* include/glibtop/sysdeps.h:
* lib/init.c: (glibtop_init_s):
* lib/sysdeps.c:
* sysdeps/aix/open.c: (glibtop_init_p):
* sysdeps/common/sysdeps_suid.c:
* sysdeps/freebsd/open.c: (glibtop_init_p):
* sysdeps/osf1/open_suid.c: (glibtop_init_p):
* sysdeps/solaris/open_suid.c: (glibtop_init_p):
* sysdeps/stub_suid/open.c: (glibtop_init_p):
Moved _glibtop_init_hook_[sp] declaration to private
glibtop/init_hooks.h. Marked them const.
Fixed GLIBTOP_SUID_NETLIST issues.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/init.c | 3 | ||||
| -rw-r--r-- | lib/sysdeps.c | 12 |
2 files changed, 12 insertions, 3 deletions
@@ -26,6 +26,7 @@ #include <glibtop/sysdeps.h> #include <glibtop/open.h> #include <glibtop/parameter.h> +#include <glibtop/init_hooks.h> #ifndef DEFAULT_PORT #define DEFAULT_PORT 42800 @@ -219,7 +220,7 @@ glibtop * glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags) { glibtop *server; - 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 88f7a2fe..e0413632 100644 --- a/lib/sysdeps.c +++ b/lib/sysdeps.c @@ -22,6 +22,7 @@ #include <glibtop.h> #include <glibtop/union.h> #include <glibtop/sysdeps.h> +#include <glibtop/init_hooks.h> const unsigned long glibtop_server_features = GLIBTOP_SUID_CPU + @@ -43,9 +44,10 @@ GLIBTOP_SUID_PROC_SEGMENT + GLIBTOP_SUID_PROC_ARGS + GLIBTOP_SUID_PROC_MAP + GLIBTOP_SUID_NETLOAD + +GLIBTOP_SUID_NETLIST + GLIBTOP_SUID_PPP; -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, #endif @@ -103,13 +105,16 @@ glibtop_init_func_t _glibtop_init_hook_s [] = { #if !GLIBTOP_SUID_NETLOAD glibtop_init_netload_s, #endif +#if !GLIBTOP_SUID_NETLIST + glibtop_init_netlist_s, +#endif #if !GLIBTOP_SUID_PPP glibtop_init_ppp_s, #endif NULL }; -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, #endif @@ -167,6 +172,9 @@ glibtop_init_func_t _glibtop_init_hook_p [] = { #if GLIBTOP_SUID_NETLOAD glibtop_init_netload_p, #endif +#if GLIBTOP_SUID_NETLIST + glibtop_init_netlist_p, +#endif #if GLIBTOP_SUID_PPP glibtop_init_ppp_p, #endif |