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-ipx.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-ipx.c')
| -rw-r--r-- | contrib/tcpdump/print-ipx.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c index 8125e41..d49bcb7 100644 --- a/contrib/tcpdump/print-ipx.c +++ b/contrib/tcpdump/print-ipx.c @@ -17,15 +17,14 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -/* + * * Format and print Novell IPX packets. * Contributed by Brad Parker (brad@fcr.com). */ + #ifndef lint -static char rcsid[] = - "@(#)$Header: print-ipx.c,v 1.16 96/07/23 14:17:24 leres Exp $"; +static const char rcsid[] = + "@(#) $Header: print-ipx.c,v 1.19 96/12/10 23:23:52 leres Exp $"; #endif #include <sys/param.h> @@ -145,7 +144,7 @@ ipx_sap_print(const u_short *ipx, u_int length) if (length > 0) { TCHECK(ipx[1]); (void)printf(" %x '", EXTRACT_16BITS(&ipx[0])); - fn_print((char *)&ipx[1], (char *)&ipx[1] + 48); + fn_print((u_char *)&ipx[1], (u_char *)&ipx[1] + 48); putchar('\''); } break; @@ -160,7 +159,7 @@ ipx_sap_print(const u_short *ipx, u_int length) for (i = 0; i < 8 && length > 0; i++) { TCHECK2(ipx[27], 1); (void)printf(" %x '", EXTRACT_16BITS(&ipx[0])); - fn_print((char *)&ipx[1], (char *)&ipx[1] + 48); + fn_print((u_char *)&ipx[1], (u_char *)&ipx[1] + 48); printf("' addr %s", ipxaddr_string(EXTRACT_32BITS(&ipx[25]), (u_char *)&ipx[27])); ipx += 32; |
