Released 2.11.91.

* NEWS:

	Released 2.11.91.

ChangeLog

@@ -1,3 +1,37 @@
+2005-08-08  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.11.91.
+
+2005-08-04  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* configure.in:
+	* examples/Makefile.am:
+
+	Removed static examples.
+
+2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* 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.
+
 2005-07-24  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* NEWS:

NEWS

@@ -1,3 +1,11 @@
+August 9, 2005: Overview of changes from 2.11.90 to 2.11.91
+===========================================================
+* All:
+  - cleaned some headers.
+  - removed static examples.
+* Linux:
+  - fixed some issues with 2.6 without /sys
+
 July 24, 2005: Overview of changes from 2.11.2 to 2.11.90
 =========================================================
 * Linux:

configure.in

@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
 LIBGTOP_MINOR_VERSION=11
-LIBGTOP_MICRO_VERSION=90
+LIBGTOP_MICRO_VERSION=91
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
@@ -112,27 +112,6 @@ if test x$build_inodedb = xyes ; then
   AC_DEFINE(GLIBTOP_INODEDB)
 fi
 
-
-if test x$libgtop_smp = xyes ; then
-  smp_examples='smp'
-  smp_static_examples='smp_static'
-else
-  smp_examples=
-  smp_static_examples=
-fi
-
-if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static openfiles_static"
-else
-  static_targets=""
-fi
-
-AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
-AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
-
-AC_SUBST(static_targets)
-AC_SUBST(smp_examples)
-
 GLIB_REQUIRED=2.6.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)

examples/ChangeLog

@@ -1,3 +1,13 @@
+2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* pprint.c: (pprint_get_cpu), (pprint_get_loadavg),
+	(pprint_get_mem), (pprint_get_msg_limits), (pprint_get_netlist),
+	(pprint_get_swap), (pprint_get_uptime), (pprint_get_proc_kernel),
+	(main):
+
+	Added pprint_get_proc_kernel(pid).
+	Fixed prototypes.
+
 2005-01-22  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* openfiles.c: (show_open_files): Updated.

examples/Makefile.am

@@ -8,112 +8,43 @@ DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles \
-			  @static_targets@ @smp_examples@
-
-EXTRA_PROGRAMS		= first_static second_static \
-			  mountlist_static procmap_static \
-			  smp smp_static openfiles_static \
-			  netload_static sysdeps_static \
-			  timings_static pprint_static procargs_static \
-			  df_static netlist_static
+			  openfiles smp
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-first_static_SOURCES	= $(first_SOURCES)
-first_static_LDADD	= $(first_LDADD)
-first_static_LDFLAGS	= -static
-
 second_SOURCES		= second.c
 second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
 
-second_static_SOURCES	= $(second_SOURCES)
-second_static_LDADD	= $(second_LDADD)
-second_static_LDFLAGS	= -static
-
 procmap_SOURCES		= procmap.c
 procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-procmap_static_SOURCES	= $(procmap_SOURCES)
-procmap_static_LDADD	= $(procmap_LDADD)
-procmap_static_LDFLAGS	= -static
-
 netload_SOURCES		= netload.c
 netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-netload_static_SOURCES	= $(netload_SOURCES)
-netload_static_LDADD	= $(netload_LDADD)
-netload_static_LDFLAGS	= -static
-
 sysdeps_SOURCES		= sysdeps.c
 sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
-sysdeps_static_LDADD	= $(sysdeps_LDADD)
-sysdeps_static_LDFLAGS	= -static
-
-
 mountlist_SOURCES	= mountlist.c
 mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-mountlist_static_SOURCES= $(mountlist_SOURCES)
-mountlist_static_LDADD	= $(mountlist_LDADD)
-mountlist_static_LDFLAGS= -static
-
-
 smp_SOURCES		= smp.c
 smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
 
-smp_static_SOURCES	= $(smp_SOURCES)
-smp_static_LDADD	= $(smp_LDADD)
-smp_static_LDFLAGS	= -static
-
 timings_SOURCES		= timings.c
 timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-timings_static_SOURCES	= $(timings_SOURCES)
-timings_static_LDADD	= $(timings_LDADD)
-timings_static_LDFLAGS	= -static
-
-
 pprint_SOURCES	        = pprint.c
 pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-pprint_static_SOURCES   = $(pprint_SOURCES)
-pprint_static_LDADD	= $(pprint_LDADD)
-pprint_static_LDFLAGS   = -static
-
-
 procargs_SOURCES	  = procargs.c
 procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
 
-procargs_static_SOURCES   = $(procargs_SOURCES)
-procargs_static_LDADD	  = $(procargs_LDADD)
-procargs_static_LDFLAGS   = -static
-
-
 df_SOURCES	  = df.c
 df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
 
-df_static_SOURCES   = $(df_SOURCES)
-df_static_LDADD	  = $(df_LDADD)
-df_static_LDFLAGS   = -static
-
-
 netlist_SOURCES		= netlist.c
 netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
-netlist_static_SOURCES	= $(netlist_SOURCES)
-netlist_static_LDADD	= $(netlist_LDADD)
-netlist_static_LDFLAGS	= -static
-
-
 openfiles_SOURCES	= openfiles.c
 openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-openfiles_static_SOURCES	= $(openfiles_SOURCES)
-openfiles_static_LDADD		= $(openfiles_LDADD)
-openfiles_static_LDFLAGS	= -static
-
-

examples/pprint.c

@@ -2,6 +2,7 @@
 
 #include <glibtop/union.h>
 
+#include <unistd.h>
 
 #include <stdio.h>
 #include <stddef.h>
@@ -28,7 +29,7 @@ printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
 
 
 
-static void pprint_get_cpu()
+static void pprint_get_cpu(void)
 {
   glibtop_cpu buf;
 
@@ -81,7 +82,7 @@ static void pprint_get_fsusage(const char *mountpoint)
 
 
 
-static void pprint_get_loadavg()
+static void pprint_get_loadavg(void)
 {
   glibtop_loadavg buf;
 
@@ -98,7 +99,7 @@ static void pprint_get_loadavg()
 
 
 
-static void pprint_get_mem()
+static void pprint_get_mem(void)
 {
   glibtop_mem buf;
 
@@ -156,7 +157,7 @@ static void pprint_get_mountlist(gboolean allfs)
 
 
 
-static void pprint_get_msg_limits()
+static void pprint_get_msg_limits(void)
 {
   glibtop_msg_limits buf;
 
@@ -189,7 +190,7 @@ static void pprint_get_netload(const char *iface)
 }
 
 
-static void pprint_get_netlist()
+static void pprint_get_netlist(void)
 {
   glibtop_netlist buf;
   char **devices;
@@ -211,7 +212,7 @@ static void pprint_get_netlist()
 
 
 
-static void pprint_get_swap()
+static void pprint_get_swap(void)
 {
   glibtop_swap buf;
 
@@ -229,7 +230,7 @@ static void pprint_get_swap()
 
 
 
-static void pprint_get_uptime()
+static void pprint_get_uptime(void)
 {
   glibtop_uptime buf;
 
@@ -246,6 +247,23 @@ static void pprint_get_uptime()
 
 
 
+static void pprint_get_proc_kernel(pid_t pid)
+{
+  glibtop_proc_kernel buf;
+
+  glibtop_get_proc_kernel(&buf, pid);
+
+  HEADER_PPRINT(glibtop_get_proc_kernel);
+  PPRINT(flags, "%#llx");
+  PPRINT(k_flags, "%llu");
+  PPRINT(min_flt, "%llu");
+  PPRINT(maj_flt, "%llu");
+  PPRINT(cmin_flt, "%llu");
+  PPRINT(cmaj_flt, "%llu");
+  FOOTER_PPRINT();
+}
+
+
 
 int main()
 {
@@ -275,6 +293,8 @@ int main()
 
   pprint_get_uptime();
 
+  pprint_get_proc_kernel(getpid());
+
   glibtop_close();
 
   return 0;

include/glibtop/Makefile.am

@@ -10,4 +10,4 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
 			  netlist.h procopenfiles.h open.h
 
-noinst_HEADERS		= error.h write.h read_data.h read.h
+noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h

include/glibtop/glibtop-server.h

@@ -36,11 +36,6 @@ typedef struct _glibtop_server_info	glibtop_server_info;
 
 typedef struct _glibtop_closure		glibtop_closure;
 
-typedef int (*glibtop_init_func_t)	(glibtop_server *, glibtop_closure *);
-
-extern glibtop_init_func_t		_glibtop_init_hook_s [];
-extern glibtop_init_func_t		_glibtop_init_hook_p [];
-
 struct _glibtop_server_info
 {
     int ncpu;			/* Number of CPUs, zero if single-processor */

include/glibtop/init_hooks.h

@@ -0,0 +1,11 @@
+#ifndef H_LIBGTOP_INIT_HOOKS_1122955666
+#define H_LIBGTOP_INIT_HOOKS_1122955666
+
+#include <glibtop.h>
+
+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[];
+
+#endif /* H_LIBGTOP_INIT_HOOKS_1122955666 */

include/glibtop/sysdeps.h

@@ -58,10 +58,6 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
-typedef void (*glibtop_init_func_t) (glibtop *);
-extern glibtop_init_func_t _glibtop_init_hook_s [];
-extern glibtop_init_func_t _glibtop_init_hook_p [];
-
 typedef struct _glibtop_sysdeps	glibtop_sysdeps;
 
 struct _glibtop_sysdeps

lib/init.c

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

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

po/ChangeLog

@@ -1,3 +1,12 @@
+2005-08-02  Dave Neary  <bolsh@gimp.org>
+
+	* tr.po: Fix a C formatting string translation.
+
+2005-06-28  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
 2005-07-04  Hendrik Richter  <hendi@gnome-de.org>
 
 	* de.po: Fixed German translation by

po/bg.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 16:26+0300\n"
-"PO-Revision-Date: 2005-06-15 16:28+0300\n"
+"POT-Creation-Date: 2005-07-28 14:05+0300\n"
+"PO-Revision-Date: 2005-07-28 14:04+0300\n"
 "Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
@@ -33,8 +33,8 @@ msgstr "размер прочетени данни"
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "прочетен %d байт данни"
-msgstr[1] "прочетени %d байта данни"
+msgstr[0] "прочетен %lu байт данни"
+msgstr[1] "прочетени %lu байта данни"
 
 #: ../lib/write.c:52
 #, c-format

po/tr.po

@@ -32,8 +32,8 @@ msgstr "okunan veri miktarı"
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "%d bayt oku"
-msgstr[1] "%d bayt oku"
+msgstr[0] "%lu bayt oku"
+msgstr[1] "%lu bayt oku"
 
 #: lib/write.c:52
 #, c-format

sysdeps/aix/open.c

@@ -26,7 +26,7 @@
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/open.h>
-
+#include <glibtop/init_hooks.h>
 #include "glibtop_suid.h"
 
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
@@ -35,7 +35,7 @@ void
 glibtop_init_p (glibtop *server, const unsigned long features,
                 const unsigned flags)
 {
-	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/common/sysdeps_suid.c

@@ -25,8 +25,9 @@
 #include <glibtop/open.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
+#include <glibtop/init_hooks.h>
 
-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
@@ -84,6 +85,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

sysdeps/freebsd/open.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/init_hooks.h>
 
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
 
@@ -30,7 +31,7 @@ void
 glibtop_init_p (glibtop *server, const unsigned long features,
 		const unsigned flags)
 {
-	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/linux/ChangeLog

@@ -1,3 +1,22 @@
+2005-08-04  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* open.c: (set_linux_version), (glibtop_open_s):
+
+	Reworked a bit.
+	Warn on 2.6 without /sys.
+
+2005-08-03  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* netload.c: (glibtop_get_netload_s):
+
+	Fixed for people running 2.6 without /sys.
+
+2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* glibtop_server.h:
+
+	Added GLIBTOP_SUID_NETLIST.
+
 2005-07-23  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* uptime.c:

sysdeps/linux/glibtop_server.h

@@ -43,6 +43,7 @@
 #define GLIBTOP_SUID_PROC_ARGS		0
 #define GLIBTOP_SUID_PROC_MAP		0
 #define GLIBTOP_SUID_NETLOAD		0
+#define GLIBTOP_SUID_NETLIST		0
 #define GLIBTOP_SUID_PPP		0
 #define GLIBTOP_SUID_PROC_FILE		0
 

sysdeps/linux/netload.c

@@ -540,10 +540,12 @@ glibtop_get_netload_s (glibtop *server, glibtop_netload *buf,
     if (server->os_version_code < LINUX_VERSION_CODE(2, 1, 14)) {
 	linux_2_0_stats(server, buf, interface);
     }
-    else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0)) {
+    else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0)
+	     && g_file_test("/sys", G_FILE_TEST_IS_DIR)) {
 	linux_2_6_stats(server, buf, interface);
     }
-    else if (server->os_version_code > LINUX_VERSION_CODE(2, 4, 0)) {
+    else {
+	/* 2.4 and 2.6 without /sys (?$£Z¥!) */
 	linux_2_4_stats(server, buf, interface);
     }
 

sysdeps/linux/open.c

@@ -24,6 +24,7 @@
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 #include <glibtop/open.h>
+#include <glibtop/error.h>
 
 #include "glibtop_private.h"
 
@@ -33,27 +34,27 @@
  */
 #include <sys/utsname.h>
 
-static unsigned get_linux_version(void) {
-
-    static unsigned linux_version_code = 0;
-
-    if(!linux_version_code) {
+static void set_linux_version(glibtop *server)
+{
 	struct utsname uts;
 	unsigned x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
 
 	if (uname(&uts) == -1) /* failure most likely implies impending death */
-	    exit(1);
+		glibtop_error_r(server, "uname() failed");
 
 	if (sscanf(uts.release, "%u.%u.%u", &x, &y, &z) < 3)
-	    fprintf(stderr, /* *very* unlikely to happen by accident */
-		    "Non-standard uts for running kernel:\n"
-		    "release %s=%u.%u.%u gives version code %d\n",
-		    uts.release, x, y, z, LINUX_VERSION_CODE(x,y,z));
+		glibtop_warn_r(server,
+			       "Non-standard uts for running kernel:\n"
+			       "release %s=%u.%u.%u gives version code %d\n",
+			       uts.release, x, y, z, LINUX_VERSION_CODE(x,y,z));
 
-	linux_version_code = LINUX_VERSION_CODE(x, y, z);
-    }
+	if (LINUX_VERSION_CODE(x, y, z) >= LINUX_VERSION_CODE(2, 6, 0)
+	    && !g_file_test("/sys", G_FILE_TEST_IS_DIR))
+		glibtop_warn_r(server,
+			       "You're running a 2.6 kernel without /sys."
+			       "You should mount it.");
 
-    return linux_version_code;
+    server->os_version_code = LINUX_VERSION_CODE(x, y, z);
 }
 
 /* ======================================================= */
@@ -71,7 +72,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
 
 	server->name = program_name;
 
-	server->os_version_code = get_linux_version();
+	set_linux_version(server);
 
 	file_to_buffer(server, buffer, FILENAME);
 

sysdeps/osf1/open_suid.c

@@ -23,7 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
-
+#include <glibtop/init_hooks.h>
 #include <glibtop_suid.h>
 
 #include <unistd.h>
@@ -35,7 +35,7 @@ void
 glibtop_init_p (glibtop *server, const unsigned long features,
 		const unsigned flags)
 {
-	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/solaris/open_suid.c

@@ -23,7 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
-
+#include <glibtop/init_hooks.h>
 #include <glibtop_suid.h>
 
 #include <unistd.h>
@@ -35,7 +35,7 @@ void
 glibtop_init_p (glibtop *server, const unsigned long features,
 		const unsigned flags)
 {
-	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/stub_suid/open.c

@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/init_hooks.h>
 
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
 
@@ -30,7 +31,7 @@ void
 glibtop_init_p (glibtop *server, const unsigned long features,
 		const unsigned flags)
 {
-	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)");