diff options
| author | 2015-01-16 06:39:28 +0000 | |
|---|---|---|
| committer | 2015-01-16 06:39:28 +0000 | |
| commit | b9fc9a728fce9c4289b7e9a992665e28d5629a54 (patch) | |
| tree | 72b2433e418dfa1aef5fcf8305617b97979a25d8 /usr.sbin/tcpdump/print-atalk.c | |
| parent | improve checksum parsing slightly. now handles filenames with spaces. (diff) | |
| download | wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.tar.xz wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.zip | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'usr.sbin/tcpdump/print-atalk.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-atalk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c index d8639b57ba4..513267660be 100644 --- a/usr.sbin/tcpdump/print-atalk.c +++ b/usr.sbin/tcpdump/print-atalk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-atalk.c,v 1.27 2014/08/14 12:44:44 mpi Exp $ */ +/* $OpenBSD: print-atalk.c,v 1.28 2015/01/16 06:40:21 deraadt Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,6 @@ * Format and print AppleTalk packets. */ -#include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> @@ -43,6 +42,7 @@ struct rtentry; #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "interface.h" #include "addrtoname.h" @@ -556,7 +556,7 @@ static void init_atalk(void) { struct hnamemem *tp; - char nambuf[MAXHOSTNAMELEN + 20]; + char nambuf[HOST_NAME_MAX+1 + 20]; char line[BUFSIZ]; int i1, i2, i3; @@ -587,7 +587,7 @@ ataddr_string(u_short atnet, u_char athost) { register struct hnamemem *tp, *tp2; register int i = (atnet << 8) | athost; - char nambuf[MAXHOSTNAMELEN + 20]; + char nambuf[HOST_NAME_MAX+1 + 20]; static int first = 1; if (first) { |
