Using single underscore instead of two underscores for function prefixes

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

	* *.[ch]: Using single underscore instead of two underscores
	for function prefixes (regexp: ``s,__([rspl])\b,_$1,g'') to
	avoid ambiguity with mangled C++ names.

sysdeps/common/error.c

@@ -24,7 +24,7 @@
 /* Prints error message and exits. */
 
 void
-glibtop_error__r (glibtop *server, char *format, ...)
+glibtop_error_r (glibtop *server, char *format, ...)
 {
 	va_list	ap;
 	

sysdeps/common/sysdeps.c

@@ -44,7 +44,7 @@ BIT_MASK(GLIBTOP_SUID_PROC_SEGMENT);
 /* Checks which features are implemented. */
 
 void
-glibtop_get_sysdeps__r (glibtop *server, glibtop_sysdeps *buf)
+glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf)
 {
 	glibtop_union data;
 
@@ -55,48 +55,48 @@ glibtop_get_sysdeps__r (glibtop *server, glibtop_sysdeps *buf)
 	/* Call all system dependent functions to check which values
 	 * they return. */
 
-	glibtop_get_cpu__r (server, &data.cpu);
+	glibtop_get_cpu_r (server, &data.cpu);
 	buf->cpu = data.cpu.flags;
 
-	glibtop_get_mem__r (server, &data.mem);
+	glibtop_get_mem_r (server, &data.mem);
 	buf->mem = data.mem.flags;
 	
-	glibtop_get_swap__r (server, &data.swap);
+	glibtop_get_swap_r (server, &data.swap);
 	buf->swap = data.swap.flags;
 
-	glibtop_get_uptime__r (server, &data.uptime);
+	glibtop_get_uptime_r (server, &data.uptime);
 	buf->uptime = data.uptime.flags;
 
-	glibtop_get_loadavg__r (server, &data.loadavg);
+	glibtop_get_loadavg_r (server, &data.loadavg);
 	buf->loadavg = data.loadavg.flags;
 
-	glibtop_get_shm_limits__r (server, &data.shm_limits);
+	glibtop_get_shm_limits_r (server, &data.shm_limits);
 	buf->shm_limits = data.shm_limits.flags;
 
-	glibtop_get_msg_limits__r (server, &data.msg_limits);
+	glibtop_get_msg_limits_r (server, &data.msg_limits);
 	buf->msg_limits = data.msg_limits.flags;
 
-	glibtop_get_sem_limits__r (server, &data.sem_limits);
+	glibtop_get_sem_limits_r (server, &data.sem_limits);
 	buf->sem_limits = data.sem_limits.flags;
 
-	glibtop_get_proclist__r (server, &data.proclist);
+	glibtop_get_proclist_r (server, &data.proclist);
 	buf->proclist = data.proclist.flags;
 
-	glibtop_get_proc_state__r (server, &data.proc_state, 0);
+	glibtop_get_proc_state_r (server, &data.proc_state, 0);
 	buf->proc_state = data.proc_state.flags;
 
-	glibtop_get_proc_uid__r (server, &data.proc_uid, 0);
+	glibtop_get_proc_uid_r (server, &data.proc_uid, 0);
 	buf->proc_uid = data.proc_uid.flags;
 
-	glibtop_get_proc_mem__r (server, &data.proc_mem, 0);
+	glibtop_get_proc_mem_r (server, &data.proc_mem, 0);
 	buf->proc_mem = data.proc_mem.flags;
 
-	glibtop_get_proc_time__r (server, &data.proc_time, 0);
+	glibtop_get_proc_time_r (server, &data.proc_time, 0);
 	buf->proc_time = data.proc_time.flags;
 
-	glibtop_get_proc_kernel__r (server, &data.proc_kernel, 0);
+	glibtop_get_proc_kernel_r (server, &data.proc_kernel, 0);
 	buf->proc_kernel = data.proc_kernel.flags;
 
-	glibtop_get_proc_segment__r (server, &data.proc_segment, 0);
+	glibtop_get_proc_segment_r (server, &data.proc_segment, 0);
 	buf->proc_segment = data.proc_segment.flags;
 }

sysdeps/common/xmalloc.c

@@ -24,43 +24,43 @@
 /* Wrappers to malloc, calloc, realloc ... */
 
 void *
-glibtop_malloc__r (glibtop *server, size_t size)
+glibtop_malloc_r (glibtop *server, size_t size)
 {
 	void *buf = malloc (size);
 	
 	if (!buf)
-		glibtop_error__r (server, _("malloc %d bytes: %s"),
+		glibtop_error_r (server, _("malloc %d bytes: %s"),
 				  size, strerror (errno));
 	
 	return buf;
 }
 
 void *
-glibtop_calloc__r (glibtop *server, size_t nmemb, size_t size)
+glibtop_calloc_r (glibtop *server, size_t nmemb, size_t size)
 {
 	void *buf = calloc (nmemb, size);
 	
 	if (!buf)
-		glibtop_error__r (server, _("calloc %d block (%d bytes each): %s"),
+		glibtop_error_r (server, _("calloc %d block (%d bytes each): %s"),
 				  nmemb, size, strerror (errno));
 	
 	return buf;
 }
 
 void *
-glibtop_realloc__r (glibtop *server, void *ptr, size_t size)
+glibtop_realloc_r (glibtop *server, void *ptr, size_t size)
 {
 	void *buf = realloc (ptr, size);
 	
 	if (!buf)
-		glibtop_error__r (server, _("realloc %d bytes: %s"),
+		glibtop_error_r (server, _("realloc %d bytes: %s"),
 				  size, strerror (errno));
 	
 	return buf;
 }
 
 void
-glibtop_free__r (glibtop *server, void *ptr)
+glibtop_free_r (glibtop *server, void *ptr)
 {
 	if (ptr) free (ptr);
 }

sysdeps/linux/close.c

@@ -24,5 +24,5 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close (glibtop *server)
+glibtop_close_l (glibtop *server)
 { }

sysdeps/linux/cpu.c

@@ -30,11 +30,11 @@ static const unsigned long _glibtop_sysdeps_cpu =
 /* Provides information about cpu usage. */
 
 void
-glibtop_get_cpu__s (glibtop *server, glibtop_cpu *buf)
+glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_cpu));
 

sysdeps/linux/init.c

@@ -26,15 +26,17 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init__r (glibtop **server, const unsigned long features,
+glibtop_init_r (glibtop **server, const unsigned long features,
 		 const unsigned flags)
 {
 	if (*server != NULL)
 		return *server;
 
+	fprintf (stderr, "DEBUG: %s (%d)\n", __FILE__, __LINE__);
+
 	if (glibtop_global_server == NULL) {
 		glibtop_global_server = &_glibtop_global_server;
-		glibtop_open__r (glibtop_global_server, "glibtop",
+		glibtop_open_r (glibtop_global_server, "glibtop",
 				 features, flags);
 	}
 	

sysdeps/linux/loadavg.c

@@ -28,11 +28,11 @@ static const unsigned long _glibtop_sysdeps_loadavg =
 /* Provides load load averange. */
 
 void
-glibtop_get_loadavg__s (glibtop *server, glibtop_loadavg *buf)
+glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_loadavg));
 

sysdeps/linux/mem.c

@@ -31,11 +31,11 @@ static const unsigned long _glibtop_sysdeps_mem =
 /* Provides information about memory usage. */
 
 void
-glibtop_get_mem__s (glibtop *server, glibtop_mem *buf)
+glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_mem));
 

sysdeps/linux/msg_limits.c

@@ -33,11 +33,11 @@ static const unsigned long _glibtop_sysdeps_msg_limits =
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_msg_limits__s (glibtop *server, glibtop_msg_limits *buf)
+glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 {
 	struct msginfo	msginfo;
   
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_msg_limits));
   

sysdeps/linux/open.c

@@ -51,7 +51,7 @@ static void set_linux_version(void) {
 /* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
 
 void
-glibtop_open__r (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));

sysdeps/linux/procdata.c

@@ -78,14 +78,14 @@ BIT_SHIFT(GLIBTOP_PROCDATA_WCHAN);
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_procdata__s (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;
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 	
 	memset (buf, 0, sizeof (glibtop_procdata));
 

sysdeps/linux/prockernel.c

@@ -31,13 +31,13 @@ static const unsigned long _glibtop_sysdeps_proc_kernel =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_kernel__s (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;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_kernel));
 

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__s (glibtop *server, glibtop_proclist *buf)
+glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf)
 {
 	DIR *proc;
 	struct dirent *entry;
@@ -60,7 +60,7 @@ glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf)
 	struct stat statb;
 	int len, i, ok;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proclist));
 
@@ -101,7 +101,7 @@ glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf)
 
 			new_size = pids_size + BLOCK_SIZE;
 
-			pids_chain = glibtop_realloc__r (server, pids_chain, new_size);
+			pids_chain = glibtop_realloc_r (server, pids_chain, new_size);
 
 			memcpy (pids_chain + pids_offset, pids, BLOCK_SIZE);
 
@@ -133,7 +133,7 @@ glibtop_get_proclist__s (glibtop *server, glibtop_proclist *buf)
 	
 	new_size = pids_size + count * sizeof (unsigned);
 	
-	pids_chain = glibtop_realloc__r (server, pids_chain, new_size);
+	pids_chain = glibtop_realloc_r (server, pids_chain, new_size);
 	
 	memcpy (pids_chain + pids_offset, pids, count * sizeof (unsigned));
 	

sysdeps/linux/procmem.c

@@ -30,13 +30,13 @@ static const unsigned long _glibtop_sysdeps_proc_mem =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_mem__s (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;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_mem));
 

sysdeps/linux/procsegment.c

@@ -31,14 +31,14 @@ static const unsigned long _glibtop_sysdeps_proc_segment =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_segment__s (glibtop *server, glibtop_proc_segment *buf,
+glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
 			     pid_t pid)
 {
 	char input [BUFSIZ], *tmp;
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 

sysdeps/linux/procsignal.c

@@ -29,13 +29,13 @@ static const unsigned long _glibtop_sysdeps_proc_signal =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_signal__s (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;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_signal));
 

sysdeps/linux/procstate.c

@@ -31,14 +31,14 @@ static const unsigned long _glibtop_sysdeps_proc_state =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_state__s (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;
 	int nread;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_state));
 

sysdeps/linux/proctime.c

@@ -31,13 +31,13 @@ static const unsigned long _glibtop_sysdeps_proc_time =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_time__s (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;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_time));
 

sysdeps/linux/procuid.c

@@ -35,13 +35,13 @@ static const unsigned long _glibtop_sysdeps_proc_uid =
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_uid__s (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;
 	FILE *f;
 	
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 

sysdeps/linux/sem_limits.c

@@ -34,12 +34,12 @@ static unsigned long _glibtop_sysdeps_sem_limits =
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_sem_limits__s (glibtop *server, glibtop_sem_limits *buf)
+glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
 {
 	struct seminfo	seminfo;
 	union semun	arg;  
   
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_sem_limits));
   

sysdeps/linux/shm_limits.c

@@ -32,11 +32,11 @@ static unsigned long _glibtop_sysdeps_shm_limits =
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_shm_limits__s (glibtop *server, glibtop_shm_limits *buf)
+glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
 {
 	struct shminfo	shminfo;
   
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_shm_limits));
   

sysdeps/linux/swap.c

@@ -29,11 +29,11 @@ static unsigned long _glibtop_sysdeps_swap =
 /* Provides information about swap usage. */
 
 void
-glibtop_get_swap__s (glibtop *server, glibtop_swap *buf)
+glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_swap));
 

sysdeps/linux/uptime.c

@@ -28,11 +28,11 @@ static unsigned long _glibtop_sysdeps_uptime =
 /* Provides uptime and idle time. */
 
 void
-glibtop_get_uptime__s (glibtop *server, glibtop_uptime *buf)
+glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 {
 	FILE *f;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_uptime));
 

sysdeps/osf1/cpu.c

@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_cpu =
 /* Provides information about cpu usage. */
 
 void
-glibtop_get_cpu__s (glibtop *server, glibtop_cpu *buf)
+glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
 	struct tbl_sysinfo sysinfo;
 	int ret;

sysdeps/osf1/init.c

@@ -26,7 +26,7 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init__r (glibtop **server)
+glibtop_init_r (glibtop **server)
 {
 	if (*server != NULL)
 		return *server;

sysdeps/osf1/loadavg.c

@@ -29,7 +29,7 @@ static const unsigned long _glibtop_sysdeps_loadavg =
 /* Provides load averange. */
 
 void
-glibtop_get_loadavg__s (glibtop *server, glibtop_loadavg *buf)
+glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
 {
 	struct tbl_loadavg loadavg;
 	int ret;

sysdeps/osf1/mem.c

@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysdeps_mem =
 /* Provides information about memory usage. */
 
 void
-glibtop_get_mem__s (glibtop *server, glibtop_mem *buf)
+glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 {
 	vm_statistics_data_t vmstats;
 

sysdeps/osf1/msg_limits.c

@@ -31,7 +31,7 @@ static const unsigned long _glibtop_sysdeps_msg_limits =
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_msg_limits__s (glibtop *server, glibtop_msg_limits *buf)
+glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 {
 	int ret, value;
 

sysdeps/osf1/procdata.c

@@ -53,7 +53,7 @@ BIT_SHIFT(GLIBTOP_PROCDATA_NICE);
 static const unsigned long _glibtop_sysdeps_procdata_1 = 0;
 
 void
-glibtop_get_procdata__r (glibtop *server, glibtop_procdata *buf, pid_t pid)
+glibtop_get_procdata_r (glibtop *server, glibtop_procdata *buf, pid_t pid)
 {
 	struct tbl_procinfo procinfo;
 	task_basic_info_data_t taskinfo;

sysdeps/osf1/prockernel.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_kernel__r (glibtop *server, glibtop_proc_kernel *buf,
+glibtop_get_proc_kernel_r (glibtop *server, glibtop_proc_kernel *buf,
 			    pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_kernel));

sysdeps/osf1/proclist.c

@@ -54,7 +54,7 @@ static const unsigned long _glibtop_sysdeps_proclist =
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
 
 unsigned *
-glibtop_get_proclist__r (glibtop *server, glibtop_proclist *buf)
+glibtop_get_proclist_r (glibtop *server, glibtop_proclist *buf)
 {
 	unsigned count = 0, total = 0;
 	unsigned pids [BLOCK_COUNT], *pids_chain = NULL;
@@ -103,7 +103,7 @@ glibtop_get_proclist__r (glibtop *server, glibtop_proclist *buf)
 
 				new_size = pids_size + BLOCK_SIZE;
 
-				pids_chain = glibtop_realloc__r (server, pids_chain, new_size);
+				pids_chain = glibtop_realloc_r (server, pids_chain, new_size);
 
 				memcpy (pids_chain + pids_offset, pids, BLOCK_SIZE);
 
@@ -133,7 +133,7 @@ glibtop_get_proclist__r (glibtop *server, glibtop_proclist *buf)
 	
 	new_size = pids_size + count * sizeof (unsigned);
 	
-	pids_chain = glibtop_realloc__r (server, pids_chain, new_size);
+	pids_chain = glibtop_realloc_r (server, pids_chain, new_size);
 	
 	memcpy (pids_chain + pids_offset, pids, count * sizeof (unsigned));
 	

sysdeps/osf1/procmem.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_mem__r (glibtop *server, glibtop_proc_mem *buf,
+glibtop_get_proc_mem_r (glibtop *server, glibtop_proc_mem *buf,
 			 pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_mem));

sysdeps/osf1/procsegment.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_segment__r (glibtop *server, glibtop_proc_segment *buf,
+glibtop_get_proc_segment_r (glibtop *server, glibtop_proc_segment *buf,
 			     pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_segment));

sysdeps/osf1/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_r (glibtop *server, glibtop_proc_signal *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_signal));

sysdeps/osf1/procstate.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_state__r (glibtop *server, glibtop_proc_state *buf,
+glibtop_get_proc_state_r (glibtop *server, glibtop_proc_state *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_state));

sysdeps/osf1/proctime.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_time__r (glibtop *server, glibtop_proc_time *buf,
+glibtop_get_proc_time_r (glibtop *server, glibtop_proc_time *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_time));

sysdeps/osf1/procuid.c

@@ -39,7 +39,7 @@ static const unsigned long _glibtop_sysdeps_proc_uid =
 (1 << GLIBTOP_PROC_UID_TTY) + (1 << GLIBTOP_PROC_UID_TPGID);
 
 void
-glibtop_get_proc_uid__r (glibtop *server, glibtop_proc_uid *buf,
+glibtop_get_proc_uid_r (glibtop *server, glibtop_proc_uid *buf,
 			   pid_t pid)
 {
 	struct tbl_procinfo procinfo;

sysdeps/osf1/sem_limits.c

@@ -31,7 +31,7 @@ static unsigned long _glibtop_sysdeps_sem_limits =
 /* Provides information about sysv sem limits. */
 
 void
-glibtop_get_sem_limits__s (glibtop *server, glibtop_sem_limits *buf)
+glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
 {
 	int ret, value;
 

sysdeps/osf1/shm_limits.c

@@ -30,7 +30,7 @@ static unsigned long _glibtop_sysdeps_shm_limits =
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_shm_limits__s (glibtop *server, glibtop_shm_limits *buf)
+glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
 {
 	int ret, value;
 

sysdeps/osf1/swap.c

@@ -30,7 +30,7 @@ static unsigned long _glibtop_sysdeps_swap =
 /* Provides information about swap usage. */
 
 void
-glibtop_get_swap__s (glibtop *server, glibtop_swap *buf)
+glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
 {
 	struct tbl_swapinfo swapinfo;
 	int i;

sysdeps/osf1/uptime.c

@@ -31,7 +31,7 @@ static unsigned long _glibtop_sysdeps_uptime =
 /* Provides uptime and idle time. */
 
 void
-glibtop_get_uptime__s (glibtop *server, glibtop_uptime *buf)
+glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 {
 	struct tbl_sysinfo sysinfo;
 	int ret;

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_r (glibtop *server, glibtop_cpu *buf)
 {
 	memset (buf, 0, sizeof (glibtop_cpu));
 }

sysdeps/stub/init.c

@@ -26,7 +26,7 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init__r (glibtop **server)
+glibtop_init_r (glibtop **server)
 {
 	if (*server != NULL)
 		return *server;

sysdeps/stub/loadavg.c

@@ -25,7 +25,7 @@
 /* Provides load averange. */
 
 void
-glibtop_get_loadavg__r (glibtop *server, glibtop_loadavg *buf)
+glibtop_get_loadavg_r (glibtop *server, glibtop_loadavg *buf)
 {
 	memset (buf, 0, sizeof (glibtop_loadavg));
 }

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_r (glibtop *server, glibtop_mem *buf)
 {
 	memset (buf, 0, sizeof (glibtop_mem));
 }

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_r (glibtop *server, glibtop_msg_limits *buf)
 {
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 }

sysdeps/stub/prockernel.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_kernel__r (glibtop *server, glibtop_proc_kernel *buf,
+glibtop_get_proc_kernel_r (glibtop *server, glibtop_proc_kernel *buf,
 			    pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_kernel));

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_r (glibtop *server, glibtop_proclist *buf)
 {
 	memset (buf, 0, sizeof (glibtop_proclist));
 	return NULL;

sysdeps/stub/procmem.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_mem__r (glibtop *server, glibtop_proc_mem *buf,
+glibtop_get_proc_mem_r (glibtop *server, glibtop_proc_mem *buf,
 			 pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_mem));

sysdeps/stub/procsegment.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_segment__r (glibtop *server, glibtop_proc_segment *buf,
+glibtop_get_proc_segment_r (glibtop *server, glibtop_proc_segment *buf,
 			     pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_segment));

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_r (glibtop *server, glibtop_proc_signal *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_signal));

sysdeps/stub/procstate.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_state__r (glibtop *server, glibtop_proc_state *buf,
+glibtop_get_proc_state_r (glibtop *server, glibtop_proc_state *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_state));

sysdeps/stub/proctime.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_time__r (glibtop *server, glibtop_proc_time *buf,
+glibtop_get_proc_time_r (glibtop *server, glibtop_proc_time *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_time));

sysdeps/stub/procuid.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_uid__r (glibtop *server, glibtop_proc_uid *buf,
+glibtop_get_proc_uid_r (glibtop *server, glibtop_proc_uid *buf,
 			   pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_proc_uid));

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_r (glibtop *server, glibtop_sem_limits *buf)
 {
 	memset (buf, 0, sizeof (glibtop_sem_limits));
 }

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_r (glibtop *server, glibtop_shm_limits *buf)
 {
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 }

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_r (glibtop *server, glibtop_swap *buf)
 {
 	memset (buf, 0, sizeof (glibtop_swap));
 }

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_r (glibtop *server, glibtop_uptime *buf)
 {
 	memset (buf, 0, sizeof (glibtop_uptime));
 }

sysdeps/sun4/cpu.c

@@ -30,12 +30,12 @@ static const unsigned long _glibtop_sysdeps_cpu =
 /* Provides information about cpu usage. */
 
 void
-glibtop_get_cpu__p (glibtop *server, glibtop_cpu *buf)
+glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 {
 	long cp_time [CPUSTATES], mp_time [NCPU][CPUSTATES];
 	int i;
 
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_cpu));
 

sysdeps/sun4/init.c

@@ -26,7 +26,7 @@ static glibtop	_glibtop_global_server;
 glibtop		*glibtop_global_server = NULL;
 
 glibtop *
-glibtop_init__r (glibtop **server, const unsigned long features,
+glibtop_init_r (glibtop **server, const unsigned long features,
 		 const unsigned flags)
 {
 	if (*server != NULL)
@@ -34,7 +34,7 @@ glibtop_init__r (glibtop **server, const unsigned long features,
 
 	if (glibtop_global_server == NULL) {
 		glibtop_global_server = &_glibtop_global_server;
-		glibtop_open__r (glibtop_global_server, "glibtop",
+		glibtop_open_r (glibtop_global_server, "glibtop",
 				 features, flags);
 	}
 	

sysdeps/sun4/loadavg.c

@@ -25,9 +25,9 @@
 /* Provides load averange. */
 
 void
-glibtop_get_loadavg__p (glibtop *server, glibtop_loadavg *buf)
+glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_loadavg));
 }

sysdeps/sun4/mem.c

@@ -33,9 +33,9 @@ static const unsigned long _glibtop_sysdeps_mem =
 /* Provides information about memory usage. */
 
 void
-glibtop_get_mem__p (glibtop *server, glibtop_mem *buf)
+glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_mem));
 	

sysdeps/sun4/msg_limits.c

@@ -24,9 +24,9 @@
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_msg_limits__p (glibtop *server, glibtop_msg_limits *buf)
+glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_msg_limits));
 }

sysdeps/sun4/open.c

@@ -57,7 +57,7 @@ struct nlist _glibtop_nlist[] = {
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
 
 void
-glibtop_open__r (glibtop *server, const char *program_name,
+glibtop_open_r (glibtop *server, const char *program_name,
 		 const unsigned long features, const unsigned flags)
 {
 	register int pagesize;
@@ -77,14 +77,14 @@ glibtop_open__r (glibtop *server, const char *program_name,
 	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "libgtop");
 	
 	if (server->machine.kd == NULL)
-		glibtop_error__r (server, "kvm_open: %s", strerror (errno));
+		glibtop_error_r (server, "kvm_open: %s", strerror (errno));
 	
 	/* get the list of symbols we want to access in the kernel */
 	
 	server->machine.nlist_count = kvm_nlist (server->machine.kd, _glibtop_nlist);
 	
 	if (server->machine.nlist_count < 0)
-		glibtop_error__r (server, "nlist: %s", strerror (errno));
+		glibtop_error_r (server, "nlist: %s", strerror (errno));
 
 #ifdef MULTIPROCESSOR
 	/* were ncpu and xp_time not found in the nlist? */
@@ -130,7 +130,7 @@ glibtop_open__r (glibtop *server, const char *program_name,
 	server->machine.count = server->machine.bytesize / sizeof (struct page);
 
 	server->machine.physpage =
-		(struct page *) glibtop_malloc__r (server, server->machine.bytesize);
+		(struct page *) glibtop_malloc_r (server, server->machine.bytesize);
 
 	/* get the page size with "getpagesize" and calculate pageshift from it */
 
@@ -183,12 +183,12 @@ _glibtop_check_nlist (void *server, register struct nlist *nlst)
 
 #ifdef i386
 		if (nlst->n_value == 0) {
-			glibtop_error__r (server, "kernel: no symbol named `%s'", nlst->n_name);
+			glibtop_error_r (server, "kernel: no symbol named `%s'", nlst->n_name);
 			not_found++;
 		}
 #else
 		if (nlst->n_type == 0) {
-			glibtop_error__r (server, "kernel: no symbol named `%s'", nlst->n_name);
+			glibtop_error_r (server, "kernel: no symbol named `%s'", nlst->n_name);
 			not_found++;
 		}
 #endif
@@ -210,7 +210,7 @@ _glibtop_getkval (void *void_server, unsigned long offset, int *ptr, int size, c
 		{
 			if (*refstr == '!') return 0;
 
-			glibtop_error__r (server, "kvm_read(%s): %s",
+			glibtop_error_r (server, "kvm_read(%s): %s",
 					  refstr, strerror (errno));
 		}
 

sysdeps/sun4/procdata.c

@@ -25,7 +25,7 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_procdata__p (glibtop *server, glibtop_procdata *buf, pid_t pid)
+glibtop_get_procdata_p (glibtop *server, glibtop_procdata *buf, pid_t pid)
 {
 	memset (buf, 0, sizeof (glibtop_procdata));
 }

sysdeps/sun4/prockernel.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_kernel__p (glibtop *server, glibtop_proc_kernel *buf,
+glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf,
 			    pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_kernel));
 }

sysdeps/sun4/proclist.c

@@ -32,9 +32,9 @@
  *   each buf->size big. The total size is stored in buf->total. */
 
 unsigned *
-glibtop_get_proclist__p (glibtop *server, glibtop_proclist *buf)
+glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proclist));
 	return NULL;

sysdeps/sun4/procmem.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_mem__p (glibtop *server, glibtop_proc_mem *buf,
+glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 			 pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_mem));
 }

sysdeps/sun4/procsegment.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_segment__p (glibtop *server, glibtop_proc_segment *buf,
+glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf,
 			     pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 }

sysdeps/sun4/procsignal.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_signal__p (glibtop *server, glibtop_proc_signal *buf,
+glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf,
 			    pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_signal));
 }

sysdeps/sun4/procstate.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_state__p (glibtop *server, glibtop_proc_state *buf,
+glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
 			   pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_state));
 }

sysdeps/sun4/proctime.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_time__p (glibtop *server, glibtop_proc_time *buf,
+glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 			  pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_time));
 }

sysdeps/sun4/procuid.c

@@ -25,10 +25,10 @@
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_uid__p (glibtop *server, glibtop_proc_uid *buf,
+glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 			 pid_t pid)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 }

sysdeps/sun4/sem_limits.c

@@ -24,9 +24,9 @@
 /* Provides information about sysv sem limits. */
 
 void
-glibtop_get_sem_limits__p (glibtop *server, glibtop_sem_limits *buf)
+glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_sem_limits));
 }

sysdeps/sun4/shm_limits.c

@@ -24,9 +24,9 @@
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_shm_limits__p (glibtop *server, glibtop_shm_limits *buf)
+glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_shm_limits));
 }

sysdeps/sun4/swap.c

@@ -25,9 +25,9 @@
 /* Provides information about swap usage. */
 
 void
-glibtop_get_swap__p (glibtop *server, glibtop_swap *buf)
+glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_swap));
 }

sysdeps/sun4/uptime.c

@@ -25,9 +25,9 @@
 /* Provides uptime and idle time. */
 
 void
-glibtop_get_uptime__p (glibtop *server, glibtop_uptime *buf)
+glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
 {
-	glibtop_init__r (&server, 0, 0);
+	glibtop_init_r (&server, 0, 0);
 
 	memset (buf, 0, sizeof (glibtop_uptime));
 }