From 7b30b1ec86c2b75c51af53c2e7e27a845ed91e88 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Thu, 24 Feb 2000 12:48:55 +0000 Subject: [PATCH] Applied a patch from Aron Griffis . 2000-02-24 Martin Baulig Applied a patch from Aron Griffis . * glibtop_machine.h: Don't declare table () here. * netinfo.c: Reflect latest interface changes. --- sysdeps/osf1/ChangeLog | 7 +++++++ sysdeps/osf1/glibtop_machine.h | 2 -- sysdeps/osf1/glibtop_suid.h | 4 ++-- sysdeps/osf1/netinfo.c | 9 ++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sysdeps/osf1/ChangeLog b/sysdeps/osf1/ChangeLog index 97619244..d4206564 100644 --- a/sysdeps/osf1/ChangeLog +++ b/sysdeps/osf1/ChangeLog @@ -1,3 +1,10 @@ +2000-02-24 Martin Baulig + + Applied a patch from Aron Griffis . + + * glibtop_machine.h: Don't declare table () here. + * netinfo.c: Reflect latest interface changes. + 1999-05-11 Martin Baulig * procstate.c: Fixed implementation of the `state' field; added diff --git a/sysdeps/osf1/glibtop_machine.h b/sysdeps/osf1/glibtop_machine.h index 901a5216..f8d26de9 100644 --- a/sysdeps/osf1/glibtop_machine.h +++ b/sysdeps/osf1/glibtop_machine.h @@ -36,8 +36,6 @@ BEGIN_LIBGTOP_DECLS -int table (int id, int index, char *addr, int nel, u_int lel); - typedef struct _glibtop_machine glibtop_machine; struct _glibtop_machine diff --git a/sysdeps/osf1/glibtop_suid.h b/sysdeps/osf1/glibtop_suid.h index 7a06aedb..451e959f 100644 --- a/sysdeps/osf1/glibtop_suid.h +++ b/sysdeps/osf1/glibtop_suid.h @@ -32,12 +32,12 @@ BEGIN_LIBGTOP_DECLS static inline void glibtop_suid_enter (glibtop *server) { setreuid (server->_priv->machine.uid, server->_priv->machine.euid); -}; +} static inline void glibtop_suid_leave (glibtop *server) { if (setreuid (server->_priv->machine.euid, server->_priv->machine.uid)) _exit (1); -}; +} void glibtop_init_p (glibtop *server, const unsigned long features, diff --git a/sysdeps/osf1/netinfo.c b/sysdeps/osf1/netinfo.c index ffb19d67..6747a4bb 100644 --- a/sysdeps/osf1/netinfo.c +++ b/sysdeps/osf1/netinfo.c @@ -43,9 +43,12 @@ glibtop_init_netinfo_p (glibtop *server) /* Provides Network statistics. */ -int -glibtop_get_netinfo_p (glibtop *server, glibtop_netinfo *buf, - const char *interface, unsigned transport) +glibtop_ifaddr * +glibtop_get_netinfo_p (glibtop *server, + glibtop_array *array, + glibtop_netinfo *buf, + const char *interface, + u_int64_t transport) { glibtop_init_p (server, GLIBTOP_SYSDEPS_NETINFO, 0);