diff options
author | pst <pst@FreeBSD.org> | 1995-08-23 05:19:00 +0000 |
---|---|---|
committer | pst <pst@FreeBSD.org> | 1995-08-23 05:19:00 +0000 |
commit | 9b679aa62fc3155bb9c9458503e20b0c7de0d116 (patch) | |
tree | 6376e165cc2daafa809ca42b26dc0f944ecdd804 /usr.sbin | |
parent | 502722c9914cb20f9c5b776855a1781164cb3956 (diff) | |
download | FreeBSD-src-9b679aa62fc3155bb9c9458503e20b0c7de0d116.zip FreeBSD-src-9b679aa62fc3155bb9c9458503e20b0c7de0d116.tar.gz |
Clean up compilation warnings.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/print-nfs.c | 8 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpslice/gwtm2secs.c | 4 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpslice/search.c | 4 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpslice/tcpslice.c | 4 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpslice/util.c | 4 |
5 files changed, 13 insertions, 11 deletions
diff --git a/usr.sbin/tcpdump/tcpdump/print-nfs.c b/usr.sbin/tcpdump/tcpdump/print-nfs.c index e5e4361..51226ed 100644 --- a/usr.sbin/tcpdump/tcpdump/print-nfs.c +++ b/usr.sbin/tcpdump/tcpdump/print-nfs.c @@ -21,7 +21,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Header: print-nfs.c,v 1.41 94/06/12 14:35:15 leres Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/print-nfs.c,v 1.3 1995/03/08 12:52:36 olah Exp $ (LBL)"; #endif #include <sys/param.h> @@ -568,6 +568,9 @@ parserep(register const struct rpc_msg *rp, register int length) #define T2CHECK(p, l) if ((u_char *)(p) > ((u_char *)snapend) - l) return(0) +#if defined(BSD) && (BSD >= 199103) +#define strerr strerror +#else /* * Not all systems have strerror(). */ @@ -575,15 +578,14 @@ static char * strerr(int errno) { extern int sys_nerr; -#ifndef __FreeBSD__ /* Conflicts with declaration in <stdio.h> */ extern char *sys_errlist[]; -#endif if (errno < sys_nerr) return (sys_errlist[errno]); return (0); } +#endif static const u_int32 * parsestatus(const u_int32 *dp) diff --git a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c index 797c1fc..51ea194 100644 --- a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c +++ b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c @@ -18,9 +18,9 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint +#if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#)$Header: gwtm2secs.c,v 1.2 93/11/18 13:11:30 vern Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.2 1995/03/08 12:53:38 olah Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/search.c b/usr.sbin/tcpdump/tcpslice/search.c index b6f75e0..b546158 100644 --- a/usr.sbin/tcpdump/tcpslice/search.c +++ b/usr.sbin/tcpdump/tcpslice/search.c @@ -18,9 +18,9 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint +#if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#)$Header: search.c,v 1.8 93/11/18 13:11:51 vern Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/search.c,v 1.2 1995/03/08 12:53:39 olah Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.c b/usr.sbin/tcpdump/tcpslice/tcpslice.c index 5be4b87..2c807f6 100644 --- a/usr.sbin/tcpdump/tcpslice/tcpslice.c +++ b/usr.sbin/tcpdump/tcpslice/tcpslice.c @@ -18,11 +18,11 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint +#if !defined(lint) && !defined(__GNUC__) char copyright[] = "@(#) Copyright (c) 1987-1990 The Regents of the University of California.\nAll rights reserved.\n"; static char rcsid[] = - "@(#)$Header: tcpslice.c,v 1.13 93/11/18 13:12:02 vern Exp $ (LBL)"; + "@(#)$Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.2 1995/03/08 12:53:40 olah Exp $ (LBL)"; #endif /* diff --git a/usr.sbin/tcpdump/tcpslice/util.c b/usr.sbin/tcpdump/tcpslice/util.c index 3e7cb49..6596f6e 100644 --- a/usr.sbin/tcpdump/tcpslice/util.c +++ b/usr.sbin/tcpdump/tcpslice/util.c @@ -19,9 +19,9 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint +#if !defined(lint) && !defined(__GNUC__) static char rcsid[] = - "@(#) $Header: util.c,v 1.2 93/11/18 13:11:07 vern Exp $ (LBL)"; + "@(#) $Header: /home/ncvs/src/usr.sbin/tcpdump/tcpslice/util.c,v 1.1 1995/03/08 12:53:42 olah Exp $ (LBL)"; #endif #include "tcpslice.h" |