This is a very big an possibly breaking commit.
It changes the return values of all sysdeps functions which were previosly returning void to int. This is the first step to implement better error handling in LibGTop. Martin 1999-10-24 Martin Baulig <martin@home-of-linux.org> * include/glibtop/*.h (glibtop_get_*, glibtop_init*): Changed the return value of all `glibtop_get_<feature>_* ()' and all `glibtop_init_<feature>_* ()' functions from void to int. * features.def: Reflect changes of the return values. * sysdeps/*/*.c: Reflect changes of the return values.
This commit is contained in:
committed by
Martin Baulig
parent
eae892c9b1
commit
a5dd7e9063
@@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_cpu =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_cpu_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.cpu = _glibtop_sysdeps_cpu;
|
||||
@@ -47,7 +47,7 @@ glibtop_init_cpu_s (glibtop *server)
|
||||
|
||||
/* Provides information about cpu usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
|
||||
{
|
||||
kstat_ctl_t *kc = server->machine.kc;
|
||||
|
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_loadavg =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_loadavg_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
|
||||
@@ -45,7 +45,7 @@ glibtop_init_loadavg_s (glibtop *server)
|
||||
|
||||
/* Provides load average. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
|
||||
{
|
||||
#ifndef HAVE_GETLOADAVG
|
||||
|
@@ -40,7 +40,7 @@ static const unsigned long _glibtop_sysdeps_mem_bunyip =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_mem_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.mem = _glibtop_sysdeps_mem_os_sysconf +
|
||||
@@ -49,7 +49,7 @@ glibtop_init_mem_s (glibtop *server)
|
||||
|
||||
/* Provides information about memory usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
{
|
||||
kstat_ctl_t *kc = server->machine.kc;
|
||||
|
@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_msg_limits_p (glibtop *server)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
@@ -49,7 +49,7 @@ glibtop_init_msg_limits_p (glibtop *server)
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
|
@@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_netload_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.netload = _glibtop_sysdeps_netload;
|
||||
@@ -37,7 +37,7 @@ glibtop_init_netload_s (glibtop *server)
|
||||
|
||||
/* Provides network statistics. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_netload_s (glibtop *server, glibtop_netload *buf,
|
||||
const char *interface)
|
||||
{
|
||||
|
@@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_ppp = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_ppp_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.ppp = _glibtop_sysdeps_ppp;
|
||||
@@ -37,7 +37,7 @@ glibtop_init_ppp_s (glibtop *server)
|
||||
|
||||
/* Provides PPP/ISDN information. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device)
|
||||
{
|
||||
memset (buf, 0, sizeof (glibtop_ppp));
|
||||
|
@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_args =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_args_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_args = _glibtop_sysdeps_proc_args;
|
||||
|
@@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_kernel_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel;
|
||||
@@ -36,7 +36,7 @@ glibtop_init_proc_kernel_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proclist =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proclist_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proclist = _glibtop_sysdeps_proclist;
|
||||
|
@@ -45,7 +45,7 @@ static const unsigned long _glibtop_sysdeps_map_device =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_map_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
|
||||
|
@@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_mem_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem;
|
||||
@@ -38,7 +38,7 @@ glibtop_init_proc_mem_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
|
||||
{
|
||||
#ifdef HAVE_PROCFS_H
|
||||
|
@@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_segment_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment;
|
||||
@@ -36,7 +36,7 @@ glibtop_init_proc_segment_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_signal_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal;
|
||||
@@ -39,7 +39,7 @@ glibtop_init_proc_signal_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_state =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_state_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_state = _glibtop_sysdeps_proc_state;
|
||||
@@ -45,7 +45,7 @@ glibtop_init_proc_state_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
|
||||
{
|
||||
#ifdef HAVE_PROCFS_H
|
||||
|
@@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_proc_time =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_time_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_time = _glibtop_sysdeps_proc_time;
|
||||
@@ -40,7 +40,7 @@ glibtop_init_proc_time_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid_prcred =
|
||||
(1L << GLIBTOP_PROC_UID_NGROUPS);
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_uid_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid_psinfo +
|
||||
@@ -50,7 +50,7 @@ glibtop_init_proc_uid_s (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
|
||||
{
|
||||
struct prcred prcred;
|
||||
|
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_sem_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_sem_limits_p (glibtop *server)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
@@ -50,7 +50,7 @@ glibtop_init_sem_limits_p (glibtop *server)
|
||||
|
||||
/* Provides information about sysv sem limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
|
@@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_shm_limits_p (glibtop *server)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
@@ -47,7 +47,7 @@ glibtop_init_shm_limits_p (glibtop *server)
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
|
||||
{
|
||||
kvm_t *kd = server->machine.kd;
|
||||
|
@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_swap =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_swap_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.swap = _glibtop_sysdeps_swap;
|
||||
@@ -44,7 +44,7 @@ glibtop_init_swap_s (glibtop *server)
|
||||
|
||||
/* Provides information about swap usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
|
||||
{
|
||||
kstat_ctl_t *kc = server->machine.kc;
|
||||
|
@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_uptime =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_uptime_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.uptime = _glibtop_sysdeps_uptime;
|
||||
@@ -39,7 +39,7 @@ glibtop_init_uptime_s (glibtop *server)
|
||||
|
||||
/* Provides uptime and idle time. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
|
||||
{
|
||||
memset (buf, 0, sizeof (glibtop_uptime));
|
||||
|
Reference in New Issue
Block a user