From patchwork Wed Jul 13 20:45:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 13786 Received: (qmail 30103 invoked by alias); 13 Jul 2016 20:46:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 28717 invoked by uid 89); 13 Jul 2016 20:46:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=hole, Things, _s, 5315 X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH 1/4] Installed-header compilation hygiene, 1/4 (easy changes). Date: Wed, 13 Jul 2016 16:45:58 -0400 Message-Id: In-Reply-To: References: These changes are straightforward, if tedious. One of them deserves special mention: it appears to me that grp-merge.h should not be installed; it uses 'internal_function' and it only defines symbols that are implementation-namespace and GLIBC_PRIVATE. If I'm wrong, some other changes to that header will be necessary. zw BZ #20366, 1/4 (easy changes) * gmon/sys/gmon.h, inet/protocols/routed.h, inet/protocols/talkd.h * inet/protocols/timed.h, io/fts.h, resolv/arpa/nameser.h * resolv/resolv.h, sunrpc/rpc/rpc_des.h: Replace u_long with unsigned long, u_short with unsigned short, u_int with unsigned int, u_char with unsigned char, u_int8_t with uint8_t, u_int16_t with uint16_t, and u_int32_t with uint32_t. Include if necessary. * grp/Makefile: Don't install grp-merge.h. * resolv/arpa/nameser_compat.h: Use __-prefixed byte order macros. * nis/rpcsvc/nislib.h: Include . * sysvipc/sys/ipc.h: Remove unnecessary #warning. * sysdeps/unix/sysv/linux/netrose/rose.h: Include sys/socket.h and netax25/ax25.h. * sysdeps/unix/sysv/linux/sys/quota.h: Use __caddr_t instead of caddr_t in a function prototype. * sysdeps/unix/sysv/linux/sys/timerfd.h: Use __clockid_t instead of clockid_t in a function prototype. --- gmon/sys/gmon.h | 30 +++---- grp/Makefile | 2 +- inet/protocols/routed.h | 6 +- inet/protocols/talkd.h | 21 ++--- inet/protocols/timed.h | 6 +- io/fts.h | 20 ++--- nis/rpcsvc/nislib.h | 2 +- resolv/arpa/nameser.h | 153 ++++++++++++++++++--------------- resolv/arpa/nameser_compat.h | 4 +- resolv/resolv.h | 125 +++++++++++++++------------ sunrpc/rpc/rpc_des.h | 8 +- sysdeps/unix/sysv/linux/netrose/rose.h | 3 + sysdeps/unix/sysv/linux/sys/quota.h | 2 +- sysdeps/unix/sysv/linux/sys/timerfd.h | 2 +- sysvipc/sys/ipc.h | 4 - 15 files changed, 206 insertions(+), 182 deletions(-) diff --git a/gmon/sys/gmon.h b/gmon/sys/gmon.h index 5b430ab..b4cc3b0 100644 --- a/gmon/sys/gmon.h +++ b/gmon/sys/gmon.h @@ -117,7 +117,7 @@ extern struct __bb *__bb_head; /* * The type used to represent indices into gmonparam.tos[]. */ -#define ARCINDEX u_long +#define ARCINDEX unsigned long /* * Maximum number of arcs we want to allow. @@ -130,7 +130,7 @@ extern struct __bb *__bb_head; #define MAXARCS (1 << 20) struct tostruct { - u_long selfpc; + unsigned long selfpc; long count; ARCINDEX link; }; @@ -140,9 +140,9 @@ struct tostruct { * the called site and a count. */ struct rawarc { - u_long raw_frompc; - u_long raw_selfpc; - long raw_count; + unsigned long raw_frompc; + unsigned long raw_selfpc; + long raw_count; }; /* @@ -156,17 +156,17 @@ struct rawarc { */ struct gmonparam { long int state; - u_short *kcount; - u_long kcountsize; + unsigned short *kcount; + unsigned long kcountsize; ARCINDEX *froms; - u_long fromssize; + unsigned long fromssize; struct tostruct *tos; - u_long tossize; + unsigned long tossize; long tolimit; - u_long lowpc; - u_long highpc; - u_long textsize; - u_long hashfraction; + unsigned long lowpc; + unsigned long highpc; + unsigned long textsize; + unsigned long hashfraction; long log_hashfraction; }; @@ -190,8 +190,8 @@ struct gmonparam { __BEGIN_DECLS /* Set up data structures and start profiling. */ -extern void __monstartup (u_long __lowpc, u_long __highpc) __THROW; -extern void monstartup (u_long __lowpc, u_long __highpc) __THROW; +extern void __monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW; +extern void monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW; /* Clean up profiling and write out gmon.out. */ extern void _mcleanup (void) __THROW; diff --git a/grp/Makefile b/grp/Makefile index b4d52e2..3807bfa 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -22,7 +22,7 @@ subdir := grp include ../Makeconfig -headers := grp.h grp-merge.h +headers := grp.h routines := fgetgrent initgroups setgroups \ getgrent getgrgid getgrnam putgrent \ diff --git a/inet/protocols/routed.h b/inet/protocols/routed.h index befd865..adb1767 100644 --- a/inet/protocols/routed.h +++ b/inet/protocols/routed.h @@ -48,9 +48,9 @@ struct netinfo { }; struct rip { - u_char rip_cmd; /* request/response */ - u_char rip_vers; /* protocol version # */ - u_char rip_res1[2]; /* pad to 32-bit boundary */ + unsigned char rip_cmd; /* request/response */ + unsigned char rip_vers; /* protocol version # */ + unsigned char rip_res1[2]; /* pad to 32-bit boundary */ union { struct netinfo ru_nets[1]; /* variable length... */ char ru_tracefile[1]; /* ditto ... */ diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h index a8f33b1..34e2654 100644 --- a/inet/protocols/talkd.h +++ b/inet/protocols/talkd.h @@ -52,16 +52,17 @@ #include #include +#include /* * Client->server request message format. */ typedef struct { - u_char vers; /* protocol version */ - u_char type; /* request type, see below */ - u_char answer; /* not used */ - u_char pad; - u_int32_t id_num; /* message id */ + unsigned char vers; /* protocol version */ + unsigned char type; /* request type, see below */ + unsigned char answer; /* not used */ + unsigned char pad; + uint32_t id_num; /* message id */ struct osockaddr addr; /* old (4.3) style */ struct osockaddr ctl_addr; /* old (4.3) style */ int32_t pid; /* caller's process id */ @@ -76,11 +77,11 @@ typedef struct { * Server->client response message format. */ typedef struct { - u_char vers; /* protocol version */ - u_char type; /* type of request message, see below */ - u_char answer; /* response to request message, see below */ - u_char pad; - u_int32_t id_num; /* message id */ + unsigned char vers; /* protocol version */ + unsigned char type; /* type of request message, see below */ + unsigned char answer; /* response to request message, see below */ + unsigned char pad; + uint32_t id_num; /* message id */ struct osockaddr addr; /* address for establishing conversation */ } CTL_RESPONSE; diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h index b5d4702..cabdce4 100644 --- a/inet/protocols/timed.h +++ b/inet/protocols/timed.h @@ -44,9 +44,9 @@ #define MAXHOSTNAMELEN 64 struct tsp { - u_char tsp_type; - u_char tsp_vers; - u_short tsp_seq; + unsigned char tsp_type; + unsigned char tsp_vers; + unsigned short tsp_seq; union { struct timeval tspu_time; char tspu_hopcnt; diff --git a/io/fts.h b/io/fts.h index 127a0d2..607e8b1 100644 --- a/io/fts.h +++ b/io/fts.h @@ -105,8 +105,8 @@ typedef struct _ftsent { char *fts_path; /* root path */ int fts_errno; /* errno for this node */ int fts_symfd; /* fd for symlink */ - u_short fts_pathlen; /* strlen(fts_path) */ - u_short fts_namelen; /* strlen(fts_name) */ + unsigned short fts_pathlen; /* strlen(fts_path) */ + unsigned short fts_namelen; /* strlen(fts_name) */ ino_t fts_ino; /* inode */ dev_t fts_dev; /* device */ @@ -130,17 +130,17 @@ typedef struct _ftsent { #define FTS_SL 12 /* symbolic link */ #define FTS_SLNONE 13 /* symbolic link without target */ #define FTS_W 14 /* whiteout object */ - u_short fts_info; /* user flags for FTSENT structure */ + unsigned short fts_info; /* user flags for FTSENT structure */ #define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */ #define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */ - u_short fts_flags; /* private flags for FTSENT structure */ + unsigned short fts_flags; /* private flags for FTSENT structure */ #define FTS_AGAIN 1 /* read node again */ #define FTS_FOLLOW 2 /* follow symbolic link */ #define FTS_NOINSTR 3 /* no instructions */ #define FTS_SKIP 4 /* discard node */ - u_short fts_instr; /* fts_set() instructions */ + unsigned short fts_instr; /* fts_set() instructions */ struct stat *fts_statp; /* stat(2) information */ char fts_name[1]; /* file name */ @@ -157,8 +157,8 @@ typedef struct _ftsent64 { char *fts_path; /* root path */ int fts_errno; /* errno for this node */ int fts_symfd; /* fd for symlink */ - u_short fts_pathlen; /* strlen(fts_path) */ - u_short fts_namelen; /* strlen(fts_name) */ + unsigned short fts_pathlen; /* strlen(fts_path) */ + unsigned short fts_namelen; /* strlen(fts_name) */ ino64_t fts_ino; /* inode */ dev_t fts_dev; /* device */ @@ -166,11 +166,11 @@ typedef struct _ftsent64 { short fts_level; /* depth (-1 to N) */ - u_short fts_info; /* user flags for FTSENT structure */ + unsigned short fts_info; /* user flags for FTSENT structure */ - u_short fts_flags; /* private flags for FTSENT structure */ + unsigned short fts_flags; /* private flags for FTSENT structure */ - u_short fts_instr; /* fts_set() instructions */ + unsigned short fts_instr; /* fts_set() instructions */ struct stat64 *fts_statp; /* stat(2) information */ char fts_name[1]; /* file name */ diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h index 21a8e48..1a7c3c5 100644 --- a/nis/rpcsvc/nislib.h +++ b/nis/rpcsvc/nislib.h @@ -19,7 +19,7 @@ #ifndef __RPCSVC_NISLIB_H__ #define __RPCSVC_NISLIB_H__ -#include +#include __BEGIN_DECLS diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 04f8844..62c11e0 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -58,7 +58,7 @@ #include #include -#include +#include /*% * Revision information. This is the release date in YYYYMMDD format. @@ -80,9 +80,9 @@ #define NS_HFIXEDSZ 12 /*%< #/bytes of fixed data in header */ #define NS_QFIXEDSZ 4 /*%< #/bytes of fixed data in query */ #define NS_RRFIXEDSZ 10 /*%< #/bytes of fixed data in r record */ -#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ -#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ -#define NS_INT8SZ 1 /*%< #/bytes of data in a u_int8_t */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a uint32_t */ +#define NS_INT16SZ 2 /*%< #/bytes of data in a uint16_t */ +#define NS_INT8SZ 1 /*%< #/bytes of data in a uint8_t */ #define NS_INADDRSZ 4 /*%< IPv4 T_A */ #define NS_IN6ADDRSZ 16 /*%< IPv6 T_AAAA */ #define NS_CMPRSFLGS 0xc0 /*%< Flag bits indicating name compression. */ @@ -108,12 +108,12 @@ typedef enum __ns_sect { * leading _'s on the member names. Use the accessor functions, not the _'s. */ typedef struct __ns_msg { - const u_char *_msg, *_eom; - u_int16_t _id, _flags, _counts[ns_s_max]; - const u_char *_sections[ns_s_max]; - ns_sect _sect; - int _rrnum; - const u_char *_msg_ptr; + const unsigned char *_msg, *_eom; + uint16_t _id, _flags, _counts[ns_s_max]; + const unsigned char *_sections[ns_s_max]; + ns_sect _sect; + int _rrnum; + const unsigned char *_msg_ptr; } ns_msg; /* Private data structure - do not use from outside library. */ @@ -132,12 +132,12 @@ extern const struct _ns_flagdata _ns_flagdata[]; * This is a parsed record. It is caller allocated and has no dynamic data. */ typedef struct __ns_rr { - char name[NS_MAXDNAME]; - u_int16_t type; - u_int16_t rr_class; - u_int32_t ttl; - u_int16_t rdlength; - const u_char * rdata; + char name[NS_MAXDNAME]; + uint16_t type; + uint16_t rr_class; + uint32_t ttl; + uint16_t rdlength; + const unsigned char * rdata; } ns_rr; /* Accessor macros - this is part of the public interface. */ @@ -429,34 +429,34 @@ typedef enum __ns_cert_types { * Inline versions of get/put short/long. Pointer is advanced. */ #define NS_GET16(s, cp) do { \ - const u_char *t_cp = (const u_char *)(cp); \ - (s) = ((u_int16_t)t_cp[0] << 8) \ - | ((u_int16_t)t_cp[1]) \ + const unsigned char *t_cp = (const unsigned char *)(cp); \ + (s) = ((uint16_t)t_cp[0] << 8) \ + | ((uint16_t)t_cp[1]) \ ; \ (cp) += NS_INT16SZ; \ } while (0) #define NS_GET32(l, cp) do { \ - const u_char *t_cp = (const u_char *)(cp); \ - (l) = ((u_int32_t)t_cp[0] << 24) \ - | ((u_int32_t)t_cp[1] << 16) \ - | ((u_int32_t)t_cp[2] << 8) \ - | ((u_int32_t)t_cp[3]) \ + const unsigned char *t_cp = (const unsigned char *)(cp); \ + (l) = ((uint32_t)t_cp[0] << 24) \ + | ((uint32_t)t_cp[1] << 16) \ + | ((uint32_t)t_cp[2] << 8) \ + | ((uint32_t)t_cp[3]) \ ; \ (cp) += NS_INT32SZ; \ } while (0) #define NS_PUT16(s, cp) do { \ - u_int16_t t_s = (u_int16_t)(s); \ - u_char *t_cp = (u_char *)(cp); \ + uint16_t t_s = (uint16_t)(s); \ + unsigned char *t_cp = (unsigned char *)(cp); \ *t_cp++ = t_s >> 8; \ *t_cp = t_s; \ (cp) += NS_INT16SZ; \ } while (0) #define NS_PUT32(l, cp) do { \ - u_int32_t t_l = (u_int32_t)(l); \ - u_char *t_cp = (u_char *)(cp); \ + uint32_t t_l = (uint32_t)(l); \ + unsigned char *t_cp = (unsigned char *)(cp); \ *t_cp++ = t_l >> 24; \ *t_cp++ = t_l >> 16; \ *t_cp++ = t_l >> 8; \ @@ -466,56 +466,67 @@ typedef enum __ns_cert_types { __BEGIN_DECLS int ns_msg_getflag (ns_msg, int) __THROW; -u_int ns_get16 (const u_char *) __THROW; -u_long ns_get32 (const u_char *) __THROW; -void ns_put16 (u_int, u_char *) __THROW; -void ns_put32 (u_long, u_char *) __THROW; -int ns_initparse (const u_char *, int, ns_msg *) __THROW; -int ns_skiprr (const u_char *, const u_char *, ns_sect, int) - __THROW; +unsigned int ns_get16 (const unsigned char *) __THROW; +unsigned long ns_get32 (const unsigned char *) __THROW; +void ns_put16 (unsigned int, unsigned char *) __THROW; +void ns_put32 (unsigned long, unsigned char *) __THROW; +int ns_initparse (const unsigned char *, int, ns_msg *) __THROW; +int ns_skiprr (const unsigned char *, const unsigned char *, + ns_sect, int) __THROW; int ns_parserr (ns_msg *, ns_sect, int, ns_rr *) __THROW; int ns_sprintrr (const ns_msg *, const ns_rr *, const char *, const char *, char *, size_t) __THROW; -int ns_sprintrrf (const u_char *, size_t, const char *, - ns_class, ns_type, u_long, const u_char *, - size_t, const char *, const char *, - char *, size_t) __THROW; -int ns_format_ttl (u_long, char *, size_t) __THROW; -int ns_parse_ttl (const char *, u_long *) __THROW; -u_int32_t ns_datetosecs (const char *, int *) __THROW; -int ns_name_ntol (const u_char *, u_char *, size_t) __THROW; -int ns_name_ntop (const u_char *, char *, size_t) __THROW; -int ns_name_pton (const char *, u_char *, size_t) __THROW; -int ns_name_unpack (const u_char *, const u_char *, - const u_char *, u_char *, size_t) __THROW; -int ns_name_pack (const u_char *, u_char *, int, - const u_char **, const u_char **) __THROW; -int ns_name_uncompress (const u_char *, const u_char *, - const u_char *, char *, size_t) __THROW; -int ns_name_compress (const char *, u_char *, size_t, - const u_char **, const u_char **) __THROW; -int ns_name_skip (const u_char **, const u_char *) __THROW; -void ns_name_rollback (const u_char *, const u_char **, - const u_char **) __THROW; -int ns_sign (u_char *, int *, int, int, void *, - const u_char *, int, u_char *, int *, time_t) __THROW; -int ns_sign2 (u_char *, int *, int, int, void *, - const u_char *, int, u_char *, int *, time_t, - u_char **, u_char **) __THROW; -int ns_sign_tcp (u_char *, int *, int, int, +int ns_sprintrrf (const unsigned char *, size_t, const char *, + ns_class, ns_type, unsigned long, + const unsigned char *, size_t, const char *, + const char *, char *, size_t) __THROW; +int ns_format_ttl (unsigned long, char *, size_t) __THROW; +int ns_parse_ttl (const char *, unsigned long *) __THROW; +uint32_t ns_datetosecs (const char *, int *) __THROW; +int ns_name_ntol (const unsigned char *, unsigned char *, size_t) + __THROW; +int ns_name_ntop (const unsigned char *, char *, size_t) __THROW; +int ns_name_pton (const char *, unsigned char *, size_t) __THROW; +int ns_name_unpack (const unsigned char *, const unsigned char *, + const unsigned char *, unsigned char *, size_t) + __THROW; +int ns_name_pack (const unsigned char *, unsigned char *, int, + const unsigned char **, const unsigned char **) + __THROW; +int ns_name_uncompress (const unsigned char *, + const unsigned char *, + const unsigned char *, + char *, size_t) __THROW; +int ns_name_compress (const char *, unsigned char *, size_t, + const unsigned char **, + const unsigned char **) __THROW; +int ns_name_skip (const unsigned char **, const unsigned char *) + __THROW; +void ns_name_rollback (const unsigned char *, + const unsigned char **, + const unsigned char **) __THROW; +int ns_sign (unsigned char *, int *, int, int, void *, + const unsigned char *, int, unsigned char *, + int *, time_t) __THROW; +int ns_sign2 (unsigned char *, int *, int, int, void *, + const unsigned char *, int, unsigned char *, + int *, time_t, unsigned char **, + unsigned char **) __THROW; +int ns_sign_tcp (unsigned char *, int *, int, int, ns_tcp_tsig_state *, int) __THROW; -int ns_sign_tcp2 (u_char *, int *, int, int, +int ns_sign_tcp2 (unsigned char *, int *, int, int, ns_tcp_tsig_state *, int, - u_char **, u_char **) __THROW; -int ns_sign_tcp_init (void *, const u_char *, int, + unsigned char **, unsigned char **) __THROW; +int ns_sign_tcp_init (void *, const unsigned char *, int, ns_tcp_tsig_state *) __THROW; -u_char *ns_find_tsig (u_char *, u_char *) __THROW; -int ns_verify (u_char *, int *, void *, const u_char *, int, - u_char *, int *, time_t *, int) __THROW; -int ns_verify_tcp (u_char *, int *, ns_tcp_tsig_state *, int) - __THROW; -int ns_verify_tcp_init (void *, const u_char *, int, +unsigned char *ns_find_tsig (unsigned char *, unsigned char *) __THROW; +int ns_verify (unsigned char *, int *, void *, + const unsigned char *, int, unsigned char *, int *, + time_t *, int) __THROW; +int ns_verify_tcp (unsigned char *, int *, ns_tcp_tsig_state *, + int) __THROW; +int ns_verify_tcp_init (void *, const unsigned char *, int, ns_tcp_tsig_state *) __THROW; int ns_samedomain (const char *, const char *) __THROW; int ns_subdomain (const char *, const char *) __THROW; diff --git a/resolv/arpa/nameser_compat.h b/resolv/arpa/nameser_compat.h index d59c9e4..a4b92e2 100644 --- a/resolv/arpa/nameser_compat.h +++ b/resolv/arpa/nameser_compat.h @@ -47,7 +47,7 @@ typedef struct { unsigned id :16; /*%< query identification number */ -#if BYTE_ORDER == BIG_ENDIAN +#if __BYTE_ORDER == __BIG_ENDIAN /* fields in third byte */ unsigned qr: 1; /*%< response flag */ unsigned opcode: 4; /*%< purpose of message */ @@ -61,7 +61,7 @@ typedef struct { unsigned cd: 1; /*%< checking disabled by resolver */ unsigned rcode :4; /*%< response code */ #endif -#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN +#if __BYTE_ORDER == __LITTLE_ENDIAN || __BYTE_ORDER == __PDP_ENDIAN /* fields in third byte */ unsigned rd :1; /*%< recursion desired */ unsigned tc :1; /*%< truncated message */ diff --git a/resolv/resolv.h b/resolv/resolv.h index f55e7ce..d34469d 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -72,16 +72,16 @@ typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } res_sendhookact; typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, - const u_char **__query, + const unsigned char **__query, int *__querylen, - u_char *__ans, + unsigned char *__ans, int __anssiz, int *__resplen); typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, - const u_char *__query, + const unsigned char *__query, int __querylen, - u_char *__ans, + unsigned char *__ans, int __anssiz, int *__resplen); @@ -104,39 +104,39 @@ typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, struct __res_state { int retrans; /* retransmition time interval */ int retry; /* number of times to retransmit */ - u_long options; /* option flags - see below. */ + unsigned long options; /* option flags - see below. */ int nscount; /* number of name servers */ struct sockaddr_in nsaddr_list[MAXNS]; /* address of name server */ # define nsaddr nsaddr_list[0] /* for backward compatibility */ - u_short id; /* current message id */ + unsigned short id; /* current message id */ /* 2 byte hole here. */ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ char defdname[256]; /* default domain (deprecated) */ - u_long pfcode; /* RES_PRF_ flags - see below. */ + unsigned long pfcode; /* RES_PRF_ flags - see below. */ unsigned ndots:4; /* threshold for initial abs. query */ unsigned nsort:4; /* number of elements in sort_list[] */ unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */ unsigned unused:23; struct { struct in_addr addr; - u_int32_t mask; + uint32_t mask; } sort_list[MAXRESOLVSORT]; /* 4 byte hole here on 64-bit architectures. */ res_send_qhook qhook; /* query hook */ res_send_rhook rhook; /* response hook */ int res_h_errno; /* last one set for this context */ int _vcsock; /* PRIVATE: for res_send VC i/o */ - u_int _flags; /* PRIVATE: see below */ + unsigned int _flags; /* PRIVATE: see below */ /* 4 byte hole here on 64-bit architectures. */ union { char pad[52]; /* On an i386 this means 512b total. */ struct { - u_int16_t nscount; - u_int16_t nsmap[MAXNS]; + uint16_t nscount; + uint16_t nsmap[MAXNS]; int nssocks[MAXNS]; - u_int16_t nscount6; - u_int16_t nsinit; + uint16_t nscount6; + uint16_t nsinit; struct sockaddr_in6 *nsaddrs[MAXNS]; #ifdef _LIBC unsigned long long int initstamp @@ -264,20 +264,24 @@ __END_DECLS #define res_send __res_send __BEGIN_DECLS -void fp_nquery (const u_char *, int, FILE *) __THROW; -void fp_query (const u_char *, FILE *) __THROW; +void fp_nquery (const unsigned char *, int, FILE *) __THROW; +void fp_query (const unsigned char *, FILE *) __THROW; const char * hostalias (const char *) __THROW; -void p_query (const u_char *) __THROW; +void p_query (const unsigned char *) __THROW; void res_close (void) __THROW; int res_init (void) __THROW; int res_isourserver (const struct sockaddr_in *) __THROW; -int res_mkquery (int, const char *, int, int, const u_char *, - int, const u_char *, u_char *, int) __THROW; -int res_query (const char *, int, int, u_char *, int) __THROW; +int res_mkquery (int, const char *, int, int, + const unsigned char *, int, const unsigned char *, + unsigned char *, int) __THROW; +int res_query (const char *, int, int, unsigned char *, int) + __THROW; int res_querydomain (const char *, const char *, int, int, - u_char *, int) __THROW; -int res_search (const char *, int, int, u_char *, int) __THROW; -int res_send (const u_char *, int, u_char *, int) __THROW; + unsigned char *, int) __THROW; +int res_search (const char *, int, int, unsigned char *, int) + __THROW; +int res_send (const unsigned char *, int, unsigned char *, int) + __THROW; __END_DECLS #define b64_ntop __b64_ntop @@ -330,56 +334,65 @@ int res_dnok (const char *) __THROW; int sym_ston (const struct res_sym *, const char *, int *) __THROW; const char * sym_ntos (const struct res_sym *, int, int *) __THROW; const char * sym_ntop (const struct res_sym *, int, int *) __THROW; -int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; -int b64_pton (char const *, u_char *, size_t) __THROW; -int loc_aton (const char *__ascii, u_char *__binary) __THROW; -const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; -int dn_skipname (const u_char *, const u_char *) __THROW; -void putlong (u_int32_t, u_char *) __THROW; -void putshort (u_int16_t, u_char *) __THROW; +int b64_ntop (const unsigned char *, size_t, char *, size_t) + __THROW; +int b64_pton (char const *, unsigned char *, size_t) __THROW; +int loc_aton (const char *__ascii, unsigned char *__binary) __THROW; +const char * loc_ntoa (const unsigned char *__binary, char *__ascii) __THROW; +int dn_skipname (const unsigned char *, const unsigned char *) + __THROW; +void putlong (uint32_t, unsigned char *) __THROW; +void putshort (uint16_t, unsigned char *) __THROW; const char * p_class (int) __THROW; -const char * p_time (u_int32_t) __THROW; +const char * p_time (uint32_t) __THROW; const char * p_type (int) __THROW; const char * p_rcode (int) __THROW; -const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) - __THROW; -const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; -const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, - int, char *, int) __THROW; -const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; -const char * p_option (u_long __option) __THROW; -char * p_secstodate (u_long) __THROW; +const unsigned char * p_cdnname (const unsigned char *, + const unsigned char *, int, FILE *) __THROW; +const unsigned char * p_cdname (const unsigned char *, const unsigned char *, + FILE *) __THROW; +const unsigned char * p_fqnname (const unsigned char *__cp, + const unsigned char *__msg, + int, char *, int) __THROW; +const unsigned char * p_fqname (const unsigned char *, + const unsigned char *, FILE *) __THROW; +const char * p_option (unsigned long __option) __THROW; +char * p_secstodate (unsigned long) __THROW; int dn_count_labels (const char *) __THROW; -int dn_comp (const char *, u_char *, int, u_char **, u_char **) - __THROW; -int dn_expand (const u_char *, const u_char *, const u_char *, - char *, int) __THROW; -u_int res_randomid (void) __THROW; +int dn_comp (const char *, unsigned char *, int, unsigned char **, + unsigned char **) __THROW; +int dn_expand (const unsigned char *, const unsigned char *, + const unsigned char *, char *, int) __THROW; +unsigned int res_randomid (void) __THROW; int res_nameinquery (const char *, int, int, - const u_char *, const u_char *) __THROW; -int res_queriesmatch (const u_char *, const u_char *, - const u_char *, const u_char *) __THROW; + const unsigned char *, + const unsigned char *) __THROW; +int res_queriesmatch (const unsigned char *, + const unsigned char *, + const unsigned char *, + const unsigned char *) __THROW; const char * p_section (int __section, int __opcode) __THROW; /* Things involving a resolver context. */ int res_ninit (res_state) __THROW; int res_nisourserver (const res_state, const struct sockaddr_in *) __THROW; void fp_resstat (const res_state, FILE *) __THROW; -void res_npquery (const res_state, const u_char *, int, FILE *) - __THROW; +void res_npquery (const res_state, const unsigned char *, int, + FILE *) __THROW; const char * res_hostalias (const res_state, const char *, char *, size_t) __THROW; -int res_nquery (res_state, const char *, int, int, u_char *, int) - __THROW; -int res_nsearch (res_state, const char *, int, int, u_char *, int) - __THROW; +int res_nquery (res_state, const char *, int, int, + unsigned char *, int) __THROW; +int res_nsearch (res_state, const char *, int, int, + unsigned char *, int) __THROW; int res_nquerydomain (res_state, const char *, const char *, int, - int, u_char *, int) __THROW; + int, unsigned char *, int) __THROW; int res_nmkquery (res_state, int, const char *, int, int, - const u_char *, int, const u_char *, u_char *, - int) __THROW; -int res_nsend (res_state, const u_char *, int, u_char *, int) + const unsigned char *, int, + const unsigned char *, unsigned char *, int) __THROW; +int res_nsend (res_state, const unsigned char *, int, + unsigned char *, int) __THROW; void res_nclose (res_state) __THROW; __END_DECLS #endif diff --git a/sunrpc/rpc/rpc_des.h b/sunrpc/rpc/rpc_des.h index 4b3c426..2091f52 100644 --- a/sunrpc/rpc/rpc_des.h +++ b/sunrpc/rpc/rpc_des.h @@ -53,15 +53,15 @@ enum desmode */ struct desparams { - u_char des_key[8]; /* key (with low bit parity) */ + unsigned char des_key[8]; /* key (with low bit parity) */ enum desdir des_dir; /* direction */ enum desmode des_mode; /* mode */ - u_char des_ivec[8]; /* input vector */ + unsigned char des_ivec[8]; /* input vector */ unsigned des_len; /* number of bytes to crypt */ union { - u_char UDES_data[DES_QUICKLEN]; - u_char *UDES_buf; + unsigned char UDES_data[DES_QUICKLEN]; + unsigned char *UDES_buf; } UDES; #define des_data UDES.UDES_data /* direct data here if quick */ diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h index 3cb7f84..762d3f5 100644 --- a/sysdeps/unix/sysv/linux/netrose/rose.h +++ b/sysdeps/unix/sysv/linux/netrose/rose.h @@ -21,6 +21,9 @@ #ifndef _NETROSE_ROSE_H #define _NETROSE_ROSE_H 1 +#include +#include + /* Socket level values. */ #define SOL_ROSE 260 diff --git a/sysdeps/unix/sysv/linux/sys/quota.h b/sysdeps/unix/sysv/linux/sys/quota.h index 316febe..aac9f23 100644 --- a/sysdeps/unix/sysv/linux/sys/quota.h +++ b/sysdeps/unix/sysv/linux/sys/quota.h @@ -219,7 +219,7 @@ struct dqinfo __BEGIN_DECLS extern int quotactl (int __cmd, const char *__special, int __id, - caddr_t __addr) __THROW; + __caddr_t __addr) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index 3286997..d037213 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -35,7 +35,7 @@ enum __BEGIN_DECLS /* Return file descriptor for new interval timer source. */ -extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; +extern int timerfd_create (__clockid_t __clock_id, int __flags) __THROW; /* Set next expiration time of interval timer source UFD to UTMR. If FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h index 70bd7a6..0392662 100644 --- a/sysvipc/sys/ipc.h +++ b/sysvipc/sys/ipc.h @@ -20,10 +20,6 @@ #include -#if !defined __USE_MISC && !defined __USE_XOPEN && __GNUC__ >= 2 -# warning "Files using this header must be compiled with _GNU_SOURCE or _XOPEN_SOURCE" -#endif - /* Get system dependent definition of `struct ipc_perm' and more. */ #include #include