From c65cb3e46b271535fc475f4ba3118d60b17a450c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@gmail.com>
Date: Wed, 7 Mar 2018 19:37:28 +0100
Subject: [PATCH] Rename GLIBTOP_SUID_PROC_FILE to
 GLIBTOP_SUID_PROC_OPEN_FILES. 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.
---
 include/glibtop/procopenfiles.h | 4 ++--
 lib/sysdeps.c                   | 7 +++++++
 sysdeps/cygwin/glibtop_server.h | 2 +-
 sysdeps/linux/glibtop_server.h  | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h
index 31320ebe..4bcc2fda 100644
--- a/include/glibtop/procopenfiles.h
+++ b/include/glibtop/procopenfiles.h
@@ -105,7 +105,7 @@ struct _glibtop_proc_open_files
 glibtop_open_files_entry *
 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
 #else
 #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_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);
 
 
diff --git a/lib/sysdeps.c b/lib/sysdeps.c
index e942fd4a..2a761576 100644
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -44,6 +44,7 @@ GLIBTOP_SUID_PROC_KERNEL +
 GLIBTOP_SUID_PROC_SEGMENT +
 GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
+GLIBTOP_SUID_PROC_OPEN_FILES +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_NETLIST +
 GLIBTOP_SUID_PROC_WD +
@@ -123,6 +124,9 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
 #endif
 #if !GLIBTOP_SUID_PROC_IO
 	_glibtop_init_proc_io_s,
+#endif
+#if !GLIBTOP_SUID_PROC_OPEN_FILES
+	_glibtop_init_proc_open_files_s,
 #endif
 	NULL
 };
@@ -199,6 +203,9 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
 #endif
 #if GLIBTOP_SUID_PROC_IO
 	_glibtop_init_proc_io_p,
+#endif
+#if GLIBTOP_SUID_PROC_OPEN_FILES
+	_glibtop_init_proc_open_files_p,
 #endif
 	NULL
 };
diff --git a/sysdeps/cygwin/glibtop_server.h b/sysdeps/cygwin/glibtop_server.h
index b1f20f94..bfd7cc65 100644
--- a/sysdeps/cygwin/glibtop_server.h
+++ b/sysdeps/cygwin/glibtop_server.h
@@ -45,6 +45,6 @@
 #define GLIBTOP_SUID_PROC_AFFINITY	0
 #define GLIBTOP_SUID_PROC_WD		0
 #define GLIBTOP_SUID_PPP		0
-#define GLIBTOP_SUID_PROC_FILE		0
+#define GLIBTOP_SUID_PROC_OPEN_FILES		0
 
 #endif /* __CYGWIN__GLIBTOP_SERVER_H__ */
diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h
index 8e591eab..6240d5de 100644
--- a/sysdeps/linux/glibtop_server.h
+++ b/sysdeps/linux/glibtop_server.h
@@ -45,7 +45,7 @@
 #define GLIBTOP_SUID_PROC_WD		0
 #define GLIBTOP_SUID_PROC_AFFINITY	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
 
 #endif /* __LINUX__GLIBTOP_SERVER_H__ */