Cleanup of netatalk atalk layer includes, protocol definitions, and

routing:

- style(9) cleanup -- white space, braces, etc.

- Make include guards consistent with our more general naming
  convention.

- Rearrange and complete forward structure declarations in at_extern.h,
  remove testing of guards of various other include files to protect
  function declarations.

This leaves an ifdef _KERNEL in at_var.h, but from inspection it seems
likely that this file is not actually safe for inclusion in user space
still.  However, since it's not included from within src/ so this does
not appear to be an issue (ifconfig, etc, have migrated to the generic
cross-protocol ioctls for address operations).

1 files changed, 36 insertions, 36 deletions

diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 866b2f8..5a944c1 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -23,64 +23,64 @@
  * $FreeBSD$
  */
 
-#ifndef __AT_HEADER__
-#define __AT_HEADER__
+#ifndef _NETATALK_AT_H_
+#define	_NETATALK_AT_H_
+
 /*
  * Supported protocols
  */
-#define ATPROTO_DDP	0
-#define ATPROTO_AARP	254
+#define	ATPROTO_DDP	0
+#define	ATPROTO_AARP	254
 
-#define DDP_MAXSZ	587
+#define	DDP_MAXSZ	587
 
 /*
- * If ATPORT_FIRST <= Port < ATPORT_RESERVED,
- * Port was created by a privileged process.
- * If ATPORT_RESERVED <= Port < ATPORT_LAST,
- * Port was not necessarily created by a
+ * If ATPORT_FIRST <= Port < ATPORT_RESERVED, the port was created by a
  * privileged process.
+ *
+ * If ATPORT_RESERVED <= Port < ATPORT_LAST, the port was not necessarily
+ * created by a privileged process.
  */
-#define ATPORT_FIRST	1
-#define ATPORT_RESERVED	128
-#define ATPORT_LAST	255
+#define	ATPORT_FIRST	1
+#define	ATPORT_RESERVED	128
+#define	ATPORT_LAST	255
 
 /*
  * AppleTalk address.
  */
 struct at_addr {
-    u_short	s_net;
-    u_char	s_node;
+	u_short	s_net;
+	u_char	s_node;
 };
 
-#define ATADDR_ANYNET	(u_short)0x0000
-#define ATADDR_ANYNODE	(u_char)0x00
-#define ATADDR_ANYPORT	(u_char)0x00
-#define ATADDR_BCAST	(u_char)0xff		/* There is no BCAST for NET */
+#define	ATADDR_ANYNET	(u_short)0x0000
+#define	ATADDR_ANYNODE	(u_char)0x00
+#define	ATADDR_ANYPORT	(u_char)0x00
+#define	ATADDR_BCAST	(u_char)0xff	/* There is no BCAST for NET. */
 
 struct netrange {
-    u_char		nr_phase;
-    u_short		nr_firstnet;
-    u_short		nr_lastnet;
+	u_char	nr_phase;
+	u_short	nr_firstnet;
+	u_short	nr_lastnet;
 };
 
 /*
- * Socket address, AppleTalk style.  We keep magic information in the 
- * zero bytes.  There are three types, NONE, CONFIG which has the phase
- * and a net range, and IFACE which has the network address of an
- * interface.  IFACE may be filled in by the client, and is filled in
- * by the kernel.
+ * Socket address, AppleTalk style.  We keep magic information in the zero
+ * bytes.  There are three types, NONE, CONFIG which has the phase and a net
+ * range, and IFACE which has the network address of an interface.  IFACE may
+ * be filled in by the client, and is filled in by the kernel.
  */
 struct sockaddr_at {
-    u_char		sat_len;
-    u_char		sat_family;
-    u_char		sat_port;
-    struct at_addr	sat_addr;
-    union {
-	struct netrange r_netrange;
-    	char		r_zero[ 8 ];	/* Hide a struct netrange in here */
-    } sat_range;
+	u_char		sat_len;
+	u_char		sat_family;
+	u_char		sat_port;
+	struct at_addr	sat_addr;
+	union {
+		struct netrange	r_netrange;
+		char		r_zero[8];	/* Hide struct netrange here. */
+	} sat_range;
 };
 
-#define sat_zero sat_range.r_zero
+#define	sat_zero	sat_range.r_zero
 
-#endif /* !__AT_HEADER__ */
+#endif /* !_NETATALK_AT_H_ */