From 95b9d824ea1ebd717e1acabec6c0b8745a805cad Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Thu, 28 May 1998 19:24:24 +0000 Subject: [PATCH] renamed all functions implementing features to '__s'. * sysdeps/linux/*.c: renamed all functions implementing features to '__s'. --- sysdeps/linux/cpu.c | 2 +- sysdeps/linux/glibtop_server.h | 46 ++++++++++++++++++++++++++++++++++ sysdeps/linux/loadavg.c | 2 +- sysdeps/linux/mem.c | 2 +- sysdeps/linux/msg_limits.c | 2 +- sysdeps/linux/procdata.c | 2 +- sysdeps/linux/prockernel.c | 2 +- sysdeps/linux/proclist.c | 2 +- sysdeps/linux/procmem.c | 2 +- sysdeps/linux/procsegment.c | 2 +- sysdeps/linux/procsignal.c | 2 +- sysdeps/linux/procstate.c | 2 +- sysdeps/linux/proctime.c | 2 +- sysdeps/linux/procuid.c | 2 +- sysdeps/linux/sem_limits.c | 2 +- sysdeps/linux/shm_limits.c | 2 +- sysdeps/linux/swap.c | 2 +- sysdeps/linux/uptime.c | 2 +- 18 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 sysdeps/linux/glibtop_server.h diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c index 224ab06b..9f009092 100644 --- a/sysdeps/linux/cpu.c +++ b/sysdeps/linux/cpu.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_cpu = /* Provides information about cpu usage. */ void -glibtop_get_cpu__r (glibtop *server, glibtop_cpu *buf) +glibtop_get_cpu__s (glibtop *server, glibtop_cpu *buf) { FILE *f; diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h new file mode 100644 index 00000000..52b1b3c0 --- /dev/null +++ b/sysdeps/linux/glibtop_server.h @@ -0,0 +1,46 @@ +/* $Id$ */ + +/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the Gnome Top Library. + Contributed by Martin Baulig , April 1998. + + The Gnome Top Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The Gnome Top Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef __GLIBTOP_SERVER_H__ +#define __GLIBTOP_SERVER_H__ + +__BEGIN_DECLS + +#define GLIBTOP_SUID_CPU 0 +#define GLIBTOP_SUID_MEM 0 +#define GLIBTOP_SUID_SWAP 0 +#define GLIBTOP_SUID_UPTIME 0 +#define GLIBTOP_SUID_LOADAVG 0 +#define GLIBTOP_SUID_SHM_LIMITS 0 +#define GLIBTOP_SUID_MSG_LIMITS 0 +#define GLIBTOP_SUID_SEM_LIMITS 0 +#define GLIBTOP_SUID_PROCLIST 0 +#define GLIBTOP_SUID_PROC_STATE 0 +#define GLIBTOP_SUID_PROC_UID 0 +#define GLIBTOP_SUID_PROC_MEM 0 +#define GLIBTOP_SUID_PROC_TIME 0 +#define GLIBTOP_SUID_PROC_SIGNAL 0 +#define GLIBTOP_SUID_PROC_KERNEL 0 +#define GLIBTOP_SUID_PROC_SEGMENT 0 + +__END_DECLS + +#endif diff --git a/sysdeps/linux/loadavg.c b/sysdeps/linux/loadavg.c index 8401247c..2b759b0f 100644 --- a/sysdeps/linux/loadavg.c +++ b/sysdeps/linux/loadavg.c @@ -28,7 +28,7 @@ static const unsigned long _glibtop_sysdeps_loadavg = /* Provides load load averange. */ void -glibtop_get_loadavg__r (glibtop *server, glibtop_loadavg *buf) +glibtop_get_loadavg__s (glibtop *server, glibtop_loadavg *buf) { FILE *f; diff --git a/sysdeps/linux/mem.c b/sysdeps/linux/mem.c index 80d2ccc3..22a8b192 100644 --- a/sysdeps/linux/mem.c +++ b/sysdeps/linux/mem.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_mem = /* Provides information about memory usage. */ void -glibtop_get_mem__r (glibtop *server, glibtop_mem *buf) +glibtop_get_mem__s (glibtop *server, glibtop_mem *buf) { FILE *f; diff --git a/sysdeps/linux/msg_limits.c b/sysdeps/linux/msg_limits.c index 997551af..43b24407 100644 --- a/sysdeps/linux/msg_limits.c +++ b/sysdeps/linux/msg_limits.c @@ -33,7 +33,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits = /* Provides information about sysv ipc limits. */ void -glibtop_get_msg_limits__r (glibtop *server, glibtop_msg_limits *buf) +glibtop_get_msg_limits__s (glibtop *server, glibtop_msg_limits *buf) { struct msginfo msginfo; diff --git a/sysdeps/linux/procdata.c b/sysdeps/linux/procdata.c index 3fc01fb3..1c9f9cf1 100644 --- a/sysdeps/linux/procdata.c +++ b/sysdeps/linux/procdata.c @@ -78,7 +78,7 @@ BIT_SHIFT(GLIBTOP_PROCDATA_WCHAN); /* Provides detailed information about a process. */ void -glibtop_get_procdata__r (glibtop *server, glibtop_procdata *buf, pid_t pid) +glibtop_get_procdata__s (glibtop *server, glibtop_procdata *buf, pid_t pid) { char input [BUFSIZ], *tmp; struct stat statb; diff --git a/sysdeps/linux/prockernel.c b/sysdeps/linux/prockernel.c index 0bd13c3f..5f6cba72 100644 --- a/sysdeps/linux/prockernel.c +++ b/sysdeps/linux/prockernel.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_kernel = /* Provides detailed information about a process. */ void -glibtop_get_proc_kernel__r (glibtop *server, glibtop_proc_kernel *buf, pid_t pid) +glibtop_get_proc_kernel__s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid) { char input [BUFSIZ], *tmp; int nread; diff --git a/sysdeps/linux/proclist.c b/sysdeps/linux/proclist.c index 39070689..93f79e34 100644 --- a/sysdeps/linux/proclist.c +++ b/sysdeps/linux/proclist.c @@ -49,7 +49,7 @@ static const unsigned long _glibtop_sysdeps_proclist = * On error, NULL is returned and buf->flags is zero. */ unsigned * -glibtop_get_proclist__r (glibtop *server, glibtop_proclist *buf) +glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf) { DIR *proc; struct dirent *entry; diff --git a/sysdeps/linux/procmem.c b/sysdeps/linux/procmem.c index 09a2fe83..727565e6 100644 --- a/sysdeps/linux/procmem.c +++ b/sysdeps/linux/procmem.c @@ -30,7 +30,7 @@ static const unsigned long _glibtop_sysdeps_proc_mem = /* Provides detailed information about a process. */ void -glibtop_get_proc_mem__r (glibtop *server, glibtop_proc_mem *buf, pid_t pid) +glibtop_get_proc_mem__s (glibtop *server, glibtop_proc_mem *buf, pid_t pid) { char input [BUFSIZ], *tmp; int nread; diff --git a/sysdeps/linux/procsegment.c b/sysdeps/linux/procsegment.c index 479d98e4..70fd131d 100644 --- a/sysdeps/linux/procsegment.c +++ b/sysdeps/linux/procsegment.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_segment = /* Provides detailed information about a process. */ void -glibtop_get_proc_segment__r (glibtop *server, glibtop_proc_segment *buf, +glibtop_get_proc_segment__s (glibtop *server, glibtop_proc_segment *buf, pid_t pid) { char input [BUFSIZ], *tmp; diff --git a/sysdeps/linux/procsignal.c b/sysdeps/linux/procsignal.c index 9bf32b26..0e978eef 100644 --- a/sysdeps/linux/procsignal.c +++ b/sysdeps/linux/procsignal.c @@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_proc_signal = /* Provides detailed information about a process. */ void -glibtop_get_proc_signal__r (glibtop *server, glibtop_proc_signal *buf, pid_t pid) +glibtop_get_proc_signal__s (glibtop *server, glibtop_proc_signal *buf, pid_t pid) { char input [BUFSIZ], *tmp; int nread; diff --git a/sysdeps/linux/procstate.c b/sysdeps/linux/procstate.c index 76252ba9..5a423622 100644 --- a/sysdeps/linux/procstate.c +++ b/sysdeps/linux/procstate.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_state = /* Provides detailed information about a process. */ void -glibtop_get_proc_state__r (glibtop *server, glibtop_proc_state *buf, pid_t pid) +glibtop_get_proc_state__s (glibtop *server, glibtop_proc_state *buf, pid_t pid) { char input [BUFSIZ], *tmp; struct stat statb; diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c index 7c5dbc21..01c8bf43 100644 --- a/sysdeps/linux/proctime.c +++ b/sysdeps/linux/proctime.c @@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_proc_time = /* Provides detailed information about a process. */ void -glibtop_get_proc_time__r (glibtop *server, glibtop_proc_time *buf, pid_t pid) +glibtop_get_proc_time__s (glibtop *server, glibtop_proc_time *buf, pid_t pid) { char input [BUFSIZ], *tmp; int nread; diff --git a/sysdeps/linux/procuid.c b/sysdeps/linux/procuid.c index d2ebddc3..f3d5b8f5 100644 --- a/sysdeps/linux/procuid.c +++ b/sysdeps/linux/procuid.c @@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid = /* Provides detailed information about a process. */ void -glibtop_get_proc_uid__r (glibtop *server, glibtop_proc_uid *buf, pid_t pid) +glibtop_get_proc_uid__s (glibtop *server, glibtop_proc_uid *buf, pid_t pid) { char input [BUFSIZ], *tmp; int nread; diff --git a/sysdeps/linux/sem_limits.c b/sysdeps/linux/sem_limits.c index 05d00a2d..fda5c0e5 100644 --- a/sysdeps/linux/sem_limits.c +++ b/sysdeps/linux/sem_limits.c @@ -34,7 +34,7 @@ static unsigned long _glibtop_sysdeps_sem_limits = /* Provides information about sysv ipc limits. */ void -glibtop_get_sem_limits__r (glibtop *server, glibtop_sem_limits *buf) +glibtop_get_sem_limits__s (glibtop *server, glibtop_sem_limits *buf) { struct seminfo seminfo; union semun arg; diff --git a/sysdeps/linux/shm_limits.c b/sysdeps/linux/shm_limits.c index 07a78bc7..d3c3193a 100644 --- a/sysdeps/linux/shm_limits.c +++ b/sysdeps/linux/shm_limits.c @@ -32,7 +32,7 @@ static unsigned long _glibtop_sysdeps_shm_limits = /* Provides information about sysv ipc limits. */ void -glibtop_get_shm_limits__r (glibtop *server, glibtop_shm_limits *buf) +glibtop_get_shm_limits__s (glibtop *server, glibtop_shm_limits *buf) { struct shminfo shminfo; diff --git a/sysdeps/linux/swap.c b/sysdeps/linux/swap.c index 90572687..8fb5e41e 100644 --- a/sysdeps/linux/swap.c +++ b/sysdeps/linux/swap.c @@ -29,7 +29,7 @@ static unsigned long _glibtop_sysdeps_swap = /* Provides information about swap usage. */ void -glibtop_get_swap__r (glibtop *server, glibtop_swap *buf) +glibtop_get_swap__s (glibtop *server, glibtop_swap *buf) { FILE *f; diff --git a/sysdeps/linux/uptime.c b/sysdeps/linux/uptime.c index 4dabf7be..69f5b6b5 100644 --- a/sysdeps/linux/uptime.c +++ b/sysdeps/linux/uptime.c @@ -28,7 +28,7 @@ static unsigned long _glibtop_sysdeps_uptime = /* Provides uptime and idle time. */ void -glibtop_get_uptime__r (glibtop *server, glibtop_uptime *buf) +glibtop_get_uptime__s (glibtop *server, glibtop_uptime *buf) { FILE *f;