summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libarch/alpha/bwx.c8
-rw-r--r--regress/lib/libpthread/select/select.c12
-rw-r--r--regress/sys/kern/kqueue/kqueue-random.c9
-rw-r--r--sbin/fdisk/disk.c6
-rw-r--r--sbin/fdisk/fdisk.c4
-rw-r--r--sbin/fdisk/user.c4
-rw-r--r--sbin/scan_ffs/scan_ffs.c13
-rw-r--r--usr.bin/vmstat/vmstat.c19
-rw-r--r--usr.sbin/ypbind/ypbind.c29
9 files changed, 52 insertions, 52 deletions
diff --git a/lib/libarch/alpha/bwx.c b/lib/libarch/alpha/bwx.c
index 3647a914cac..4ef9a9c2b47 100644
--- a/lib/libarch/alpha/bwx.c
+++ b/lib/libarch/alpha/bwx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwx.c,v 1.8 2014/12/13 16:26:13 miod Exp $ */
+/* $OpenBSD: bwx.c,v 1.9 2018/04/26 15:55:14 guenther Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
@@ -27,13 +27,13 @@
#include <sys/param.h>
#include <sys/mman.h>
-#include <sys/fcntl.h>
#include <sys/sysctl.h>
-#include <err.h>
-#include <paths.h>
#include <machine/bwx.h>
#include <machine/cpu.h>
#include <machine/sysarch.h>
+#include <err.h>
+#include <fcntl.h>
+#include <paths.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/regress/lib/libpthread/select/select.c b/regress/lib/libpthread/select/select.c
index 5e3f4a61fa0..a2bbd3da25e 100644
--- a/regress/lib/libpthread/select/select.c
+++ b/regress/lib/libpthread/select/select.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: select.c,v 1.3 2003/07/31 21:48:06 deraadt Exp $ */
+/* $OpenBSD: select.c,v 1.4 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996 by Chris Provenzano and contributors,
* proven@mit.edu All rights reserved.
@@ -36,15 +36,15 @@
* Rudimentary test of select().
*/
-#include <pthread.h>
-#include <pthread_np.h>
-#include <stdio.h>
-#include <sys/fcntl.h>
#include <sys/types.h>
#include <sys/time.h>
#include <errno.h>
-#include <unistd.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <pthread_np.h>
+#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include "test.h"
#define NLOOPS 10000
diff --git a/regress/sys/kern/kqueue/kqueue-random.c b/regress/sys/kern/kqueue/kqueue-random.c
index 0825f7bb35d..64b44c12fbe 100644
--- a/regress/sys/kern/kqueue/kqueue-random.c
+++ b/regress/sys/kern/kqueue/kqueue-random.c
@@ -1,14 +1,11 @@
-/* $OpenBSD: kqueue-random.c,v 1.10 2016/09/20 23:05:27 bluhm Exp $ */
+/* $OpenBSD: kqueue-random.c,v 1.11 2018/04/26 15:55:14 guenther Exp $ */
/* Written by Michael Shalayeff, 2002, Public Domain */
-#include <sys/param.h>
+#include <sys/param.h> /* MIN() */
#include <sys/event.h>
-#include <sys/wait.h>
-#include <sys/fcntl.h>
-
-#include <dev/rndvar.h>
#include <err.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index c9c30cf6ec9..415cf450453 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.55 2016/03/09 12:55:18 krw Exp $ */
+/* $OpenBSD: disk.c,v 1.56 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -17,7 +17,6 @@
*/
#include <sys/types.h>
-#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/dkio.h>
#include <sys/stat.h>
@@ -25,8 +24,9 @@
#include <err.h>
#include <errno.h>
-#include <stdio.h>
+#include <fcntl.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <util.h>
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 6c3a51c4399..2d85a7c2a1e 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdisk.c,v 1.102 2016/12/27 15:01:03 krw Exp $ */
+/* $OpenBSD: fdisk.c,v 1.103 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -17,10 +17,10 @@
*/
#include <sys/types.h>
-#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <err.h>
+#include <fcntl.h>
#include <paths.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index fb75301ddc8..0df9928f793 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.50 2016/01/09 18:10:57 krw Exp $ */
+/* $OpenBSD: user.c,v 1.51 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -17,10 +17,10 @@
*/
#include <sys/types.h>
-#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <err.h>
+#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c
index 83d330160d1..cb80daead4f 100644
--- a/sbin/scan_ffs/scan_ffs.c
+++ b/sbin/scan_ffs/scan_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scan_ffs.c,v 1.21 2015/11/23 19:19:30 deraadt Exp $ */
+/* $OpenBSD: scan_ffs.c,v 1.22 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1998 Niklas Hallqvist, Tobias Weingartner
@@ -26,15 +26,16 @@
*/
#include <sys/types.h>
-#include <sys/fcntl.h>
#include <ufs/ffs/fs.h>
-#include <unistd.h>
-#include <stdlib.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <limits.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <limits.h>
-#include <err.h>
+#include <unistd.h>
#include <util.h>
#define SBCOUNT 64 /* XXX - Should be configurable */
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index fcfa4b553d6..efcce024ddf 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
/* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */
-/* $OpenBSD: vmstat.c,v 1.143 2018/04/10 06:34:04 mlarkin Exp $ */
+/* $OpenBSD: vmstat.c,v 1.144 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@@ -35,7 +35,6 @@
#include <sys/proc.h>
#include <sys/namei.h>
#include <sys/malloc.h>
-#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/sysctl.h>
#include <sys/device.h>
@@ -43,19 +42,21 @@
#include <sys/sched.h>
#include <sys/vmmeter.h>
-#include <time.h>
-#include <nlist.h>
-#include <kvm.h>
+#include <ctype.h>
#include <err.h>
#include <errno.h>
-#include <unistd.h>
+#include <fcntl.h>
+#include <kvm.h>
+#include <limits.h>
+#include <nlist.h>
+#include <paths.h>
#include <signal.h>
#include <stdio.h>
-#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#include <paths.h>
-#include <limits.h>
+#include <time.h>
+#include <unistd.h>
+
#include "dkstats.h"
struct nlist namelist[] = {
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index ef85d588728..944daef08d2 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypbind.c,v 1.71 2018/04/26 12:42:51 guenther Exp $ */
+/* $OpenBSD: ypbind.c,v 1.72 2018/04/26 15:55:14 guenther Exp $ */
/*
* Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -29,31 +29,32 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/fcntl.h>
#include <sys/uio.h>
#include <sys/syslog.h>
-#include <net/if.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <netdb.h>
-#include <string.h>
-#include <dirent.h>
+#include <arpa/inet.h>
+#include <net/if.h>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
-#include <arpa/inet.h>
#include <rpc/pmap_clnt.h>
#include <rpc/pmap_prot.h>
#include <rpc/pmap_rmt.h>
-#include <unistd.h>
-#include <err.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
+
+#include <ctype.h>
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
#include <ifaddrs.h>
+#include <limits.h>
+#include <netdb.h>
#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#define SERVERSDIR "/etc/yp"
#define BINDINGDIR "/var/yp/binding"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:14:43 +0000