X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ea0d29f7436f5a919d16009790c9b38c2c86e96f..0023eaa78f123676bfa9c5fba72ea4b8a59aaa70:/print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 1f2af363..1f067ed6 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,9 +21,7 @@
 
 /* \summary: AppleTalk printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -51,9 +49,9 @@ struct aarp {
 	nd_uint16_t	htype, ptype;
 	nd_uint8_t	halen, palen;
 	nd_uint16_t	op;
-	uint8_t		hsaddr[MAC_ADDR_LEN];
+	nd_mac_addr	hsaddr;
 	uint8_t		psaddr[4];
-	uint8_t		hdaddr[MAC_ADDR_LEN];
+	nd_mac_addr	hdaddr;
 	uint8_t		pdaddr[4];
 };
 
@@ -636,7 +634,7 @@ ataddr_string(netdissect_options *ndo,
 					if (tp->name == NULL)
 						(*ndo->ndo_error)(ndo,
 						    S_ERR_ND_MEM_ALLOC,
-						    "ataddr_string: strdup(nambuf)");
+						    "%s: strdup(nambuf)", __func__);
 				}
 				fclose(fp);
 			}
@@ -661,7 +659,7 @@ ataddr_string(netdissect_options *ndo,
 			tp->name = strdup(nambuf);
 			if (tp->name == NULL)
 				(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-					"ataddr_string: strdup(nambuf)");
+					"%s: strdup(nambuf)", __func__);
 			return (tp->name);
 		}
 
@@ -674,7 +672,7 @@ ataddr_string(netdissect_options *ndo,
 	tp->name = strdup(nambuf);
 	if (tp->name == NULL)
 		(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
-				  "ataddr_string: strdup(nambuf)");
+				  "%s: strdup(nambuf)", __func__);
 
 	return (tp->name);
 }