oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename GLIBTOP_SUID_PROC_FILE to GLIBTOP_SUID_PROC_OPEN_FILES.

Browse Source 
The previous name is incorrect and inconsistent with the code generated
by lib.pl.
Also add missing hooks.

This symbol, although exposed in public headers is not part of the API
and is only used internally.
This commit is contained in:
Benoît Dejean
2018-03-07 19:37:28 +01:00
parent b450bbc67c
commit c65cb3e46b
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/glibtop/procopenfiles.h
View File

@@ -105,7 +105,7 @@ struct _glibtop_proc_open_files
glibtop_open_files_entry * glibtop_open_files_entry *
glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid); glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
#if GLIBTOP_SUID_PROC_FILE #if GLIBTOP_SUID_PROC_OPEN_FILES
#define glibtop_get_proc_open_files_r glibtop_get_proc_open_files_p #define glibtop_get_proc_open_files_r glibtop_get_proc_open_files_p
#else #else
#define glibtop_get_proc_open_files_r glibtop_get_proc_open_files_s #define glibtop_get_proc_open_files_r glibtop_get_proc_open_files_s
@@ -124,7 +124,7 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
glibtop_open_files_entry * glibtop_open_files_entry *
glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid); glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
#if GLIBTOP_SUID_PROC_FILE #if GLIBTOP_SUID_PROC_OPEN_FILES
void _glibtop_init_proc_open_files_p (glibtop *server); void _glibtop_init_proc_open_files_p (glibtop *server);

7
lib/sysdeps.c
View File

@@ -44,6 +44,7 @@ GLIBTOP_SUID_PROC_KERNEL +
GLIBTOP_SUID_PROC_SEGMENT + GLIBTOP_SUID_PROC_SEGMENT +
GLIBTOP_SUID_PROC_ARGS + GLIBTOP_SUID_PROC_ARGS +
GLIBTOP_SUID_PROC_MAP + GLIBTOP_SUID_PROC_MAP +
GLIBTOP_SUID_PROC_OPEN_FILES +
GLIBTOP_SUID_NETLOAD + GLIBTOP_SUID_NETLOAD +
GLIBTOP_SUID_NETLIST + GLIBTOP_SUID_NETLIST +
GLIBTOP_SUID_PROC_WD + GLIBTOP_SUID_PROC_WD +
@@ -123,6 +124,9 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
#endif #endif
#if !GLIBTOP_SUID_PROC_IO #if !GLIBTOP_SUID_PROC_IO
_glibtop_init_proc_io_s, _glibtop_init_proc_io_s,
#endif
#if !GLIBTOP_SUID_PROC_OPEN_FILES
_glibtop_init_proc_open_files_s,
#endif #endif
NULL NULL
}; };
@@ -199,6 +203,9 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
#endif #endif
#if GLIBTOP_SUID_PROC_IO #if GLIBTOP_SUID_PROC_IO
_glibtop_init_proc_io_p, _glibtop_init_proc_io_p,
#endif
#if GLIBTOP_SUID_PROC_OPEN_FILES
_glibtop_init_proc_open_files_p,
#endif #endif
NULL NULL
}; };

2
sysdeps/cygwin/glibtop_server.h
View File

@@ -45,6 +45,6 @@
#define GLIBTOP_SUID_PROC_AFFINITY 0 #define GLIBTOP_SUID_PROC_AFFINITY 0
#define GLIBTOP_SUID_PROC_WD 0 #define GLIBTOP_SUID_PROC_WD 0
#define GLIBTOP_SUID_PPP 0 #define GLIBTOP_SUID_PPP 0
#define GLIBTOP_SUID_PROC_FILE 0 #define GLIBTOP_SUID_PROC_OPEN_FILES 0
#endif /* __CYGWIN__GLIBTOP_SERVER_H__ */ #endif /* __CYGWIN__GLIBTOP_SERVER_H__ */

2
sysdeps/linux/glibtop_server.h
View File

@@ -45,7 +45,7 @@
#define GLIBTOP_SUID_PROC_WD 0 #define GLIBTOP_SUID_PROC_WD 0
#define GLIBTOP_SUID_PROC_AFFINITY 0 #define GLIBTOP_SUID_PROC_AFFINITY 0
#define GLIBTOP_SUID_PPP 0 #define GLIBTOP_SUID_PPP 0
#define GLIBTOP_SUID_PROC_FILE 0 #define GLIBTOP_SUID_PROC_OPEN_FILES 0
#define GLIBTOP_SUID_PROC_IO 0 #define GLIBTOP_SUID_PROC_IO 0
#endif /* __LINUX__GLIBTOP_SERVER_H__ */ #endif /* __LINUX__GLIBTOP_SERVER_H__ */