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
@@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_cpu =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_cpu_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.cpu = _glibtop_sysdeps_cpu;
|
||||
@@ -40,7 +40,7 @@ glibtop_init_cpu_s (glibtop *server)
|
||||
|
||||
/* Provides information about cpu usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
|
||||
{
|
||||
struct tbl_sysinfo sysinfo;
|
||||
|
@@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_loadavg =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_loadavg_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
|
||||
@@ -38,7 +38,7 @@ glibtop_init_loadavg_s (glibtop *server)
|
||||
|
||||
/* Provides load averange. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
|
||||
{
|
||||
struct tbl_loadavg loadavg;
|
||||
|
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_mem =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_mem_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.mem = _glibtop_sysdeps_mem;
|
||||
@@ -45,7 +45,7 @@ glibtop_init_mem_s (glibtop *server)
|
||||
|
||||
/* Provides information about memory usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
{
|
||||
vm_statistics_data_t vmstats;
|
||||
|
@@ -32,7 +32,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_msg_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits;
|
||||
@@ -40,7 +40,7 @@ glibtop_init_msg_limits_s (glibtop *server)
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
|
||||
{
|
||||
int ret, value;
|
||||
|
@@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_netload = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_netload_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.netload = _glibtop_sysdeps_netload;
|
||||
@@ -37,7 +37,7 @@ glibtop_init_netload_p (glibtop *server)
|
||||
|
||||
/* Provides Network statistics. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_netload_p (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));
|
||||
|
@@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_args = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_args_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_args = _glibtop_sysdeps_proc_args;
|
||||
|
@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_kernel_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel;
|
||||
@@ -39,7 +39,7 @@ glibtop_init_proc_kernel_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_proclist =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proclist_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proclist = _glibtop_sysdeps_proclist;
|
||||
|
@@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_map = 0;
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_map_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
|
||||
|
@@ -41,7 +41,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_mem_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem;
|
||||
@@ -49,7 +49,7 @@ glibtop_init_proc_mem_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_segment_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment;
|
||||
@@ -45,7 +45,7 @@ glibtop_init_proc_segment_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_signal_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal;
|
||||
@@ -41,7 +41,7 @@ glibtop_init_proc_signal_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -38,7 +38,7 @@ static const unsigned long _glibtop_sysdeps_proc_state =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_state_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_state = _glibtop_sysdeps_proc_state;
|
||||
@@ -46,7 +46,7 @@ glibtop_init_proc_state_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_proc_time =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_time_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_time = _glibtop_sysdeps_proc_time;
|
||||
@@ -44,7 +44,7 @@ glibtop_init_proc_time_p (glibtop *server)
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -44,13 +44,13 @@ static const unsigned long _glibtop_sysdeps_proc_uid =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_proc_uid_p (glibtop *server)
|
||||
{
|
||||
server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid;
|
||||
}
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
|
@@ -32,7 +32,7 @@ static unsigned long _glibtop_sysdeps_sem_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_sem_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits;
|
||||
@@ -40,7 +40,7 @@ glibtop_init_sem_limits_s (glibtop *server)
|
||||
|
||||
/* Provides information about sysv sem limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
|
||||
{
|
||||
int ret, value;
|
||||
|
@@ -31,7 +31,7 @@ static unsigned long _glibtop_sysdeps_shm_limits =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_shm_limits_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits;
|
||||
@@ -39,7 +39,7 @@ glibtop_init_shm_limits_s (glibtop *server)
|
||||
|
||||
/* Provides information about sysv ipc limits. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
|
||||
{
|
||||
int ret, value;
|
||||
|
@@ -31,7 +31,7 @@ static unsigned long _glibtop_sysdeps_swap =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_swap_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.swap = _glibtop_sysdeps_swap;
|
||||
@@ -39,7 +39,7 @@ glibtop_init_swap_s (glibtop *server)
|
||||
|
||||
/* Provides information about swap usage. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
|
||||
{
|
||||
struct tbl_swapinfo swapinfo;
|
||||
|
@@ -32,7 +32,7 @@ static unsigned long _glibtop_sysdeps_uptime =
|
||||
|
||||
/* Init function. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_init_uptime_s (glibtop *server)
|
||||
{
|
||||
server->sysdeps.uptime = _glibtop_sysdeps_uptime;
|
||||
@@ -40,7 +40,7 @@ glibtop_init_uptime_s (glibtop *server)
|
||||
|
||||
/* Provides uptime and idle time. */
|
||||
|
||||
void
|
||||
int
|
||||
glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
|
||||
{
|
||||
struct tbl_sysinfo sysinfo;
|
||||
|
Reference in New Issue
Block a user