mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
11160cb76f
The types u_char, u_short, u_int, u_long, ushort, uint, ulong, u_int8_t,
u_int16_t, u_int32_t, u_int64_t, quad_t, and u_quad_t are BSDisms that
have never been standardized. While glibc should continue to *provide*
these types for compatibility's sake, its public headers should not
use them.
The meat of this change was mechanically generated by the following
shell command:
perl -pi~ -e '
s/\b(__)?u_char\b/unsigned char/g;
s/\b(__)?u_?short\b/unsigned short/g;
s/\b(__)?u_?int\b/unsigned int/g;
s/\b(__)?u_?long\b/unsigned long/g;
s/\b(__)?u_int8_t\b/uint8_t/g;
s/\b(__)?u_int16_t\b/uint16_t/g;
s/\b(__)?u_int32_t\b/uint32_t/g;
s/\b(__)?u_int64_t\b/uint64_t/g;
s/\b(__)?u_quad_t\b/uint64_t/g;
s/\b(__)?quad_t\b/uint64_t/g;
' $(grep -lE -e '\<((__)?(quad_t|u(short|int|long|_(char|short|int([0-9]+_t)?|long|quad_t))))\>' \
$(grep -LE '\<(_(SYS|BITS)_TYPES_H|rpc/(rpc|rpc_msg|types|xdr)\.h)\>' \
$(find . \( -false $(sed 's/^/-o -name /' all-installed-headers) \
\) -printf '%P\n' | sort -u)))
where 'all-installed-headers' was a list of the basenames of all installed
header files, manually extracted from the Makefiles. Non-installed
wrapper headers in include/ are also adjusted, for consistency.
I then manually fixed up indentation and line-wrapping.
sys/types.h and bits/types.h are excluded because they must continue
to define the u_* types (under __USE_MISC) for compatibility with
applications. They do not use these types themselves.
All headers that (transitively) include rpc/types.h are also excluded,
for three reasons. First, the u_* types are defined by rpc/types.h,
unconditionally (not just under __USE_MISC) so they are logically part
of the SunRPC API. Second, many of those headers appear to be
machine-generated. Third, it's my understanding that we are getting
rid of as much of SunRPC as possible in the near future.
(The one file under sunrpc/ that's touched, sunrpc/rpc/rpc_des.h, does
*not* include rpc/types.h. This may itself be a bug.)
After changing from u_intNN_t to uintNN_t, a number of headers now
need to include stdint.h to pick up those types. It might be more
hygenic, namespace-wise, to use __uintNN_t instead, but none of these
headers are bound by ISO or POSIX to do so, and it's unlikely that
anyone using them will be bothered. (The two files that were using
__-prefixed versions of the u_types, sysdeps/mach/hurd/net/route.h and
sysdeps/unix/sysv/linux/net/route.h, both already also contained uses of
the unprefixed versions.)
Some of these files directly included features.h and/or sys/cdefs.h,
which I removed, as the style generally seems to be to let sys/types.h
do that for us. (This does not change the set of definitions exposed
by any header; sys/types.h unconditionally includes both features.h
and sys/cdefs.h.)
One file included asm/types.h unnecessarily.
* bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h
* inet/protocols/routed.h, inet/protocols/talkd.h
* inet/protocols/timed.h, io/fts.h, nptl_db/thread_db.h
* resolv/arpa/nameser.h, resolv/resolv.h, sunrpc/rpc/rpc_des.h
* sysdeps/generic/netinet/if_ether.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/generic/netinet/ip.h, sysdeps/generic/netinet/tcp.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h, sysdeps/mach/hurd/net/ethernet.h
* sysdeps/mach/hurd/net/if_arp.h
* sysdeps/mach/hurd/net/if_ppp.h
* sysdeps/mach/hurd/net/route.h, sysdeps/mach/sys/reboot.h
* sysdeps/unix/sysv/linux/bits/in.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/net/route.h
* sysdeps/unix/sysv/linux/netinet/if_ether.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Change all uses of u_char to unsigned char,
u_short and ushort to unsigned short, u_int and uint to unsigned int,
u_long and ulong to unsigned long, u_int8_t to uint8_t,
u_int16_t to uint16_t, u_int32_t to uint32_t, quad_t to int64_t,
and u_int64_t and u_quad_t to uint64_t.
* mach/sys/reboot.h: Remove two casts of integer literals
to the types they already have.
* bits/in.h: Correct error in description of IP_MULTICAST_LOOP.
* sysdeps/unix/sysv/linux/bits/in.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/if_ether.h: Change a comment
from referring to 'unsigned char' to 'uint8_t' for consistency with
the macro definition below.
* gmon/sys/gmon.h, inet/netinet/igmp.h, inet/protocols/talkd.h
* io/fts.h, resolv/arpa/nameser.h, resolv/resolv.h
* sunrpc/rpc/rpc_des.h, sysdeps/generic/netinet/ip.h
* sysdeps/gnu/netinet/tcp.h, sysdeps/gnu/netinet/udp.h
* sysdeps/mach/hurd/net/if_ppp.h, sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/sys/acct.h
* include/arpa/nameser.h, include/resolv.h:
Fix indentation disrupted by mechanical edits.
* inet/protocols/talkd.h, resolv/arpa/nameser.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
Include stdint.h for uintNN_t definitions.
Don't include sys/cdefs.h, features.h, or asm/types.h directly.
|
||
|---|---|---|
| .. | ||
| net | ||
| netinet | ||
| nfs | ||
| sys | ||
| _G_config.h | ||
| _itoa.h | ||
| a.out.h | ||
| abort-instr.h | ||
| aio_misc.h | ||
| allocalim.h | ||
| asm-syntax.h | ||
| atomic-machine.h | ||
| c++-types.data | ||
| confstr.h | ||
| device-nrs.h | ||
| dirstream.h | ||
| dl-cache.h | ||
| dl-dtprocnum.h | ||
| dl-dtv.h | ||
| dl-fcntl.h | ||
| dl-fileid.h | ||
| dl-fptr.h | ||
| dl-hash.h | ||
| dl-irel.h | ||
| dl-librecon.h | ||
| dl-lookupcfg.h | ||
| dl-machine.h | ||
| dl-mman.h | ||
| dl-osinfo.h | ||
| dl-procinfo.c | ||
| dl-procinfo.h | ||
| dl-sysdep.h | ||
| dl-tls.h | ||
| dl-unistd.h | ||
| dwarf2.h | ||
| elide.h | ||
| eloop-threshold.h | ||
| entry.h | ||
| errqueue.h | ||
| exit-thread.h | ||
| fd_to_filename.h | ||
| fips-private.h | ||
| fix-fp-int-convert-overflow.h | ||
| fix-int-fp-convert-zero.h | ||
| fork.h | ||
| fpu_control.h | ||
| frame.h | ||
| framestate.c | ||
| gcc-compat.h | ||
| gccframe.h | ||
| get-rounding-mode.h | ||
| gmp-mparam.h | ||
| hp-timing-common.h | ||
| hp-timing.h | ||
| ifreq.h | ||
| ifunc-sel.h | ||
| intr-msg.h | ||
| inttypes.h | ||
| ld.abilist | ||
| ldconfig.h | ||
| ldsodefs.h | ||
| libanl.abilist | ||
| libBrokenLocale.abilist | ||
| libc-lock.h | ||
| libc-mmap.h | ||
| libc-tsd.h | ||
| libc.abilist | ||
| libcidn.abilist | ||
| libcrypt.abilist | ||
| libdl.abilist | ||
| libm-test-ulps | ||
| libm.abilist | ||
| libnsl.abilist | ||
| libnss_compat.abilist | ||
| libnss_db.abilist | ||
| libnss_dns.abilist | ||
| libnss_files.abilist | ||
| libnss_hesiod.abilist | ||
| libnss_nis.abilist | ||
| libnss_nisplus.abilist | ||
| libpthread.abilist | ||
| libresolv.abilist | ||
| librt.abilist | ||
| libutil.abilist | ||
| linkmap.h | ||
| local-setxid.h | ||
| localplt.data | ||
| machine-gmon.h | ||
| machine-lock.h | ||
| machine-sp.h | ||
| Makefile | ||
| malloc-machine.h | ||
| malloc-sysdep.h | ||
| math_ldbl_opt.h | ||
| math_ldbl.h | ||
| math_private.h | ||
| math-tests-arch.h | ||
| math-tests.h | ||
| math-type-macros-double.h | ||
| math-type-macros-float.h | ||
| math-type-macros-ldouble.h | ||
| math-type-macros.h | ||
| memcopy.h | ||
| memusage.h | ||
| not-cancel.h | ||
| nscd-types.h | ||
| pagecopy.h | ||
| paths.h | ||
| profil-counter.h | ||
| pty-private.h | ||
| register-dump.h | ||
| rtld-lowlevel.h | ||
| safe-fatal.h | ||
| sigcontextinfo.h | ||
| siglist.h | ||
| sigset-cvt-mask.h | ||
| stackguard-macros.h | ||
| stackinfo.h | ||
| stdint.h | ||
| stdio-lock.h | ||
| string_private.h | ||
| symbol-hacks.h | ||
| sysdep-cancel.h | ||
| sysdep.h | ||
| thread_state.h | ||
| tininess.h | ||
| tls-macros.h | ||
| tls.h | ||
| tst-audit.h | ||
| tst-stack-align.h | ||
| unsecvars.h | ||
| unwind-dw2-fde-glibc.c | ||
| unwind-dw2-fde.c | ||
| unwind-dw2-fde.h | ||
| unwind-dw2.c | ||
| unwind-pe.c | ||
| unwind-pe.h | ||
| unwind-resume.h | ||
| unwind.h | ||
| utmp-equal.h | ||