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.
This commit is contained in:
Martin Baulig
1998-06-07 13:57:45 +00:00
committed by Martin Baulig
parent 85f31a1707
commit c84923132a
129 changed files with 409 additions and 399 deletions

View File

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

View File

@@ -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));

View File

@@ -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);
}

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));

View File

@@ -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));