X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..9f957a5883cb4c5c99cefa71b42fc9d2d27d73e1:/print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 869fbcb9..e3ddcc04 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -37,9 +37,9 @@
  */
 #define FIREWIRE_EUI64_LEN	8
 struct firewire_header {
-	u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
-	u_char  firewire_shost[FIREWIRE_EUI64_LEN];
-	u_short firewire_type;
+	nd_byte     firewire_dhost[FIREWIRE_EUI64_LEN];
+	nd_byte     firewire_shost[FIREWIRE_EUI64_LEN];
+	nd_uint16_t firewire_type;
 };
 
 /*
@@ -56,9 +56,9 @@ fwaddr_string(netdissect_options *ndo, const u_char *addr)
 }
 
 static inline void
-ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
+ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
-	register const struct firewire_header *fp;
+	const struct firewire_header *fp;
 	uint16_t firewire_type;
 
 	fp = (const struct firewire_header *)bp;
@@ -67,7 +67,7 @@ ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int lengt
 		     fwaddr_string(ndo, fp->firewire_shost),
 		     fwaddr_string(ndo, fp->firewire_dhost)));
 
-	firewire_type = EXTRACT_BE_U_2(&fp->firewire_type);
+	firewire_type = EXTRACT_BE_U_2(fp->firewire_type);
 	if (!ndo->ndo_qflag) {
 		ND_PRINT((ndo, ", ethertype %s (0x%04x)",
 			       tok2str(ethertype_values,"Unknown", firewire_type),
@@ -107,7 +107,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 	fp = (const struct firewire_header *)p;
 	p += FIREWIRE_HDRLEN;
 
-	ether_type = EXTRACT_BE_U_2(&fp->firewire_type);
+	ether_type = EXTRACT_BE_U_2(fp->firewire_type);
 	src.addr = fp->firewire_shost;
 	src.addr_string = fwaddr_string;
 	dst.addr = fp->firewire_dhost;