changed suffix of all functions from '_s' to '_r'; see also ChangeLog

1998-07-14  Martin Baulig  <martin@home-of-linux.org>

	* sysdeps/stub/*.c: changed suffix of all functions
	from '_s' to '_r'; see also ChangeLog entry from Jun 6.

20 files changed, 75 insertions, 26 deletions

diff --git a/sysdeps/stub/close.c b/sysdeps/stub/close.c
index ff7ebea4..02f2e5b3 100644
--- a/sysdeps/stub/close.c
+++ b/sysdeps/stub/close.c
@@ -24,5 +24,5 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close (glibtop *server)
+glibtop_close_l (glibtop *server)
 { }
diff --git a/sysdeps/stub/cpu.c b/sysdeps/stub/cpu.c
index a7d31ad6..9a40ed3c 100644
--- a/sysdeps/stub/cpu.c
+++ b/sysdeps/stub/cpu.c
@@ -25,7 +25,7 @@
 /* Provides information about cpu usage. */
 
 void
-glibtop_get_cpu_r (glibtop *server, glibtop_cpu *buf)
+glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
 	memset (buf, 0, sizeof (glibtop_cpu));
 }
diff --git a/sysdeps/stub/glibtop_server.h b/sysdeps/stub/glibtop_server.h
new file mode 100644
index 00000000..52b1b3c0
--- /dev/null
+++ b/sysdeps/stub/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 <martin@home-of-linux.org>, 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/stub/init.c b/sysdeps/stub/init.c
index 43f7469c..9960bb17 100644
--- a/sysdeps/stub/init.c
+++ b/sysdeps/stub/init.c
@@ -26,14 +26,16 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init_r (glibtop **server)
+glibtop_init_r (glibtop **server, const unsigned long features,
+		const unsigned flags)
 {
 	if (*server != NULL)
 		return *server;
 
 	if (glibtop_global_server == NULL) {
 		glibtop_global_server = &_glibtop_global_server;
-		glibtop_open (glibtop_global_server, "glibtop");
+		glibtop_open_r (glibtop_global_server, "glibtop",
+				features, flags);
 	}
 	
 	return *server = glibtop_global_server;
diff --git a/sysdeps/stub/loadavg.c b/sysdeps/stub/loadavg.c
index 06365338..631048e1 100644
--- a/sysdeps/stub/loadavg.c
+++ b/sysdeps/stub/loadavg.c
@@ -25,7 +25,7 @@
 /* Provides load averange. */
 
 void
-glibtop_get_loadavg_r (glibtop *server, glibtop_loadavg *buf)
+glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 {
 	memset (buf, 0, sizeof (glibtop_loadavg));
 }
diff --git a/sysdeps/stub/mem.c b/sysdeps/stub/mem.c
index eb930453..e9e06a93 100644
--- a/sysdeps/stub/mem.c
+++ b/sysdeps/stub/mem.c
@@ -25,7 +25,7 @@
 /* Provides information about memory usage. */
 
 void
-glibtop_get_mem_r (glibtop *server, glibtop_mem *buf)
+glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 {
 	memset (buf, 0, sizeof (glibtop_mem));
 }
diff --git a/sysdeps/stub/msg_limits.c b/sysdeps/stub/msg_limits.c
index f554a09e..780ed033 100644
--- a/sysdeps/stub/msg_limits.c
+++ b/sysdeps/stub/msg_limits.c
@@ -24,7 +24,7 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 }
diff --git a/sysdeps/stub/open.c b/sysdeps/stub/open.c
index c2d58069..7219ab1e 100644
--- a/sysdeps/stub/open.c
+++ b/sysdeps/stub/open.c
@@ -24,7 +24,8 @@
 /* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
 
 void
-glibtop_open (glibtop *server, const char *program_name)
+glibtop_open_r (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags)
 {
 	memset (server, 0, sizeof (glibtop));
 	server->name = program_name;
diff --git a/sysdeps/stub/prockernel.c b/sysdeps/stub/prockernel.c
index bd04ca29..51aadf94 100644
--- a/sysdeps/stub/prockernel.c
+++ b/sysdeps/stub/prockernel.c
@@ -25,8 +25,8 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_proc_kernel));
 }
diff --git a/sysdeps/stub/proclist.c b/sysdeps/stub/proclist.c
index cd7cf2d1..654f0b19 100644
--- a/sysdeps/stub/proclist.c
+++ b/sysdeps/stub/proclist.c
@@ -32,7 +32,7 @@
  *   each buf->size big. The total size is stored in buf->total. */
 
 unsigned *
-glibtop_get_proclist_r (glibtop *server, glibtop_proclist *buf)
+glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf)
 {
 	memset (buf, 0, sizeof (glibtop_proclist));
 	return NULL;
diff --git a/sysdeps/stub/procmem.c b/sysdeps/stub/procmem.c
index bb1e4795..08d125d8 100644
--- a/sysdeps/stub/procmem.c
+++ b/sysdeps/stub/procmem.c
@@ -25,8 +25,8 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_proc_mem));
 }
diff --git a/sysdeps/stub/procsegment.c b/sysdeps/stub/procsegment.c
index 21cd4814..3bc840da 100644
--- a/sysdeps/stub/procsegment.c
+++ b/sysdeps/stub/procsegment.c
@@ -25,8 +25,8 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_segment_r (glibtop *server, glibtop_proc_segment *buf,
-			     pid_t pid)
+glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
+			    pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 }
diff --git a/sysdeps/stub/procsignal.c b/sysdeps/stub/procsignal.c
index d4674f8f..7578fac4 100644
--- a/sysdeps/stub/procsignal.c
+++ b/sysdeps/stub/procsignal.c
@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_signal_r (glibtop *server, glibtop_proc_signal *buf,
+glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_signal));
diff --git a/sysdeps/stub/procstate.c b/sysdeps/stub/procstate.c
index acf32c2e..1e4bb4f8 100644
--- a/sysdeps/stub/procstate.c
+++ b/sysdeps/stub/procstate.c
@@ -25,8 +25,8 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_proc_state));
 }
diff --git a/sysdeps/stub/proctime.c b/sysdeps/stub/proctime.c
index d2417173..d646c321 100644
--- a/sysdeps/stub/proctime.c
+++ b/sysdeps/stub/proctime.c
@@ -25,8 +25,8 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_proc_time));
 }
diff --git a/sysdeps/stub/procuid.c b/sysdeps/stub/procuid.c
index e3a7e741..a753f0d3 100644
--- a/sysdeps/stub/procuid.c
+++ b/sysdeps/stub/procuid.c
@@ -25,8 +25,8 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 }
diff --git a/sysdeps/stub/sem_limits.c b/sysdeps/stub/sem_limits.c
index 81676129..062d4886 100644
--- a/sysdeps/stub/sem_limits.c
+++ b/sysdeps/stub/sem_limits.c
@@ -24,7 +24,7 @@
 /* Provides information about sysv sem limits. */
 
 void
-glibtop_get_sem_limits_r (glibtop *server, glibtop_sem_limits *buf)
+glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
 {
 	memset (buf, 0, sizeof (glibtop_sem_limits));
 }
diff --git a/sysdeps/stub/shm_limits.c b/sysdeps/stub/shm_limits.c
index aa671129..b4ac4bb3 100644
--- a/sysdeps/stub/shm_limits.c
+++ b/sysdeps/stub/shm_limits.c
@@ -24,7 +24,7 @@
 /* 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)
 {
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 }
diff --git a/sysdeps/stub/swap.c b/sysdeps/stub/swap.c
index c58f0e5b..dbd7ef6c 100644
--- a/sysdeps/stub/swap.c
+++ b/sysdeps/stub/swap.c
@@ -25,7 +25,7 @@
 /* Provides information about swap usage. */
 
 void
-glibtop_get_swap_r (glibtop *server, glibtop_swap *buf)
+glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 {
 	memset (buf, 0, sizeof (glibtop_swap));
 }
diff --git a/sysdeps/stub/uptime.c b/sysdeps/stub/uptime.c
index 0b33cca4..e9d887df 100644
--- a/sysdeps/stub/uptime.c
+++ b/sysdeps/stub/uptime.c
@@ -25,7 +25,7 @@
 /* Provides uptime and idle time. */
 
 void
-glibtop_get_uptime_r (glibtop *server, glibtop_uptime *buf)
+glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 {
 	memset (buf, 0, sizeof (glibtop_uptime));
 }