style(9) the structure definitions.

18 files changed, 31 insertions, 29 deletions

diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index c88920d4f96f..70a2029db356 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
  */
 
 #ifndef _ARPA_TFTP_H_
@@ -50,7 +51,7 @@
 #define	ACK	04			/* acknowledgement */
 #define	ERROR	05			/* error code */
 
-struct	tftphdr {
+struct tftphdr {
 	unsigned short	th_opcode;		/* packet type */
 	union {
 		unsigned short	tu_block;	/* block # */
diff --git a/include/disktab.h b/include/disktab.h
index 55f0f4625c7c..1b9a7c7e5161 100644
--- a/include/disktab.h
+++ b/include/disktab.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disktab.h	8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
  */
 
 #ifndef	_DISKTAB_H_
@@ -41,7 +42,7 @@
  */
 #define	DISKTAB		"/etc/disktab"
 
-struct	disktab {
+struct disktab {
 	char	*d_name;		/* drive name */
 	char	*d_type;		/* drive type */
 	int	d_secsize;		/* sector size in bytes */
diff --git a/include/link.h b/include/link.h
index 2339aeeade36..9d652e252901 100644
--- a/include/link.h
+++ b/include/link.h
@@ -218,7 +218,7 @@ struct ld_entry {
  * `nz_list' type of symbols.
  */
 
-struct	_dynamic {
+struct _dynamic {
 	int		d_version;	/* version # of this interface */
 	struct so_debug	*d_debug;
 	union {
diff --git a/include/netdb.h b/include/netdb.h
index b80f6ed42985..f2196f2c9b26 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -84,7 +84,7 @@ extern int h_errno;
  * supplied in host order, and returned in network order (suitable for
  * use in system calls).
  */
-struct	hostent {
+struct hostent {
 	char	*h_name;	/* official name of host */
 	char	**h_aliases;	/* alias list */
 	int	h_addrtype;	/* host address type */
@@ -97,21 +97,21 @@ struct	hostent {
  * Assumption here is that a network number
  * fits in an unsigned long -- probably a poor one.
  */
-struct	netent {
+struct netent {
 	char		*n_name;	/* official name of net */
 	char		**n_aliases;	/* alias list */
 	int		n_addrtype;	/* net address type */
 	unsigned long	n_net;		/* network # */
 };
 
-struct	servent {
+struct servent {
 	char	*s_name;	/* official service name */
 	char	**s_aliases;	/* alias list */
 	int	s_port;		/* port # */
 	char	*s_proto;	/* protocol to use */
 };
 
-struct	protoent {
+struct protoent {
 	char	*p_name;	/* official protocol name */
 	char	**p_aliases;	/* alias list */
 	int	p_proto;	/* protocol # */
diff --git a/sys/alpha/include/sigframe.h b/sys/alpha/include/sigframe.h
index bc445a938a64..4ed62f4d75cb 100644
--- a/sys/alpha/include/sigframe.h
+++ b/sys/alpha/include/sigframe.h
@@ -31,7 +31,7 @@
 #ifndef _MACHINE_SIGFRAME_H_
 #define _MACHINE_SIGFRAME_H_ 1
 
-struct	osigframe {
+struct osigframe {
 	struct osigcontext	sf_sc;
 	osiginfo_t		sf_si;
 };
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 02a4bfd2e56c..4bc7b29a0c7f 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -75,7 +75,7 @@ struct  osigcontext {
  * The sequence of the fields should match those in
  * mcontext_t. Keep them in sync!
  */
-struct	sigcontext {
+struct sigcontext {
 	sigset_t sc_mask;		/* signal mask to restore */
 	long	sc_onstack;             /* sigstack state to restore */
 	unsigned long sc_regs[32];	/* integer register set (see above) */
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 1474f2f41a79..67ce66121782 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -46,7 +46,7 @@
 #define	_MACHINE_NPX_H_
 
 /* Environment information of floating point unit */
-struct	env87 {
+struct env87 {
 	long	en_cw;		/* control word (16bits) */
 	long	en_sw;		/* status word (16bits) */
 	long	en_tw;		/* tag word (16bits) */
@@ -58,7 +58,7 @@ struct	env87 {
 };
 
 /* Contents of each floating point accumulator */
-struct	fpacc87 {
+struct fpacc87 {
 #ifdef dontdef /* too unportable */
 	u_long	fp_mantlo;	/* mantissa low (31:0) */
 	u_long	fp_manthi;	/* mantissa high (63:32) */
@@ -70,7 +70,7 @@ struct	fpacc87 {
 };
 
 /* Floating point context */
-struct	save87 {
+struct save87 {
 	struct	env87 sv_env;	/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
 	u_long	sv_ex_sw;	/* status word for last exception */
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index 1474f2f41a79..67ce66121782 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/include/npx.h
@@ -46,7 +46,7 @@
 #define	_MACHINE_NPX_H_
 
 /* Environment information of floating point unit */
-struct	env87 {
+struct env87 {
 	long	en_cw;		/* control word (16bits) */
 	long	en_sw;		/* status word (16bits) */
 	long	en_tw;		/* tag word (16bits) */
@@ -58,7 +58,7 @@ struct	env87 {
 };
 
 /* Contents of each floating point accumulator */
-struct	fpacc87 {
+struct fpacc87 {
 #ifdef dontdef /* too unportable */
 	u_long	fp_mantlo;	/* mantissa low (31:0) */
 	u_long	fp_manthi;	/* mantissa high (63:32) */
@@ -70,7 +70,7 @@ struct	fpacc87 {
 };
 
 /* Floating point context */
-struct	save87 {
+struct save87 {
 	struct	env87 sv_env;	/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
 	u_long	sv_ex_sw;	/* status word for last exception */
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
index cf764530c0cd..27be404b8a11 100644
--- a/sys/amd64/include/sigframe.h
+++ b/sys/amd64/include/sigframe.h
@@ -35,7 +35,7 @@
  * Signal frames, arguments passed to application signal handlers.
  */
 
-struct	osigframe {
+struct osigframe {
 	/*
 	 * The first four members may be used by applications.
 	 */
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 1e91f6042564..74accc8d0efd 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -62,7 +62,7 @@ typedef int sig_atomic_t;
  */
 typedef unsigned int osigset_t;
 
-struct	osigcontext {
+struct osigcontext {
 	int	sc_onstack;		/* sigstack state to restore */
 	osigset_t sc_mask;		/* signal mask to restore */
 	int	sc_esp;			/* machine state follows: */
@@ -90,7 +90,7 @@ struct	osigcontext {
  * The sequence of the fields/registers in struct sigcontext should match
  * those in mcontext_t.
  */
-struct	sigcontext {
+struct sigcontext {
 	sigset_t sc_mask;		/* signal mask to restore */
 	int	sc_onstack;		/* sigstack state to restore */
 	int	sc_gs;			/* machine state (struct trapframe): */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 1474f2f41a79..67ce66121782 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -46,7 +46,7 @@
 #define	_MACHINE_NPX_H_
 
 /* Environment information of floating point unit */
-struct	env87 {
+struct env87 {
 	long	en_cw;		/* control word (16bits) */
 	long	en_sw;		/* status word (16bits) */
 	long	en_tw;		/* tag word (16bits) */
@@ -58,7 +58,7 @@ struct	env87 {
 };
 
 /* Contents of each floating point accumulator */
-struct	fpacc87 {
+struct fpacc87 {
 #ifdef dontdef /* too unportable */
 	u_long	fp_mantlo;	/* mantissa low (31:0) */
 	u_long	fp_manthi;	/* mantissa high (63:32) */
@@ -70,7 +70,7 @@ struct	fpacc87 {
 };
 
 /* Floating point context */
-struct	save87 {
+struct save87 {
 	struct	env87 sv_env;	/* floating point control/status */
 	struct	fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
 	u_long	sv_ex_sw;	/* status word for last exception */
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index cf764530c0cd..27be404b8a11 100644
--- a/sys/i386/include/sigframe.h
+++ b/sys/i386/include/sigframe.h
@@ -35,7 +35,7 @@
  * Signal frames, arguments passed to application signal handlers.
  */
 
-struct	osigframe {
+struct osigframe {
 	/*
 	 * The first four members may be used by applications.
 	 */
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 1e91f6042564..74accc8d0efd 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -62,7 +62,7 @@ typedef int sig_atomic_t;
  */
 typedef unsigned int osigset_t;
 
-struct	osigcontext {
+struct osigcontext {
 	int	sc_onstack;		/* sigstack state to restore */
 	osigset_t sc_mask;		/* signal mask to restore */
 	int	sc_esp;			/* machine state follows: */
@@ -90,7 +90,7 @@ struct	osigcontext {
  * The sequence of the fields/registers in struct sigcontext should match
  * those in mcontext_t.
  */
-struct	sigcontext {
+struct sigcontext {
 	sigset_t sc_mask;		/* signal mask to restore */
 	int	sc_onstack;		/* sigstack state to restore */
 	int	sc_gs;			/* machine state (struct trapframe): */
diff --git a/sys/ia64/include/sigframe.h b/sys/ia64/include/sigframe.h
index 491ce767326e..b0772d75c494 100644
--- a/sys/ia64/include/sigframe.h
+++ b/sys/ia64/include/sigframe.h
@@ -31,7 +31,7 @@
 #ifndef _MACHINE_SIGFRAME_H_
 #define _MACHINE_SIGFRAME_H_ 1
 
-struct	osigframe {
+struct osigframe {
 };
 
 struct sigframe {
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
index 268836c1c02a..6fed9ae7ea7e 100644
--- a/sys/ia64/include/signal.h
+++ b/sys/ia64/include/signal.h
@@ -68,7 +68,7 @@ struct  osigcontext {};
  * The sequence of the fields should match those in
  * mcontext_t. Keep them in sync!
  */
-struct	sigcontext {
+struct sigcontext {
 	sigset_t	sc_mask;		/* signal mask to restore */
 	unsigned long	sc_onstack;
 	unsigned long	sc_flags;
diff --git a/sys/powerpc/include/sigframe.h b/sys/powerpc/include/sigframe.h
index bc445a938a64..4ed62f4d75cb 100644
--- a/sys/powerpc/include/sigframe.h
+++ b/sys/powerpc/include/sigframe.h
@@ -31,7 +31,7 @@
 #ifndef _MACHINE_SIGFRAME_H_
 #define _MACHINE_SIGFRAME_H_ 1
 
-struct	osigframe {
+struct osigframe {
 	struct osigcontext	sf_sc;
 	osiginfo_t		sf_si;
 };
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 2339aeeade36..9d652e252901 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -218,7 +218,7 @@ struct ld_entry {
  * `nz_list' type of symbols.
  */
 
-struct	_dynamic {
+struct _dynamic {
 	int		d_version;	/* version # of this interface */
 	struct so_debug	*d_debug;
 	union {
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 2339aeeade36..9d652e252901 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -218,7 +218,7 @@ struct ld_entry {
  * `nz_list' type of symbols.
  */
 
-struct	_dynamic {
+struct _dynamic {
 	int		d_version;	/* version # of this interface */
 	struct so_debug	*d_debug;
 	union {