From 62dda3b78280719d39640db4972706bba8740695 Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@src.gnome.org>
Date: Thu, 28 May 1998 19:19:49 +0000
Subject: [PATCH] added some new function suffixes: '__l' is a function defined
 in the

* sysdeps/linux/*.h: added some new function suffixes:
'__l' is a function defined in the client part;
'__s' is a function defined in the sysdeps part and
'__p' is a function that needs special priviledges.
'__r' is mapped either on '__l' or on '__s'.

* sysdeps/linux/glibtop_server.h: New file -
defines system dependent constants 'GLIBTOP_SUID_<feature>'
being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
whether or not this feature requires using the server.

Things may now temporarily get instable; I'm currently implementing some
suggestions Sebastian Wilhelmi has made.
---
 include/glibtop/command.h     |  3 ++-
 include/glibtop/cpu.h         | 13 ++++++++++++-
 include/glibtop/loadavg.h     | 13 ++++++++++++-
 include/glibtop/mem.h         | 13 ++++++++++++-
 include/glibtop/msg_limits.h  | 13 ++++++++++++-
 include/glibtop/prockernel.h  | 13 ++++++++++++-
 include/glibtop/proclist.h    | 13 ++++++++++++-
 include/glibtop/procmem.h     | 13 ++++++++++++-
 include/glibtop/procsegment.h | 13 ++++++++++++-
 include/glibtop/procsignal.h  | 13 ++++++++++++-
 include/glibtop/procstate.h   | 13 ++++++++++++-
 include/glibtop/proctime.h    | 13 ++++++++++++-
 include/glibtop/procuid.h     | 13 ++++++++++++-
 include/glibtop/read.h        |  3 ++-
 include/glibtop/read_data.h   |  3 ++-
 include/glibtop/sem_limits.h  | 13 ++++++++++++-
 include/glibtop/shm_limits.h  | 13 ++++++++++++-
 include/glibtop/swap.h        | 13 ++++++++++++-
 include/glibtop/uptime.h      | 13 ++++++++++++-
 include/glibtop/write.h       |  3 ++-
 20 files changed, 200 insertions(+), 20 deletions(-)

diff --git a/include/glibtop/command.h b/include/glibtop/command.h
index 2afcd582..c57d2373 100644
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -60,7 +60,8 @@ struct _glibtop_command
 
 #define glibtop_call(p1, p2, p3, p4)	glibtop_call__r(glibtop_global_server, p1, p2, p3, p4)
 
-extern void *glibtop_call__r __P((glibtop *, unsigned, size_t, void *, size_t, void *));
+extern void *glibtop_call__l __P((glibtop *, unsigned, size_t, void *, size_t, void *));
+extern void *glibtop_call__s __P((glibtop *, unsigned, size_t, void *, size_t, void *));
 
 __END_DECLS
 
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
index 0d1b77ec..80b04348 100644
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -51,7 +51,18 @@ struct _glibtop_cpu
 
 #define glibtop_get_cpu(cpu)	glibtop_get_cpu__r(glibtop_global_server, cpu)
 
-extern void glibtop_get_cpu__r __P((glibtop *, glibtop_cpu *));
+#if GLIBTOP_SUID_CPU
+#define glibtop_get_cpu__r	glibtop_get_cpu__l
+#else
+#define glibtop_get_cpu__r	glibtop_get_cpu__s
+#endif
+
+#if GLIBTOP_SUID_CPU
+extern void glibtop_get_cpu__l __P((glibtop *, glibtop_cpu *));
+extern void glibtop_get_cpu__p __P((glibtop *, glibtop_cpu *));
+#else
+extern void glibtop_get_cpu__s __P((glibtop *, glibtop_cpu *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h
index d33b589c..dd30d432 100644
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -41,7 +41,18 @@ struct _glibtop_loadavg
 
 #define glibtop_get_loadavg(loadavg)	glibtop_get_loadavg__r(glibtop_global_server, loadavg)
 
-extern void glibtop_get_loadavg__r __P((glibtop *, glibtop_loadavg *));
+#if GLIBTOP_SUID_LOADAVG
+#define glibtop_get_loadavg__r		glibtop_get_loadavg__l
+#else
+#define glibtop_get_loadavg__r		glibtop_get_loadavg__s
+#endif
+
+#if GLIBTOP_SUID_LOADAVG
+extern void glibtop_get_loadavg__l __P((glibtop *, glibtop_loadavg *));
+extern void glibtop_get_loadavg__p __P((glibtop *, glibtop_loadavg *));
+#else
+extern void glibtop_get_loadavg__s __P((glibtop *, glibtop_loadavg *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h
index 220bebbc..5b35344a 100644
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -55,7 +55,18 @@ struct _glibtop_mem
 
 #define glibtop_get_mem(mem)	glibtop_get_mem__r(glibtop_global_server, mem)
 
-extern void glibtop_get_mem__r __P((glibtop *, glibtop_mem *));
+#if GLIBTOP_SUID_MEM
+#define glibtop_get_mem__r		glibtop_get_mem__l
+#else
+#define glibtop_get_mem__r		glibtop_get_mem__s
+#endif
+
+#if GLIBTOP_SUID_MEM
+extern void glibtop_get_mem__l __P((glibtop *, glibtop_mem *));
+extern void glibtop_get_mem__p __P((glibtop *, glibtop_mem *));
+#else
+extern void glibtop_get_mem__s __P((glibtop *, glibtop_mem *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h
index a45b8ba7..9031f549 100644
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -53,7 +53,18 @@ struct _glibtop_msg_limits
 
 #define glibtop_get_msg_limits(msg)	glibtop_get_msg_limits__r(glibtop_global_server, msg)
 
-extern void glibtop_get_msg_limits__r __P((glibtop *, glibtop_msg_limits *));
+#if GLIBTOP_SUID_MSG_LIMITS
+#define glibtop_get_msg_limits__r	glibtop_get_msg_limits__l
+#else
+#define glibtop_get_msg_limits__r	glibtop_get_msg_limits__s
+#endif
+
+#if GLIBTOP_SUID_MSG_LIMITS
+extern void glibtop_get_msg_limits__l __P((glibtop *, glibtop_msg_limits *));
+extern void glibtop_get_msg_limits__p __P((glibtop *, glibtop_msg_limits *));
+#else
+extern void glibtop_get_msg_limits__s __P((glibtop *, glibtop_msg_limits *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h
index 90a43b65..c214e0b2 100644
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -62,7 +62,18 @@ struct _glibtop_proc_kernel
 
 #define glibtop_get_proc_kernel(p1, p2)	glibtop_get_proc_kernel__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_kernel__r __P((glibtop *, glibtop_proc_kernel *, pid_t));
+#if GLIBTOP_SUID_PROC_KERNEL
+#define glibtop_get_proc_kernel__r	glibtop_get_proc_kernel__l
+#else
+#define glibtop_get_proc_kernel__r	glibtop_get_proc_kernel__s
+#endif
+
+#if GLIBTOP_SUID_PROC_KERNEL
+extern void glibtop_get_proc_kernel__l __P((glibtop *, glibtop_proc_kernel *, pid_t));
+extern void glibtop_get_proc_kernel__p __P((glibtop *, glibtop_proc_kernel *, pid_t));
+#else
+extern void glibtop_get_proc_kernel__s __P((glibtop *, glibtop_proc_kernel *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h
index d163b828..a55dd055 100644
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -45,7 +45,18 @@ struct _glibtop_proclist
 
 #define glibtop_get_proclist(proclist)	glibtop_get_proclist__r(glibtop_global_server, proclist)
 
-extern unsigned *glibtop_get_proclist__r __P((glibtop *, glibtop_proclist *));
+#if GLIBTOP_SUID_PROCLIST
+#define glibtop_get_proclist__r		glibtop_get_proclist__l
+#else
+#define glibtop_get_proclist__r		glibtop_get_proclist__s
+#endif
+
+#if GLIBTOP_SUID_PROCLIST
+extern unsigned *glibtop_get_proclist__l __P((glibtop *, glibtop_proclist *));
+extern unsigned *glibtop_get_proclist__p __P((glibtop *, glibtop_proclist *));
+#else
+extern unsigned *glibtop_get_proclist__s __P((glibtop *, glibtop_proclist *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h
index bcca778a..d841add8 100644
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -55,7 +55,18 @@ struct _glibtop_proc_mem
 
 #define glibtop_get_proc_mem(p1, p2)	glibtop_get_proc_mem__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_mem__r __P((glibtop *, glibtop_proc_mem *, pid_t));
+#if GLIBTOP_SUID_PROC_MEM
+#define glibtop_get_proc_mem__r		glibtop_get_proc_mem__l
+#else
+#define glibtop_get_proc_mem__r		glibtop_get_proc_mem__s
+#endif
+
+#if GLIBTOP_SUID_PROC_MEM
+extern void glibtop_get_proc_mem__l __P((glibtop *, glibtop_proc_mem *, pid_t));
+extern void glibtop_get_proc_mem__p __P((glibtop *, glibtop_proc_mem *, pid_t));
+#else
+extern void glibtop_get_proc_mem__s __P((glibtop *, glibtop_proc_mem *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h
index b52f5bbf..7b8b4425 100644
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -56,7 +56,18 @@ struct _glibtop_proc_segment
 
 #define glibtop_get_proc_segment(p1, p2)	glibtop_get_proc_segment__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_segment__r __P((glibtop *, glibtop_proc_segment *, pid_t));
+#if GLIBTOP_SUID_PROC_SEGMENT
+#define glibtop_get_proc_segment__r	glibtop_get_proc_segment__l
+#else
+#define glibtop_get_proc_segment__r	glibtop_get_proc_segment__s
+#endif
+
+#if GLIBTOP_SUID_PROC_SEGMENT
+extern void glibtop_get_proc_segment__l __P((glibtop *, glibtop_proc_segment *, pid_t));
+extern void glibtop_get_proc_segment__p __P((glibtop *, glibtop_proc_segment *, pid_t));
+#else
+extern void glibtop_get_proc_segment__s __P((glibtop *, glibtop_proc_segment *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h
index dda8a5bf..dc77a7e3 100644
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -49,7 +49,18 @@ struct _glibtop_proc_signal
 
 #define glibtop_get_proc_signal(p1, p2)	glibtop_get_proc_signal__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_signal__r __P((glibtop *, glibtop_proc_signal *, pid_t));
+#if GLIBTOP_SUID_PROC_SIGNAL
+#define glibtop_get_proc_signal__r	glibtop_get_proc_signal__l
+#else
+#define glibtop_get_proc_signal__r	glibtop_get_proc_signal__s
+#endif
+
+#if GLIBTOP_SUID_PROC_SIGNAL
+extern void glibtop_get_proc_signal__l __P((glibtop *, glibtop_proc_signal *, pid_t));
+extern void glibtop_get_proc_signal__p __P((glibtop *, glibtop_proc_signal *, pid_t));
+#else
+extern void glibtop_get_proc_signal__s __P((glibtop *, glibtop_proc_signal *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h
index c03f20d0..f5044eb9 100644
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -56,7 +56,18 @@ struct _glibtop_proc_state
 
 #define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_state__r __P((glibtop *, glibtop_proc_state *, pid_t));
+#if GLIBTOP_SUID_PROC_STATE
+#define glibtop_get_proc_state__r	glibtop_get_proc_state__l
+#else
+#define glibtop_get_proc_state__r	glibtop_get_proc_state__s
+#endif
+
+#if GLIBTOP_SUID_PROC_STATE
+extern void glibtop_get_proc_state__l __P((glibtop *, glibtop_proc_state *, pid_t));
+extern void glibtop_get_proc_state__p __P((glibtop *, glibtop_proc_state *, pid_t));
+#else
+extern void glibtop_get_proc_state__s __P((glibtop *, glibtop_proc_state *, pid_t));
+#endif
      
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h
index 50d08c17..1d866767 100644
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -61,7 +61,18 @@ struct _glibtop_proc_time
 
 #define glibtop_get_proc_time(p1, p2)	glibtop_get_proc_time__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_time__r __P((glibtop *, glibtop_proc_time *, pid_t));
+#if GLIBTOP_SUID_PROC_TIME
+#define glibtop_get_proc_time__r	glibtop_get_proc_time__l
+#else
+#define glibtop_get_proc_time__r	glibtop_get_proc_time__s
+#endif
+
+#if GLIBTOP_SUID_PROC_TIME
+extern void glibtop_get_proc_time__l __P((glibtop *, glibtop_proc_time *, pid_t));
+extern void glibtop_get_proc_time__p __P((glibtop *, glibtop_proc_time *, pid_t));
+#else
+extern void glibtop_get_proc_time__s __P((glibtop *, glibtop_proc_time *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h
index decb9c25..3d8682bc 100644
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -65,7 +65,18 @@ struct _glibtop_proc_uid
 
 #define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid__r(glibtop_global_server, p1, p2)
 
-extern void glibtop_get_proc_uid__r __P((glibtop *, glibtop_proc_uid *, pid_t));
+#if GLIBTOP_SUID_PROC_UID
+#define glibtop_get_proc_uid__r		glibtop_get_proc_uid__l
+#else
+#define glibtop_get_proc_uid__r		glibtop_get_proc_uid__s
+#endif
+
+#if GLIBTOP_SUID_PROC_UID
+extern void glibtop_get_proc_uid__l __P((glibtop *, glibtop_proc_uid *, pid_t));
+extern void glibtop_get_proc_uid__p __P((glibtop *, glibtop_proc_uid *, pid_t));
+#else
+extern void glibtop_get_proc_uid__s __P((glibtop *, glibtop_proc_uid *, pid_t));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/read.h b/include/glibtop/read.h
index ef9a3ea0..4286cce1 100644
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -29,7 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
 
-extern void glibtop_read__r __P((glibtop *, size_t, void *));
+extern void glibtop_read__l __P((glibtop *, size_t, void *));
+extern void glibtop_read__s __P((glibtop *, size_t, void *));
 
 __END_DECLS
 
diff --git a/include/glibtop/read_data.h b/include/glibtop/read_data.h
index f0c54294..61bda2b2 100644
--- a/include/glibtop/read_data.h
+++ b/include/glibtop/read_data.h
@@ -29,7 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_read_data()	glibtop_read_data__r(glibtop_global_server)
 
-extern void *glibtop_read_data__r __P((glibtop *));
+extern void *glibtop_read_data__l __P((glibtop *));
+extern void *glibtop_read_data__s __P((glibtop *));
 
 __END_DECLS
 
diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h
index 283f0029..f24460e2 100644
--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -59,7 +59,18 @@ struct _glibtop_sem_limits
 
 #define glibtop_get_sem_limits(sem)	glibtop_get_sem_limits__r(glibtop_global_server, sem)
 
-extern void glibtop_get_sem_limits__r __P((glibtop *, glibtop_sem_limits *));
+#if GLIBTOP_SUID_SEM_LIMITS
+#define glibtop_get_sem_limits__r	glibtop_get_sem_limits__l
+#else
+#define glibtop_get_sem_limits__r	glibtop_get_sem_limits__s
+#endif
+
+#if GLIBTOP_SUID_SEM_LIMITS
+extern void glibtop_get_sem_limits__l __P((glibtop *, glibtop_sem_limits *));
+extern void glibtop_get_sem_limits__p __P((glibtop *, glibtop_sem_limits *));
+#else
+extern void glibtop_get_sem_limits__s __P((glibtop *, glibtop_sem_limits *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h
index db4a926d..30fc3e4f 100644
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -49,7 +49,18 @@ struct _glibtop_shm_limits
 
 #define glibtop_get_shm_limits(shm)	glibtop_get_shm_limits__r(glibtop_global_server, shm)
 
-extern void glibtop_get_shm_limits__r __P((glibtop *, glibtop_shm_limits *));
+#if GLIBTOP_SUID_SHM_LIMITS
+#define glibtop_get_shm_limits__r	glibtop_get_shm_limits__l
+#else
+#define glibtop_get_shm_limits__r	glibtop_get_shm_limits__s
+#endif
+
+#if GLIBTOP_SUID_SHM_LIMITS
+extern void glibtop_get_shm_limits__l __P((glibtop *, glibtop_shm_limits *));
+extern void glibtop_get_shm_limits__p __P((glibtop *, glibtop_shm_limits *));
+#else
+extern void glibtop_get_shm_limits__s __P((glibtop *, glibtop_shm_limits *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h
index dd42ac30..fb438413 100644
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -45,7 +45,18 @@ struct _glibtop_swap
 
 #define glibtop_get_swap(swap)	glibtop_get_swap__r(glibtop_global_server, swap)
 
-extern void glibtop_get_swap__r __P((glibtop *, glibtop_swap *));
+#if GLIBTOP_SUID_SWAP
+#define glibtop_get_swap__r		glibtop_get_swap__l
+#else
+#define glibtop_get_swap__r		glibtop_get_swap__s
+#endif
+
+#if GLIBTOP_SUID_SWAP
+extern void glibtop_get_swap__l __P((glibtop *, glibtop_swap *));
+extern void glibtop_get_swap__p __P((glibtop *, glibtop_swap *));
+#else
+extern void glibtop_get_swap__s __P((glibtop *, glibtop_swap *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h
index 10815ecb..50dfdb48 100644
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -43,7 +43,18 @@ struct _glibtop_uptime
 
 #define glibtop_get_uptime(uptime)	glibtop_get_uptime__r(glibtop_global_server, uptime)
 
-extern void glibtop_get_uptime__r __P((glibtop *, glibtop_uptime *));
+#if GLIBTOP_SUID_UPTIME
+#define glibtop_get_uptime__r		glibtop_get_uptime__l
+#else
+#define glibtop_get_uptime__r		glibtop_get_uptime__s
+#endif
+
+#if GLIBTOP_SUID_UPTIME
+extern void glibtop_get_uptime__l __P((glibtop *, glibtop_uptime *));
+extern void glibtop_get_uptime__p __P((glibtop *, glibtop_uptime *));
+#else
+extern void glibtop_get_uptime__s __P((glibtop *, glibtop_uptime *));
+#endif
 
 #ifdef HAVE_GUILE
 
diff --git a/include/glibtop/write.h b/include/glibtop/write.h
index e7acb1fc..22a677b5 100644
--- a/include/glibtop/write.h
+++ b/include/glibtop/write.h
@@ -29,7 +29,8 @@ __BEGIN_DECLS
 
 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
 
-extern void glibtop_write__r __P((glibtop *, size_t, void *));
+extern void glibtop_write__l __P((glibtop *, size_t, void *));
+extern void glibtop_write__s __P((glibtop *, size_t, void *));
 
 __END_DECLS