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.

2 files changed, 36 insertions, 36 deletions

diff --git a/src/proxy/main.c b/src/proxy/main.c
index 361d924b..a71df0a2 100644
--- a/src/proxy/main.c
+++ b/src/proxy/main.c
@@ -55,7 +55,7 @@ main(int argc, char *argv[])
 
 	glibtop_version ();
 
-	glibtop_open__l (&server, argv [0], 0, GLIBTOP_OPEN_NO_OVERRIDE);
+	glibtop_open_l (&server, argv [0], 0, GLIBTOP_OPEN_NO_OVERRIDE);
 
 	/* close all file descriptors except ones used by the pipes (0 and 1). */
 	max_fd = GET_MAX_FDS();
@@ -122,58 +122,58 @@ main(int argc, char *argv[])
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_CPU:
-			glibtop_get_cpu__l (&server, &data.cpu);
+			glibtop_get_cpu_l (&server, &data.cpu);
 			glibtop_output (sizeof (glibtop_cpu), &data.cpu);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_MEM:
-			glibtop_get_mem__l (&server, &data.mem);
+			glibtop_get_mem_l (&server, &data.mem);
 			glibtop_output (sizeof (glibtop_mem), &data.mem);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SWAP:
-			glibtop_get_swap__l (&server, &data.swap);
+			glibtop_get_swap_l (&server, &data.swap);
 			glibtop_output (sizeof (glibtop_swap), &data.swap);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_UPTIME:
-			glibtop_get_uptime__l (&server, &data.uptime);
+			glibtop_get_uptime_l (&server, &data.uptime);
 			glibtop_output (sizeof (glibtop_uptime), &data.uptime);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_LOADAVG:
-			glibtop_get_loadavg__l (&server, &data.loadavg);
+			glibtop_get_loadavg_l (&server, &data.loadavg);
 			glibtop_output (sizeof (glibtop_loadavg), &data.loadavg);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SHM_LIMITS:
-			glibtop_get_shm_limits__l (&server, &data.shm_limits);
+			glibtop_get_shm_limits_l (&server, &data.shm_limits);
 			glibtop_output (sizeof (glibtop_shm_limits),
 					&data.shm_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_MSG_LIMITS:
-			glibtop_get_msg_limits__l (&server, &data.msg_limits);
+			glibtop_get_msg_limits_l (&server, &data.msg_limits);
 			glibtop_output (sizeof (glibtop_msg_limits),
 					&data.msg_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SEM_LIMITS:
-			glibtop_get_sem_limits__l (&server, &data.sem_limits);
+			glibtop_get_sem_limits_l (&server, &data.sem_limits);
 			glibtop_output (sizeof (glibtop_sem_limits),
 					&data.sem_limits);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_PROCLIST:
-			ptr = glibtop_get_proclist__l (&server, &data.proclist);
+			ptr = glibtop_get_proclist_l (&server, &data.proclist);
 			glibtop_output (sizeof (glibtop_proclist),
 					&data.proclist);
 			glibtop_output (data.proclist.total, ptr);
-			glibtop_free__r (&server, ptr);
+			glibtop_free_r (&server, ptr);
 			break;
 		case GLIBTOP_CMND_PROC_STATE:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_state__l
+			glibtop_get_proc_state_l
 				(&server, &data.proc_state, pid);
 			glibtop_output (sizeof (glibtop_proc_state),
 					&data.proc_state);
@@ -181,7 +181,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_UID:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_uid__l
+			glibtop_get_proc_uid_l
 				(&server, &data.proc_uid, pid);
 			glibtop_output (sizeof (glibtop_proc_uid),
 					&data.proc_uid);
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_MEM:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_mem__l
+			glibtop_get_proc_mem_l
 				(&server, &data.proc_mem, pid);
 			glibtop_output (sizeof (glibtop_proc_mem),
 					&data.proc_mem);
@@ -197,7 +197,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_TIME:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_time__l
+			glibtop_get_proc_time_l
 				(&server, &data.proc_time, pid);
 			glibtop_output (sizeof (glibtop_proc_time),
 					&data.proc_time);
@@ -205,7 +205,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_SIGNAL:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_signal__l
+			glibtop_get_proc_signal_l
 				(&server, &data.proc_signal, pid);
 			glibtop_output (sizeof (glibtop_proc_signal),
 					&data.proc_signal);
@@ -213,7 +213,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_KERNEL:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_kernel__l
+			glibtop_get_proc_kernel_l
 				(&server, &data.proc_kernel, pid);
 			glibtop_output (sizeof (glibtop_proc_kernel),
 					&data.proc_kernel);
@@ -221,7 +221,7 @@ main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROC_SEGMENT:
 			memcpy (&pid, parameter, sizeof (pid_t));
-			glibtop_get_proc_segment__l
+			glibtop_get_proc_segment_l
 				(&server, &data.proc_segment, pid);
 			glibtop_output (sizeof (glibtop_proc_segment),
 					&data.proc_segment);
diff --git a/src/server/main.c b/src/server/main.c
index f9afd7c7..a248c862 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
 	setreuid (uid, euid); setregid (gid, egid);
 	
-	glibtop_open__r (&server, argv [0], 0, 0);
+	glibtop_open_r (&server, argv [0], 0, 0);
 
 	if (setreuid (euid, uid)) _exit (1);
 
@@ -148,42 +148,42 @@ int main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_CPU:
 #if GLIBTOP_SUID_CPU
-			glibtop_get_cpu__p (&server, &data.cpu);
+			glibtop_get_cpu_p (&server, &data.cpu);
 #endif
 			glibtop_output (sizeof (glibtop_cpu), &data.cpu);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_MEM:
 #if GLIBTOP_SUID_MEM
-			glibtop_get_mem__p (&server, &data.mem);
+			glibtop_get_mem_p (&server, &data.mem);
 #endif
 			glibtop_output (sizeof (glibtop_mem), &data.mem);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SWAP:
 #if GLIBTOP_SUID_SWAP
-			glibtop_get_swap__p (&server, &data.swap);
+			glibtop_get_swap_p (&server, &data.swap);
 #endif
 			glibtop_output (sizeof (glibtop_swap), &data.swap);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_UPTIME:
 #if GLIBTOP_SUID_UPTIME
-			glibtop_get_uptime__p (&server, &data.uptime);
+			glibtop_get_uptime_p (&server, &data.uptime);
 #endif
 			glibtop_output (sizeof (glibtop_uptime), &data.uptime);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_LOADAVG:
 #if GLIBTOP_SUID_LOADAVG
-			glibtop_get_loadavg__p (&server, &data.loadavg);
+			glibtop_get_loadavg_p (&server, &data.loadavg);
 #endif
 			glibtop_output (sizeof (glibtop_loadavg), &data.loadavg);
 			glibtop_output (0, NULL);
 			break;
 		case GLIBTOP_CMND_SHM_LIMITS:
 #if GLIBTOP_SUID_SHM_LIMITS
-			glibtop_get_shm_limits__p (&server, &data.shm_limits);
+			glibtop_get_shm_limits_p (&server, &data.shm_limits);
 #endif
 			glibtop_output (sizeof (glibtop_shm_limits),
 					&data.shm_limits);
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_MSG_LIMITS:
 #if GLIBTOP_SUID_MSG_LIMITS
-			glibtop_get_msg_limits__p (&server, &data.msg_limits);
+			glibtop_get_msg_limits_p (&server, &data.msg_limits);
 #endif
 			glibtop_output (sizeof (glibtop_msg_limits),
 					&data.msg_limits);
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_SEM_LIMITS:
 #if GLIBTOP_SUID_SEM_LIMITS
-			glibtop_get_sem_limits__p (&server, &data.sem_limits);
+			glibtop_get_sem_limits_p (&server, &data.sem_limits);
 #endif
 			glibtop_output (sizeof (glibtop_sem_limits),
 					&data.sem_limits);
@@ -207,19 +207,19 @@ int main(int argc, char *argv[])
 			break;
 		case GLIBTOP_CMND_PROCLIST:
 #if GLIBTOP_SUID_PROCLIST
-			ptr = glibtop_get_proclist__p (&server, &data.proclist);
+			ptr = glibtop_get_proclist_p (&server, &data.proclist);
 #else
 			ptr = NULL;
 #endif
 			glibtop_output (sizeof (glibtop_proclist),
 					&data.proclist);
 			glibtop_output (data.proclist.total, ptr);
-			glibtop_free__r (&server, ptr);
+			glibtop_free_r (&server, ptr);
 			break;
 		case GLIBTOP_CMND_PROC_STATE:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_STATE
-			glibtop_get_proc_state__p
+			glibtop_get_proc_state_p
 				(&server, &data.proc_state, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_state),
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_UID:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_UID
-			glibtop_get_proc_uid__p
+			glibtop_get_proc_uid_p
 				(&server, &data.proc_uid, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_uid),
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_MEM:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_MEM
-			glibtop_get_proc_mem__p
+			glibtop_get_proc_mem_p
 				(&server, &data.proc_mem, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_mem),
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_TIME:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_TIME
-			glibtop_get_proc_time__p
+			glibtop_get_proc_time_p
 				(&server, &data.proc_time, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_time),
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_SIGNAL:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_SIGNAL
-			glibtop_get_proc_signal__p
+			glibtop_get_proc_signal_p
 				(&server, &data.proc_signal, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_signal),
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_KERNEL:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_KERNEL
-			glibtop_get_proc_kernel__p
+			glibtop_get_proc_kernel_p
 				(&server, &data.proc_kernel, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_kernel),
@@ -279,7 +279,7 @@ int main(int argc, char *argv[])
 		case GLIBTOP_CMND_PROC_SEGMENT:
 			memcpy (&pid, parameter, sizeof (pid_t));
 #if GLIBTOP_SUID_PROC_SEGMENT
-			glibtop_get_proc_segment__p
+			glibtop_get_proc_segment_p
 				(&server, &data.proc_segment, pid);
 #endif
 			glibtop_output (sizeof (glibtop_proc_segment),