From f0171d33b464dee5ac308f1d13ede2ddd9d030a7 Mon Sep 17 00:00:00 2001
From: avos <avos@FreeBSD.org>
Date: Mon, 18 Apr 2016 21:05:15 +0000
Subject: libc: do not include <sys/types.h> where <sys/param.h> was already
 included

According to style(9):
> normally, include <sys/types.h> OR <sys/param.h>, but not both.
(<sys/param.h> already includes <sys/types.h> when LOCORE is not defined).
---
 lib/libc/db/btree/bt_split.c      | 1 -
 lib/libc/gen/arc4random.c         | 1 -
 lib/libc/gen/devname.c            | 3 +--
 lib/libc/gen/exec.c               | 1 -
 lib/libc/gen/getnetgrent.c        | 3 +--
 lib/libc/gen/setproctitle.c       | 1 -
 lib/libc/inet/inet_addr.c         | 1 -
 lib/libc/inet/inet_ntop.c         | 1 -
 lib/libc/inet/inet_pton.c         | 1 -
 lib/libc/inet/nsap_addr.c         | 1 -
 lib/libc/isc/eventlib_p.h         | 1 -
 lib/libc/net/base64.c             | 1 -
 lib/libc/net/ether_addr.c         | 1 -
 lib/libc/net/eui64.c              | 3 +--
 lib/libc/net/getaddrinfo.c        | 1 -
 lib/libc/net/gethostbydns.c       | 1 -
 lib/libc/net/getprotoent.c        | 1 -
 lib/libc/net/getservent.c         | 1 -
 lib/libc/net/hesiod.c             | 1 -
 lib/libc/net/ip6opt.c             | 1 -
 lib/libc/net/map_v4v6.c           | 1 -
 lib/libc/net/rthdr.c              | 1 -
 lib/libc/net/sourcefilter.c       | 1 -
 lib/libc/resolv/herror.c          | 1 -
 lib/libc/resolv/res_comp.c        | 1 -
 lib/libc/resolv/res_data.c        | 1 -
 lib/libc/resolv/res_debug.c       | 1 -
 lib/libc/resolv/res_init.c        | 1 -
 lib/libc/resolv/res_mkquery.c     | 1 -
 lib/libc/resolv/res_mkupdate.c    | 1 -
 lib/libc/resolv/res_query.c       | 1 -
 lib/libc/resolv/res_send.c        | 1 -
 lib/libc/rpc/getrpcent.c          | 1 -
 lib/libc/rpc/rpc_generic.c        | 1 -
 lib/libc/rpc/svc_vc.c             | 1 -
 lib/libc/secure/stack_protector.c | 1 -
 lib/libc/stdlib/rand.c            | 1 -
 lib/libc/xdr/xdr_float.c          | 1 -
 lib/libc/yp/yplib.c               | 1 -
 39 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index d42105d..fc7dded 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <limits.h>
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 59c4f7f..a22e290 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index bf95645..120c284 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -33,14 +33,13 @@ static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 
 char *
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index c6731f7..e20ff42 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 4bf0a14..0dcf2a2 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -85,9 +85,8 @@ __FBSDID("$FreeBSD$");
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <sys/errno.h>
 static char *_netgr_yp_domain;
 int _use_only_yp;
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 2cde895..f934aea 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -19,7 +19,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index 9744fb6..2f97175 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <netinet/in.h>
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index ac5ebc4..22f1db2 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$");
 #include "port_before.h"
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index 04b515f..852a613 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -23,7 +23,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index af0180f..015ab50 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -23,7 +23,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
index 8620aeb..07db816 100644
--- a/lib/libc/isc/eventlib_p.h
+++ b/lib/libc/isc/eventlib_p.h
@@ -27,7 +27,6 @@
 #define _EVENTLIB_P_H
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 2c4cfe3..998c3c2 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -43,7 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 19d10ac..19aa6f6 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
index bb3077f..2c2c4ea 100644
--- a/lib/libc/net/eui64.c
+++ b/lib/libc/net/eui64.c
@@ -72,11 +72,10 @@ __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <paths.h>
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/eui64.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #ifdef YP
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 88a172c..c399b84 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -55,7 +55,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index ac93abe..872ea05 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -56,7 +56,6 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index 114069a..41ff896 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -34,7 +34,6 @@ static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index d373dd3..5614588 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -34,7 +34,6 @@ static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <db.h>
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index 4258993..0966b6d 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -51,7 +51,6 @@ static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Ex
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 2f0c51d..fda2cd4 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index 327d6b4..d9329ec 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -55,7 +55,6 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 3b2ebba..d91c98a 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index cb64701..50a73d8 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index aeb308c..d1f3a25 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include "port_before.h"
 
 #include "namespace.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 279ea23..d82ef80 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -72,7 +72,6 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index e2f905f..6b83df2 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -23,7 +23,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index 3764601..2017909 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 9856322..1e7d9fe 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 349160f..43e46c1 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -72,7 +72,6 @@ static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 79402a7..9a7a129 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <netinet/in.h>
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 5992edd..db26ef8 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -72,7 +72,6 @@ static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka E
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index c127c3b..e47562b 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "namespace.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 2bfe1ab..97457d3 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index fe970e1..619fbf1 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index e81a839..0f1c5bf 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
diff --git a/lib/libc/secure/stack_protector.c b/lib/libc/secure/stack_protector.c
index cd5f166..d55813e 100644
--- a/lib/libc/secure/stack_protector.c
+++ b/lib/libc/secure/stack_protector.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <link.h>
 #include <signal.h>
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index b8871a2..eb3c10a 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/sysctl.h>
-#include <sys/types.h>
 #include <stdlib.h>
 #include "un-namespace.h"
 
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 723a81d..cc4dd2d 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "namespace.h"
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 1a6df69..b04966f 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/uio.h>
-- 
cgit v1.1