This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc/zack/no-nested-includes] fixup: further consolidation of trivial wrapper headers
- From: Zack Weinberg <zack at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 18 Jun 2019 15:35:36 -0000
- Subject: [glibc/zack/no-nested-includes] fixup: further consolidation of trivial wrapper headers
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3d3bf6ad0cec24f338633dc16391cb4f655255ab
commit 3d3bf6ad0cec24f338633dc16391cb4f655255ab
Author: Zack Weinberg <zackw@panix.com>
Date: Wed May 29 15:17:45 2019 -0400
fixup: further consolidation of trivial wrapper headers
into one stanza each of HEADER_ALLOWED_INCLUDES and SYSDEP_ALLOWED_INCLUDES
Diff:
---
scripts/check-obsolete-constructs.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py
index d5229f3..6154e2d 100755
--- a/scripts/check-obsolete-constructs.py
+++ b/scripts/check-obsolete-constructs.py
@@ -559,18 +559,15 @@ HEADER_ALLOWED_INCLUDES = {
"lastlog.h": [ "utmp.h" ],
"libintl.h": [ "locale.h" ],
"link.h": [ "dlfcn.h", "elf.h" ],
- "memory.h": [ "string.h" ],
"mntent.h": [ "paths.h" ],
"nss.h": [ "stdint.h" ],
"obstack.h": [ "stddef.h", "string.h" ],
"proc_service.h": [ "sys/procfs.h" ],
"pty.h": [ "sys/ioctl.h", "termios.h" ],
- "re_comp.h": [ "regex.h" ],
"regdef.h": [ "sys/fpregdef.h", "sys/regdef.h" ],
"sgtty.h": [ "sys/ioctl.h" ],
"shadow.h": [ "paths.h" ],
"stdio_ext.h": [ "stdio.h" ],
- "syscall.h": [ "sys/syscall.h" ],
"termio.h": [ "sys/ioctl.h", "termios.h" ],
"thread_db.h": [ "pthread.h", "stdint.h", "sys/procfs.h" ],
"ucontext.h": [ "sys/ucontext.h" ],
@@ -581,10 +578,8 @@ HEADER_ALLOWED_INCLUDES = {
"sys/auxv.h": [ "elf.h" ],
"sys/dir.h": [ "dirent.h" ],
"sys/elf.h": [ "sys/procfs.h" ],
- "sys/errno.h": [ "errno.h" ],
"sys/eventfd.h": [ "stdint.h" ],
"sys/fanotify.h": [ "stdint.h" ],
- "sys/fcntl.h": [ "fcntl.h" ],
"sys/file.h": [ "fcntl.h" ],
"sys/inotify.h": [ "stdint.h" ],
"sys/ioctl.h": [ "sys/ttydefaults.h" ],
@@ -596,7 +591,6 @@ HEADER_ALLOWED_INCLUDES = {
"sys/procfs.h": [ "sys/ucontext.h", "sys/user.h" ],
"sys/ptrace.h": [ "sys/ucontext.h" ],
"sys/raw.h": [ "stdint.h", "sys/ioctl.h" ],
- "sys/signal.h": [ "signal.h" ],
"sys/signalfd.h": [ "stdint.h" ],
"sys/socketvar.h": [ "sys/socket.h" ],
"sys/termios.h": [ "termios.h" ],
@@ -604,16 +598,22 @@ HEADER_ALLOWED_INCLUDES = {
"sys/timex.h": [ "sys/time.h" ],
"sys/ttychars.h": [ "sys/ttydefaults.h" ],
"sys/ucontext.h": [ "sys/procfs.h" ],
- "sys/unistd.h": [ "unistd.h" ],
"sys/vfs.h": [ "sys/statfs.h" ],
# Nonstandardized headers that do nothing but include some other
# header. These exist for compatibility with old systems where
# the included header did not exist or didn't provide all the
# necessary definitions.
+ "memory.h": [ "string.h" ],
+ "re_comp.h": [ "regex.h" ],
"sys/bitypes.h": [ "sys/types.h" ],
+ "sys/errno.h": [ "errno.h" ],
+ "sys/fcntl.h": [ "fcntl.h" ],
"sys/poll.h": [ "poll.h" ],
+ "sys/signal.h": [ "signal.h" ],
"sys/syslog.h": [ "syslog.h" ],
+ "sys/unistd.h": [ "unistd.h" ],
+ "syscall.h": [ "sys/syscall.h" ],
"wait.h": [ "sys/wait.h" ],
# Nonstandardized networking headers
@@ -687,23 +687,25 @@ SYSDEP_ALLOWED_INCLUDES = {
"sys/pci.h": [ "linux/pci.h" ],
"sys/prctl.h": [ "linux/prctl.h" ],
"sys/quota.h": [ "linux/quota.h" ],
- "sys/soundcard.h": [ "linux/soundcard.h" ],
"sys/syscall.h": [ "asm/unistd.h" ],
"sys/sysctl.h": [ "linux/sysctl.h" ],
"sys/sysinfo.h": [ "linux/kernel.h" ],
"sys/user.h": [ "asm/ptrace.h", "asm/reg.h" ],
"sys/vm86.h": [ "asm/vm86.h" ],
- "sys/vt.h": [ "linux/vt.h" ],
# Nonstandardized networking headers
"net/ethernet.h": [ "linux/if_ether.h" ],
"net/if_slip.h": [ "linux/if_slip.h" ],
- "net/ppp-comp.h": [ "linux/ppp-comp.h" ],
"net/ppp_defs.h": [ "asm/types.h", "linux/ppp_defs.h" ],
"netatalk/at.h": [ "asm/types.h", "linux/atalk.h" ],
"netinet/if_ether.h": [ "linux/if_ether.h" ],
"netinet/if_fddi.h": [ "linux/if_fddi.h" ],
+
+ # Alternative names for kernel headers
+ "net/ppp-comp.h": [ "linux/ppp-comp.h" ],
"nfs/nfs.h": [ "linux/nfs.h" ],
+ "sys/soundcard.h": [ "linux/soundcard.h" ],
+ "sys/vt.h": [ "linux/vt.h" ],
# Internal headers
"bits/errno.h": [ "linux/errno.h" ],