diff options
Diffstat (limited to 'include/glibtop')
-rw-r--r-- | include/glibtop/close.h | 2 | ||||
-rw-r--r-- | include/glibtop/command.h | 6 | ||||
-rw-r--r-- | include/glibtop/cpu.h | 12 | ||||
-rw-r--r-- | include/glibtop/error.h | 4 | ||||
-rw-r--r-- | include/glibtop/loadavg.h | 12 | ||||
-rw-r--r-- | include/glibtop/mem.h | 12 | ||||
-rw-r--r-- | include/glibtop/msg_limits.h | 12 | ||||
-rw-r--r-- | include/glibtop/open.h | 4 | ||||
-rw-r--r-- | include/glibtop/prockernel.h | 12 | ||||
-rw-r--r-- | include/glibtop/proclist.h | 12 | ||||
-rw-r--r-- | include/glibtop/procmem.h | 12 | ||||
-rw-r--r-- | include/glibtop/procsegment.h | 12 | ||||
-rw-r--r-- | include/glibtop/procsignal.h | 12 | ||||
-rw-r--r-- | include/glibtop/procstate.h | 12 | ||||
-rw-r--r-- | include/glibtop/proctime.h | 12 | ||||
-rw-r--r-- | include/glibtop/procuid.h | 12 | ||||
-rw-r--r-- | include/glibtop/read.h | 4 | ||||
-rw-r--r-- | include/glibtop/read_data.h | 6 | ||||
-rw-r--r-- | include/glibtop/sem_limits.h | 12 | ||||
-rw-r--r-- | include/glibtop/shm_limits.h | 12 | ||||
-rw-r--r-- | include/glibtop/swap.h | 12 | ||||
-rw-r--r-- | include/glibtop/sysdeps.h | 4 | ||||
-rw-r--r-- | include/glibtop/uptime.h | 12 | ||||
-rw-r--r-- | include/glibtop/write.h | 4 | ||||
-rw-r--r-- | include/glibtop/xmalloc.h | 18 |
25 files changed, 122 insertions, 122 deletions
diff --git a/include/glibtop/close.h b/include/glibtop/close.h index d57ccd38..6241737a 100644 --- a/include/glibtop/close.h +++ b/include/glibtop/close.h @@ -26,7 +26,7 @@ __BEGIN_DECLS -extern void glibtop_close __P((glibtop *)); +extern void glibtop_close_r __P((glibtop *)); __END_DECLS diff --git a/include/glibtop/command.h b/include/glibtop/command.h index ce83c618..8314699f 100644 --- a/include/glibtop/command.h +++ b/include/glibtop/command.h @@ -59,10 +59,10 @@ struct _glibtop_command size_t size; }; -#define glibtop_call(p1, p2, p3, p4) glibtop_call__r(glibtop_global_server, p1, p2, p3, p4) +#define glibtop_call(p1, p2, p3, p4) glibtop_call_r(glibtop_global_server, p1, p2, p3, p4) -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 *)); +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 cf164833..f4e96afc 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -49,20 +49,20 @@ struct _glibtop_cpu frequency; /* GLIBTOP_CPU_FREQUENCY */ }; -#define glibtop_get_cpu(cpu) glibtop_get_cpu__l(glibtop_global_server, cpu) +#define glibtop_get_cpu(cpu) glibtop_get_cpu_l(glibtop_global_server, cpu) #if GLIBTOP_SUID_CPU -#define glibtop_get_cpu__r glibtop_get_cpu__p +#define glibtop_get_cpu_r glibtop_get_cpu_p #else -#define glibtop_get_cpu__r glibtop_get_cpu__s +#define glibtop_get_cpu_r glibtop_get_cpu_s #endif -extern void glibtop_get_cpu__l __P((glibtop *, glibtop_cpu *)); +extern void glibtop_get_cpu_l __P((glibtop *, glibtop_cpu *)); #if GLIBTOP_SUID_CPU -extern void glibtop_get_cpu__p __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 *)); +extern void glibtop_get_cpu_s __P((glibtop *, glibtop_cpu *)); #endif #ifdef HAVE_GUILE diff --git a/include/glibtop/error.h b/include/glibtop/error.h index 94e14ba9..adb85828 100644 --- a/include/glibtop/error.h +++ b/include/glibtop/error.h @@ -26,9 +26,9 @@ __BEGIN_DECLS -#define glibtop_error(p1, args...) glibtop_error__r(glibtop_global_server , p1 , ## args) +#define glibtop_error(p1, args...) glibtop_error_r(glibtop_global_server , p1 , ## args) -extern void glibtop_error__r __P((glibtop *, char *, ...)); +extern void glibtop_error_r __P((glibtop *, char *, ...)); __END_DECLS diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index eaf6588c..661e9032 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -39,20 +39,20 @@ struct _glibtop_loadavg double loadavg [3]; /* GLIBTOP_LOADAVG_LOADAVG */ }; -#define glibtop_get_loadavg(loadavg) glibtop_get_loadavg__l(glibtop_global_server, loadavg) +#define glibtop_get_loadavg(loadavg) glibtop_get_loadavg_l(glibtop_global_server, loadavg) #if GLIBTOP_SUID_LOADAVG -#define glibtop_get_loadavg__r glibtop_get_loadavg__p +#define glibtop_get_loadavg_r glibtop_get_loadavg_p #else -#define glibtop_get_loadavg__r glibtop_get_loadavg__s +#define glibtop_get_loadavg_r glibtop_get_loadavg_s #endif -extern void glibtop_get_loadavg__l __P((glibtop *, glibtop_loadavg *)); +extern void glibtop_get_loadavg_l __P((glibtop *, glibtop_loadavg *)); #if GLIBTOP_SUID_LOADAVG -extern void glibtop_get_loadavg__p __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 *)); +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 9f90bb27..5f490618 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -53,20 +53,20 @@ struct _glibtop_mem locked; /* GLIBTOP_MEM_LOCKED */ }; -#define glibtop_get_mem(mem) glibtop_get_mem__l(glibtop_global_server, mem) +#define glibtop_get_mem(mem) glibtop_get_mem_l(glibtop_global_server, mem) #if GLIBTOP_SUID_MEM -#define glibtop_get_mem__r glibtop_get_mem__p +#define glibtop_get_mem_r glibtop_get_mem_p #else -#define glibtop_get_mem__r glibtop_get_mem__s +#define glibtop_get_mem_r glibtop_get_mem_s #endif -extern void glibtop_get_mem__l __P((glibtop *, glibtop_mem *)); +extern void glibtop_get_mem_l __P((glibtop *, glibtop_mem *)); #if GLIBTOP_SUID_MEM -extern void glibtop_get_mem__p __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 *)); +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 6199265e..c915b568 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -51,20 +51,20 @@ struct _glibtop_msg_limits msgtql; /* GLIBTOP_IPC_MSGTQL */ }; -#define glibtop_get_msg_limits(msg) glibtop_get_msg_limits__l(glibtop_global_server, msg) +#define glibtop_get_msg_limits(msg) glibtop_get_msg_limits_l(glibtop_global_server, msg) #if GLIBTOP_SUID_MSG_LIMITS -#define glibtop_get_msg_limits__r glibtop_get_msg_limits__p +#define glibtop_get_msg_limits_r glibtop_get_msg_limits_p #else -#define glibtop_get_msg_limits__r glibtop_get_msg_limits__s +#define glibtop_get_msg_limits_r glibtop_get_msg_limits_s #endif -extern void glibtop_get_msg_limits__l __P((glibtop *, glibtop_msg_limits *)); +extern void glibtop_get_msg_limits_l __P((glibtop *, glibtop_msg_limits *)); #if GLIBTOP_SUID_MSG_LIMITS -extern void glibtop_get_msg_limits__p __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 *)); +extern void glibtop_get_msg_limits_s __P((glibtop *, glibtop_msg_limits *)); #endif #ifdef HAVE_GUILE diff --git a/include/glibtop/open.h b/include/glibtop/open.h index 629c18e8..4e4e5408 100644 --- a/include/glibtop/open.h +++ b/include/glibtop/open.h @@ -28,9 +28,9 @@ __BEGIN_DECLS #define GLIBTOP_OPEN_NO_OVERRIDE 1 -extern void glibtop_open__l __P((glibtop *, const char *, const unsigned long, const unsigned)); +extern void glibtop_open_l __P((glibtop *, const char *, const unsigned long, const unsigned)); -extern void glibtop_open__r __P((glibtop *, const char *, const unsigned long, const unsigned)); +extern void glibtop_open_r __P((glibtop *, const char *, const unsigned long, const unsigned)); __END_DECLS diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h index dbec0f0c..fed6fba6 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -60,20 +60,20 @@ struct _glibtop_proc_kernel * proc is sleeping in */ }; -#define glibtop_get_proc_kernel(p1, p2) glibtop_get_proc_kernel__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_kernel(p1, p2) glibtop_get_proc_kernel_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_KERNEL -#define glibtop_get_proc_kernel__r glibtop_get_proc_kernel__p +#define glibtop_get_proc_kernel_r glibtop_get_proc_kernel_p #else -#define glibtop_get_proc_kernel__r glibtop_get_proc_kernel__s +#define glibtop_get_proc_kernel_r glibtop_get_proc_kernel_s #endif -extern void glibtop_get_proc_kernel__l __P((glibtop *, glibtop_proc_kernel *, pid_t)); +extern void glibtop_get_proc_kernel_l __P((glibtop *, glibtop_proc_kernel *, pid_t)); #if GLIBTOP_SUID_PROC_KERNEL -extern void glibtop_get_proc_kernel__p __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)); +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 24026b6d..ebc6512c 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -43,20 +43,20 @@ struct _glibtop_proclist size; /* GLIBTOP_PROCLIST_SIZE */ }; -#define glibtop_get_proclist(proclist) glibtop_get_proclist__l(glibtop_global_server, proclist) +#define glibtop_get_proclist(proclist) glibtop_get_proclist_l(glibtop_global_server, proclist) #if GLIBTOP_SUID_PROCLIST -#define glibtop_get_proclist__r glibtop_get_proclist__p +#define glibtop_get_proclist_r glibtop_get_proclist_p #else -#define glibtop_get_proclist__r glibtop_get_proclist__s +#define glibtop_get_proclist_r glibtop_get_proclist_s #endif -extern unsigned *glibtop_get_proclist__l __P((glibtop *, glibtop_proclist *)); +extern unsigned *glibtop_get_proclist_l __P((glibtop *, glibtop_proclist *)); #if GLIBTOP_SUID_PROCLIST -extern unsigned *glibtop_get_proclist__p __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 *)); +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 9d787966..a2720169 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -53,20 +53,20 @@ struct _glibtop_proc_mem * of the process; usually 2,147,483,647 */ }; -#define glibtop_get_proc_mem(p1, p2) glibtop_get_proc_mem__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_mem(p1, p2) glibtop_get_proc_mem_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_MEM -#define glibtop_get_proc_mem__r glibtop_get_proc_mem__p +#define glibtop_get_proc_mem_r glibtop_get_proc_mem_p #else -#define glibtop_get_proc_mem__r glibtop_get_proc_mem__s +#define glibtop_get_proc_mem_r glibtop_get_proc_mem_s #endif -extern void glibtop_get_proc_mem__l __P((glibtop *, glibtop_proc_mem *, pid_t)); +extern void glibtop_get_proc_mem_l __P((glibtop *, glibtop_proc_mem *, pid_t)); #if GLIBTOP_SUID_PROC_MEM -extern void glibtop_get_proc_mem__p __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)); +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 76e419c7..54f59d81 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -54,20 +54,20 @@ struct _glibtop_proc_segment start_stack; /* address of the bottom of stack segment */ }; -#define glibtop_get_proc_segment(p1, p2) glibtop_get_proc_segment__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_segment(p1, p2) glibtop_get_proc_segment_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_SEGMENT -#define glibtop_get_proc_segment__r glibtop_get_proc_segment__p +#define glibtop_get_proc_segment_r glibtop_get_proc_segment_p #else -#define glibtop_get_proc_segment__r glibtop_get_proc_segment__s +#define glibtop_get_proc_segment_r glibtop_get_proc_segment_s #endif -extern void glibtop_get_proc_segment__l __P((glibtop *, glibtop_proc_segment *, pid_t)); +extern void glibtop_get_proc_segment_l __P((glibtop *, glibtop_proc_segment *, pid_t)); #if GLIBTOP_SUID_PROC_SEGMENT -extern void glibtop_get_proc_segment__p __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)); +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 f09b6047..e3690ea0 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -47,20 +47,20 @@ struct _glibtop_proc_signal sigcatch; /* mask of caught signals */ }; -#define glibtop_get_proc_signal(p1, p2) glibtop_get_proc_signal__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_signal(p1, p2) glibtop_get_proc_signal_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_SIGNAL -#define glibtop_get_proc_signal__r glibtop_get_proc_signal__p +#define glibtop_get_proc_signal_r glibtop_get_proc_signal_p #else -#define glibtop_get_proc_signal__r glibtop_get_proc_signal__s +#define glibtop_get_proc_signal_r glibtop_get_proc_signal_s #endif -extern void glibtop_get_proc_signal__l __P((glibtop *, glibtop_proc_signal *, pid_t)); +extern void glibtop_get_proc_signal_l __P((glibtop *, glibtop_proc_signal *, pid_t)); #if GLIBTOP_SUID_PROC_SIGNAL -extern void glibtop_get_proc_signal__p __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)); +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 d62c64e4..416a2d94 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -54,20 +54,20 @@ struct _glibtop_proc_state gid; /* GID of process */ }; -#define glibtop_get_proc_state(p1, p2) glibtop_get_proc_state__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_state(p1, p2) glibtop_get_proc_state_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_STATE -#define glibtop_get_proc_state__r glibtop_get_proc_state__p +#define glibtop_get_proc_state_r glibtop_get_proc_state_p #else -#define glibtop_get_proc_state__r glibtop_get_proc_state__s +#define glibtop_get_proc_state_r glibtop_get_proc_state_s #endif -extern void glibtop_get_proc_state__l __P((glibtop *, glibtop_proc_state *, pid_t)); +extern void glibtop_get_proc_state_l __P((glibtop *, glibtop_proc_state *, pid_t)); #if GLIBTOP_SUID_PROC_STATE -extern void glibtop_get_proc_state__p __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)); +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 9bbe6597..40ae3aa5 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -59,20 +59,20 @@ struct _glibtop_proc_time * due to an interval timer. */ }; -#define glibtop_get_proc_time(p1, p2) glibtop_get_proc_time__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_time(p1, p2) glibtop_get_proc_time_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_TIME -#define glibtop_get_proc_time__r glibtop_get_proc_time__p +#define glibtop_get_proc_time_r glibtop_get_proc_time_p #else -#define glibtop_get_proc_time__r glibtop_get_proc_time__s +#define glibtop_get_proc_time_r glibtop_get_proc_time_s #endif -extern void glibtop_get_proc_time__l __P((glibtop *, glibtop_proc_time *, pid_t)); +extern void glibtop_get_proc_time_l __P((glibtop *, glibtop_proc_time *, pid_t)); #if GLIBTOP_SUID_PROC_TIME -extern void glibtop_get_proc_time__p __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)); +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 12cbe5d7..e478c2cb 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -63,20 +63,20 @@ struct _glibtop_proc_uid nice; /* standard unix nice level of process */ }; -#define glibtop_get_proc_uid(p1, p2) glibtop_get_proc_uid__l(glibtop_global_server, p1, p2) +#define glibtop_get_proc_uid(p1, p2) glibtop_get_proc_uid_l(glibtop_global_server, p1, p2) #if GLIBTOP_SUID_PROC_UID -#define glibtop_get_proc_uid__r glibtop_get_proc_uid__p +#define glibtop_get_proc_uid_r glibtop_get_proc_uid_p #else -#define glibtop_get_proc_uid__r glibtop_get_proc_uid__s +#define glibtop_get_proc_uid_r glibtop_get_proc_uid_s #endif -extern void glibtop_get_proc_uid__l __P((glibtop *, glibtop_proc_uid *, pid_t)); +extern void glibtop_get_proc_uid_l __P((glibtop *, glibtop_proc_uid *, pid_t)); #if GLIBTOP_SUID_PROC_UID -extern void glibtop_get_proc_uid__p __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)); +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 4286cce1..bd0945d7 100644 --- a/include/glibtop/read.h +++ b/include/glibtop/read.h @@ -29,8 +29,8 @@ __BEGIN_DECLS #define glibtop_read(p1, p2) glibtop_read(glibtop_global_server, p1, p2) -extern void glibtop_read__l __P((glibtop *, size_t, void *)); -extern void glibtop_read__s __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 61bda2b2..8583a51b 100644 --- a/include/glibtop/read_data.h +++ b/include/glibtop/read_data.h @@ -27,10 +27,10 @@ __BEGIN_DECLS -#define glibtop_read_data() glibtop_read_data__r(glibtop_global_server) +#define glibtop_read_data() glibtop_read_data_r(glibtop_global_server) -extern void *glibtop_read_data__l __P((glibtop *)); -extern void *glibtop_read_data__s __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 50118802..19cefc95 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -57,20 +57,20 @@ struct _glibtop_sem_limits semaem; /* GLIBTOP_IPC_SEMAEM */ }; -#define glibtop_get_sem_limits(sem) glibtop_get_sem_limits__l(glibtop_global_server, sem) +#define glibtop_get_sem_limits(sem) glibtop_get_sem_limits_l(glibtop_global_server, sem) #if GLIBTOP_SUID_SEM_LIMITS -#define glibtop_get_sem_limits__r glibtop_get_sem_limits__p +#define glibtop_get_sem_limits_r glibtop_get_sem_limits_p #else -#define glibtop_get_sem_limits__r glibtop_get_sem_limits__s +#define glibtop_get_sem_limits_r glibtop_get_sem_limits_s #endif -extern void glibtop_get_sem_limits__l __P((glibtop *, glibtop_sem_limits *)); +extern void glibtop_get_sem_limits_l __P((glibtop *, glibtop_sem_limits *)); #if GLIBTOP_SUID_SEM_LIMITS -extern void glibtop_get_sem_limits__p __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 *)); +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 df270868..e068bd47 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -47,20 +47,20 @@ struct _glibtop_shm_limits shmall; /* GLIBTOP_IPC_SHMALL */ }; -#define glibtop_get_shm_limits(shm) glibtop_get_shm_limits__l(glibtop_global_server, shm) +#define glibtop_get_shm_limits(shm) glibtop_get_shm_limits_l(glibtop_global_server, shm) #if GLIBTOP_SUID_SHM_LIMITS -#define glibtop_get_shm_limits__r glibtop_get_shm_limits__p +#define glibtop_get_shm_limits_r glibtop_get_shm_limits_p #else -#define glibtop_get_shm_limits__r glibtop_get_shm_limits__s +#define glibtop_get_shm_limits_r glibtop_get_shm_limits_s #endif -extern void glibtop_get_shm_limits__l __P((glibtop *, glibtop_shm_limits *)); +extern void glibtop_get_shm_limits_l __P((glibtop *, glibtop_shm_limits *)); #if GLIBTOP_SUID_SHM_LIMITS -extern void glibtop_get_shm_limits__p __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 *)); +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 396f940a..ce7ab57c 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -43,20 +43,20 @@ struct _glibtop_swap free; /* GLIBTOP_SWAP_FREE */ }; -#define glibtop_get_swap(swap) glibtop_get_swap__l(glibtop_global_server, swap) +#define glibtop_get_swap(swap) glibtop_get_swap_l(glibtop_global_server, swap) #if GLIBTOP_SUID_SWAP -#define glibtop_get_swap__r glibtop_get_swap__p +#define glibtop_get_swap_r glibtop_get_swap_p #else -#define glibtop_get_swap__r glibtop_get_swap__s +#define glibtop_get_swap_r glibtop_get_swap_s #endif -extern void glibtop_get_swap__l __P((glibtop *, glibtop_swap *)); +extern void glibtop_get_swap_l __P((glibtop *, glibtop_swap *)); #if GLIBTOP_SUID_SWAP -extern void glibtop_get_swap__p __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 *)); +extern void glibtop_get_swap_s __P((glibtop *, glibtop_swap *)); #endif #ifdef HAVE_GUILE diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h index 8bbcba2b..e2491008 100644 --- a/include/glibtop/sysdeps.h +++ b/include/glibtop/sysdeps.h @@ -73,9 +73,9 @@ struct _glibtop_sysdeps proc_segment; /* glibtop_proc_segment */ }; -#define glibtop_get_sysdeps(sysdeps) glibtop_get_sysdeps__r(glibtop_global_server,sysdeps) +#define glibtop_get_sysdeps(sysdeps) glibtop_get_sysdeps_r(glibtop_global_server,sysdeps) -extern void glibtop_get_sysdeps__r __P((glibtop *, glibtop_sysdeps *)); +extern void glibtop_get_sysdeps_r __P((glibtop *, glibtop_sysdeps *)); #ifdef HAVE_GUILE diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 99fe9290..39c8dea5 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -41,20 +41,20 @@ struct _glibtop_uptime idletime; /* GLIBTOP_UPTIME_IDLETIME */ }; -#define glibtop_get_uptime(uptime) glibtop_get_uptime__l(glibtop_global_server, uptime) +#define glibtop_get_uptime(uptime) glibtop_get_uptime_l(glibtop_global_server, uptime) #if GLIBTOP_SUID_UPTIME -#define glibtop_get_uptime__r glibtop_get_uptime__p +#define glibtop_get_uptime_r glibtop_get_uptime_p #else -#define glibtop_get_uptime__r glibtop_get_uptime__s +#define glibtop_get_uptime_r glibtop_get_uptime_s #endif -extern void glibtop_get_uptime__l __P((glibtop *, glibtop_uptime *)); +extern void glibtop_get_uptime_l __P((glibtop *, glibtop_uptime *)); #if GLIBTOP_SUID_UPTIME -extern void glibtop_get_uptime__p __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 *)); +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 22a677b5..065da135 100644 --- a/include/glibtop/write.h +++ b/include/glibtop/write.h @@ -29,8 +29,8 @@ __BEGIN_DECLS #define glibtop_write(p1, p2) glibtop_write(glibtop_global_server, p1, p2) -extern void glibtop_write__l __P((glibtop *, size_t, void *)); -extern void glibtop_write__s __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 diff --git a/include/glibtop/xmalloc.h b/include/glibtop/xmalloc.h index 14a6709c..5c2b5024 100644 --- a/include/glibtop/xmalloc.h +++ b/include/glibtop/xmalloc.h @@ -27,15 +27,15 @@ __BEGIN_DECLS -#define glibtop_malloc(p1) glibtop_malloc__r(glibtop_global_server, p1) -#define glibtop_calloc(p1, p2) glibtop_calloc__r(glibtop_global_server, p1, p2) -#define glibtop_realloc(p1, p2) glibtop_realloc__r(glibtop_global_server, p1, p2) -#define glibtop_free(p1) glibtop_free__r(glibtop_global_server, p1) - -extern void *glibtop_malloc__r __P((glibtop *, size_t)); -extern void *glibtop_calloc__r __P((glibtop *, size_t, size_t)); -extern void *glibtop_realloc__r __P((glibtop *, void *, size_t)); -extern void glibtop_free__r __P((glibtop *, void *)); +#define glibtop_malloc(p1) glibtop_malloc_r(glibtop_global_server, p1) +#define glibtop_calloc(p1, p2) glibtop_calloc_r(glibtop_global_server, p1, p2) +#define glibtop_realloc(p1, p2) glibtop_realloc_r(glibtop_global_server, p1, p2) +#define glibtop_free(p1) glibtop_free_r(glibtop_global_server, p1) + +extern void *glibtop_malloc_r __P((glibtop *, size_t)); +extern void *glibtop_calloc_r __P((glibtop *, size_t, size_t)); +extern void *glibtop_realloc_r __P((glibtop *, void *, size_t)); +extern void glibtop_free_r __P((glibtop *, void *)); __END_DECLS |