diff options
author | fenner <fenner@FreeBSD.org> | 1997-05-27 02:17:42 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 1997-05-27 02:17:42 +0000 |
commit | a45d5a033f69ab70d6de3ead1e8c6fd59f87352b (patch) | |
tree | be1f1538067d8b764f3c8883470f914b73adcec2 /contrib/tcpdump/print-ntp.c | |
parent | 3ff0e744409afb9167d172e5c627942dd28ad80f (diff) | |
download | FreeBSD-src-a45d5a033f69ab70d6de3ead1e8c6fd59f87352b.zip FreeBSD-src-a45d5a033f69ab70d6de3ead1e8c6fd59f87352b.tar.gz |
Merge tcpdump 3.3.
The print_nfs.c changes are pretty extensive; this is partially because
LBL did a lot of cleanup and partially because I removed lots of
pointless changes away from the LBL style.
PR: 3371
mostly-Submitted by: Chris Timmons <skynyrd@opus.cts.cwu.edu>
Diffstat (limited to 'contrib/tcpdump/print-ntp.c')
-rw-r--r-- | contrib/tcpdump/print-ntp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c index eedca7a..926691c 100644 --- a/contrib/tcpdump/print-ntp.c +++ b/contrib/tcpdump/print-ntp.c @@ -24,8 +24,8 @@ */ #ifndef lint -static char rcsid[] = - "@(#) $Header: print-ntp.c,v 1.23 96/07/23 14:17:26 leres Exp $ (LBL)"; +static const char rcsid[] = + "@(#) $Header: print-ntp.c,v 1.25 96/11/05 13:30:37 leres Exp $ (LBL)"; #endif #include <sys/param.h> @@ -71,7 +71,7 @@ ntp_print(register const u_char *cp, u_int length) TCHECK(bp->status); - version = (bp->status & VERSIONMASK) >> 3; + version = (int)(bp->status & VERSIONMASK) >> 3; printf(" v%d", version); leapind = bp->status & LEAPMASK; |