From 7dd0c2eac345fadf459420615edc62c382e0fd89 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Thu, 28 May 1998 19:22:48 +0000 Subject: [PATCH] renamed all functions that implementing features to '__l'; we only emit * lib/*.c: renamed all functions that implementing features to '__l'; we only emit code for those functions if the corresponding 'GLIBTOP_SUID_' has a positive value. --- lib/command.c | 10 +++++----- lib/cpu.c | 10 ++++++++-- lib/loadavg.c | 9 +++++++-- lib/mem.c | 9 +++++++-- lib/msg_limits.c | 9 +++++++-- lib/open.c | 2 +- lib/prockernel.c | 8 ++++++-- lib/proclist.c | 9 +++++++-- lib/procmem.c | 8 ++++++-- lib/procsegment.c | 8 ++++++-- lib/procsignal.c | 8 ++++++-- lib/procstate.c | 8 ++++++-- lib/proctime.c | 8 ++++++-- lib/procuid.c | 8 ++++++-- lib/read.c | 2 +- lib/read_data.c | 8 +++++--- lib/sem_limits.c | 9 +++++++-- lib/shm_limits.c | 9 +++++++-- lib/swap.c | 9 +++++++-- lib/uptime.c | 9 +++++++-- lib/write.c | 2 +- 21 files changed, 119 insertions(+), 43 deletions(-) diff --git a/lib/command.c b/lib/command.c index 03df4375..eb74183b 100644 --- a/lib/command.c +++ b/lib/command.c @@ -27,7 +27,7 @@ #include void * -glibtop_call__r (glibtop *server, unsigned command, size_t send_size, void *send_buf, +glibtop_call__l (glibtop *server, unsigned command, size_t send_size, void *send_buf, size_t recv_size, void *recv_buf) { glibtop_command *cmnd; @@ -42,11 +42,11 @@ glibtop_call__r (glibtop *server, unsigned command, size_t send_size, void *send cmnd->command = command; cmnd->size = send_size; - glibtop_write__r (server, sizeof (glibtop_command), cmnd); - glibtop_write__r (server, send_size, send_buf); - glibtop_read__r (server, recv_size, recv_buf); + glibtop_write__l (server, sizeof (glibtop_command), cmnd); + glibtop_write__l (server, send_size, send_buf); + glibtop_read__l (server, recv_size, recv_buf); - ptr = glibtop_read_data__r (server); + ptr = glibtop_read_data__l (server); glibtop_free__r (server, cmnd); diff --git a/lib/cpu.c b/lib/cpu.c index 253f1114..04d3bb9d 100644 --- a/lib/cpu.c +++ b/lib/cpu.c @@ -19,14 +19,20 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include +#if GLIBTOP_SUID_CPU + /* Provides information about cpu usage. */ void -glibtop_get_cpu__r (glibtop *server, glibtop_cpu *buf) +glibtop_get_cpu__l (glibtop *server, glibtop_cpu *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_CPU, 0, NULL, sizeof (glibtop_cpu), buf); + glibtop_call__l (server, GLIBTOP_CMND_CPU, 0, NULL, + sizeof (glibtop_cpu), buf); } + +#endif diff --git a/lib/loadavg.c b/lib/loadavg.c index 8671bfe8..7d571218 100644 --- a/lib/loadavg.c +++ b/lib/loadavg.c @@ -23,11 +23,16 @@ #include #include +#if GLIBTOP_SUID_LOADAVG + /* Provides load averange. */ void -glibtop_get_loadavg__r (glibtop *server, glibtop_loadavg *buf) +glibtop_get_loadavg__l (glibtop *server, glibtop_loadavg *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_LOADAVG, 0, NULL, sizeof (glibtop_loadavg), buf); + glibtop_call__l (server, GLIBTOP_CMND_LOADAVG, 0, NULL, + sizeof (glibtop_loadavg), buf); } + +#endif diff --git a/lib/mem.c b/lib/mem.c index ad760c4b..a5dd8a65 100644 --- a/lib/mem.c +++ b/lib/mem.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_MEM + /* Provides information about memory usage. */ void -glibtop_get_mem__r (glibtop *server, glibtop_mem *buf) +glibtop_get_mem__l (glibtop *server, glibtop_mem *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_MEM, 0, NULL, sizeof (glibtop_mem), buf); + glibtop_call__l (server, GLIBTOP_CMND_MEM, 0, NULL, + sizeof (glibtop_mem), buf); } + +#endif diff --git a/lib/msg_limits.c b/lib/msg_limits.c index a8c6760a..176a8a4f 100644 --- a/lib/msg_limits.c +++ b/lib/msg_limits.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_MSG_LIMITS + /* Provides information about sysv ipc limits. */ void -glibtop_get_msg_limits__r (glibtop *server, glibtop_msg_limits *buf) +glibtop_get_msg_limits__l (glibtop *server, glibtop_msg_limits *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_MSG_LIMITS, 0, NULL, sizeof (glibtop_msg_limits), buf); + glibtop_call__l (server, GLIBTOP_CMND_MSG_LIMITS, 0, NULL, + sizeof (glibtop_msg_limits), buf); } + +#endif diff --git a/lib/open.c b/lib/open.c index 7b36a871..ed55b431 100644 --- a/lib/open.c +++ b/lib/open.c @@ -53,7 +53,7 @@ glibtop_open (glibtop *server, const char *program_name) sprintf (version, "%s server %s ready.\n", PACKAGE, VERSION); - glibtop_read__r (server, strlen (version), buffer); + glibtop_read__l (server, strlen (version), buffer); if (memcmp (version, buffer, strlen (version))) glibtop_error__r (server, _("server version is not %s"), VERSION); diff --git a/lib/prockernel.c b/lib/prockernel.c index 9dd9fccb..d93add72 100644 --- a/lib/prockernel.c +++ b/lib/prockernel.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_KERNEL + /* Provides detailed information about a process. */ void -glibtop_get_proc_kernel__r (glibtop *server, glibtop_proc_kernel *buf, +glibtop_get_proc_kernel__l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_KERNEL, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_KERNEL, sizeof (pid_t), &pid, sizeof (glibtop_proc_kernel), buf); } + +#endif diff --git a/lib/proclist.c b/lib/proclist.c index deae7ce2..3c541129 100644 --- a/lib/proclist.c +++ b/lib/proclist.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_PROCLIST + /* Fetch list of currently running processes. */ unsigned * -glibtop_get_proclist__r (glibtop *server, glibtop_proclist *buf) +glibtop_get_proclist__l (glibtop *server, glibtop_proclist *buf) { glibtop_init__r (&server); - return glibtop_call__r (server, GLIBTOP_CMND_PROCLIST, 0, NULL, sizeof (glibtop_proclist), buf); + return glibtop_call__l (server, GLIBTOP_CMND_PROCLIST, 0, NULL, + sizeof (glibtop_proclist), buf); } + +#endif diff --git a/lib/procmem.c b/lib/procmem.c index 5f4e8991..7dd06ba9 100644 --- a/lib/procmem.c +++ b/lib/procmem.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_MEM + /* Provides detailed information about a process. */ void -glibtop_get_proc_mem__r (glibtop *server, glibtop_proc_mem *buf, +glibtop_get_proc_mem__l (glibtop *server, glibtop_proc_mem *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_MEM, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_MEM, sizeof (pid_t), &pid, sizeof (glibtop_proc_mem), buf); } + +#endif diff --git a/lib/procsegment.c b/lib/procsegment.c index ee10a5d8..f144094a 100644 --- a/lib/procsegment.c +++ b/lib/procsegment.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_SEGMENT + /* Provides detailed information about a process. */ void -glibtop_get_proc_segment__r (glibtop *server, glibtop_proc_segment *buf, +glibtop_get_proc_segment__l (glibtop *server, glibtop_proc_segment *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_SEGMENT, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_SEGMENT, sizeof (pid_t), &pid, sizeof (glibtop_proc_segment), buf); } + +#endif diff --git a/lib/procsignal.c b/lib/procsignal.c index d0ae5468..d1ed2dd8 100644 --- a/lib/procsignal.c +++ b/lib/procsignal.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_SIGNAL + /* Provides detailed information about a process. */ void -glibtop_get_proc_signal__r (glibtop *server, glibtop_proc_signal *buf, +glibtop_get_proc_signal__l (glibtop *server, glibtop_proc_signal *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_SIGNAL, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_SIGNAL, sizeof (pid_t), &pid, sizeof (glibtop_proc_signal), buf); } + +#endif diff --git a/lib/procstate.c b/lib/procstate.c index 557bfd85..3c986c3e 100644 --- a/lib/procstate.c +++ b/lib/procstate.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_STATE + /* Provides detailed information about a process. */ void -glibtop_get_proc_state__r (glibtop *server, glibtop_proc_state *buf, +glibtop_get_proc_state__l (glibtop *server, glibtop_proc_state *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_STATE, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_STATE, sizeof (pid_t), &pid, sizeof (glibtop_proc_state), buf); } + +#endif diff --git a/lib/proctime.c b/lib/proctime.c index a6ab8c28..41413cbb 100644 --- a/lib/proctime.c +++ b/lib/proctime.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_TIME + /* Provides detailed information about a process. */ void -glibtop_get_proc_time__r (glibtop *server, glibtop_proc_time *buf, +glibtop_get_proc_time__l (glibtop *server, glibtop_proc_time *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_TIME, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_TIME, sizeof (pid_t), &pid, sizeof (glibtop_proc_time), buf); } + +#endif diff --git a/lib/procuid.c b/lib/procuid.c index 6c06ba19..93e6ada3 100644 --- a/lib/procuid.c +++ b/lib/procuid.c @@ -23,13 +23,17 @@ #include #include +#if GLIBTOP_SUID_PROC_UID + /* Provides detailed information about a process. */ void -glibtop_get_proc_uid__r (glibtop *server, glibtop_proc_uid *buf, +glibtop_get_proc_uid__l (glibtop *server, glibtop_proc_uid *buf, pid_t pid) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_PROC_UID, sizeof (pid_t), + glibtop_call__l (server, GLIBTOP_CMND_PROC_UID, sizeof (pid_t), &pid, sizeof (glibtop_proc_uid), buf); } + +#endif diff --git a/lib/read.c b/lib/read.c index f05a617d..c8ff2eec 100644 --- a/lib/read.c +++ b/lib/read.c @@ -24,7 +24,7 @@ /* Reads some data from server. */ void -glibtop_read__r (glibtop *server, size_t size, void *buf) +glibtop_read__l (glibtop *server, size_t size, void *buf) { size_t ssize; diff --git a/lib/read_data.c b/lib/read_data.c index e6012585..acfe0add 100644 --- a/lib/read_data.c +++ b/lib/read_data.c @@ -25,7 +25,7 @@ /* Reads some data from server. */ void * -glibtop_read_data__r (glibtop *server) +glibtop_read_data__l (glibtop *server) { size_t size; void *ptr; @@ -33,7 +33,8 @@ glibtop_read_data__r (glibtop *server) glibtop_init__r (&server); if (read (server->input [0], &size, sizeof (size_t)) < 0) - glibtop_error__r (server, _("read data size: %s"), strerror (errno)); + glibtop_error__r (server, _("read data size: %s"), + strerror (errno)); if (!size) return NULL; @@ -42,7 +43,8 @@ glibtop_read_data__r (glibtop *server) ptr = glibtop_malloc__r (server, size); if (read (server->input [0], ptr, size) < 0) - glibtop_error__r (server, _("read data %d bytes: %s"), size, strerror (errno)); + glibtop_error__r (server, _("read data %d bytes: %s"), + size, strerror (errno)); return ptr; } diff --git a/lib/sem_limits.c b/lib/sem_limits.c index 2be994e9..2ce853a3 100644 --- a/lib/sem_limits.c +++ b/lib/sem_limits.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_SEM_LIMITS + /* Provides information about sysv ipc limits. */ void -glibtop_get_sem_limits__r (glibtop *server, glibtop_sem_limits *buf) +glibtop_get_sem_limits__l (glibtop *server, glibtop_sem_limits *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_SEM_LIMITS, 0, NULL, sizeof (glibtop_sem_limits), buf); + glibtop_call__l (server, GLIBTOP_CMND_SEM_LIMITS, 0, NULL, + sizeof (glibtop_sem_limits), buf); } + +#endif diff --git a/lib/shm_limits.c b/lib/shm_limits.c index 24e3447d..9d3aee22 100644 --- a/lib/shm_limits.c +++ b/lib/shm_limits.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_SHM_LIMITS + /* Provides information about sysv ipc limits. */ void -glibtop_get_shm_limits__r (glibtop *server, glibtop_shm_limits *buf) +glibtop_get_shm_limits__l (glibtop *server, glibtop_shm_limits *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_SHM_LIMITS, 0, NULL, sizeof (glibtop_shm_limits), buf); + glibtop_call__l (server, GLIBTOP_CMND_SHM_LIMITS, 0, NULL, + sizeof (glibtop_shm_limits), buf); } + +#endif diff --git a/lib/swap.c b/lib/swap.c index 2a88bc30..e4972869 100644 --- a/lib/swap.c +++ b/lib/swap.c @@ -22,11 +22,16 @@ #include #include +#if GLIBTOP_SUID_SWAP + /* Provides information about swap usage. */ void -glibtop_get_swap__r (glibtop *server, glibtop_swap *buf) +glibtop_get_swap__l (glibtop *server, glibtop_swap *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_SWAP, 0, NULL, sizeof (glibtop_swap), buf); + glibtop_call__l (server, GLIBTOP_CMND_SWAP, 0, NULL, + sizeof (glibtop_swap), buf); } + +#endif diff --git a/lib/uptime.c b/lib/uptime.c index 9a316433..597a50b8 100644 --- a/lib/uptime.c +++ b/lib/uptime.c @@ -23,11 +23,16 @@ #include #include +#if GLIBTOP_SUID_UPTIME + /* Provides uptime and idle time. */ void -glibtop_get_uptime__r (glibtop *server, glibtop_uptime *buf) +glibtop_get_uptime__l (glibtop *server, glibtop_uptime *buf) { glibtop_init__r (&server); - glibtop_call__r (server, GLIBTOP_CMND_UPTIME, 0, NULL, sizeof (glibtop_uptime), buf); + glibtop_call__l (server, GLIBTOP_CMND_UPTIME, 0, NULL, + sizeof (glibtop_uptime), buf); } + +#endif diff --git a/lib/write.c b/lib/write.c index 93b7581a..2d3984d0 100644 --- a/lib/write.c +++ b/lib/write.c @@ -24,7 +24,7 @@ /* Writes some data to server. */ void -glibtop_write__r (glibtop *server, size_t size, void *buf) +glibtop_write__l (glibtop *server, size_t size, void *buf) { glibtop_init__r (&server);