diff options
| -rw-r--r-- | usr.sbin/tcpdump/interface.h | 9 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-ike.c | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump.c | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h index 0c7de4dd6d1..11f4216c801 100644 --- a/usr.sbin/tcpdump/interface.h +++ b/usr.sbin/tcpdump/interface.h @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.h,v 1.45 2004/05/21 05:48:50 brad Exp $ */ +/* $OpenBSD: interface.h,v 1.46 2004/06/20 17:51:55 avsm Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -20,7 +20,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /home/cvs/src/usr.sbin/tcpdump/interface.h,v 1.45 2004/05/21 05:48:50 brad Exp $ (LBL) + * @(#) $Header: /home/cvs/src/usr.sbin/tcpdump/interface.h,v 1.46 2004/06/20 17:51:55 avsm Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -162,8 +162,9 @@ extern void safeputchar(int); extern void wrapup(int); extern __dead void error(const char *, ...) - __attribute__((volatile, format (printf, 1, 2))); -extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2))); + __attribute__((__format__ (printf, 1, 2))); +extern void warning(const char *, ...) + __attribute__ ((__format__ (printf, 1, 2))); extern char *read_infile(char *); extern char *copy_argv(char * const *); diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c index f1b1cf4eeed..e3a9c8ffe5b 100644 --- a/usr.sbin/tcpdump/print-ike.c +++ b/usr.sbin/tcpdump/print-ike.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ike.c,v 1.22 2004/04/13 17:56:54 hshoexer Exp $ */ +/* $OpenBSD: print-ike.c,v 1.23 2004/06/20 17:51:55 avsm Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.22 2004/04/13 17:56:54 hshoexer Exp $ (XXX)"; + "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.23 2004/06/20 17:51:55 avsm Exp $ (XXX)"; #endif #include <sys/param.h> @@ -712,7 +712,7 @@ ike_cfg_attribute_print (u_int8_t *buf, int attr_type, int maxlen) u_int16_t len = af ? 2 : buf[2] << 8 | buf[3], p; u_int8_t *val = af ? buf + 2 : buf + 4; - printf("\n\t\%sattribute %s = ", ike_tab_offset(), + printf("\n\t%sattribute %s = ", ike_tab_offset(), type < (sizeof attrs / sizeof attrs[0]) ? attrs[type] : "<unknown>"); diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c index 2c1885ba084..e2dc77f5dba 100644 --- a/usr.sbin/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdump.c,v 1.37 2004/05/21 05:48:50 brad Exp $ */ +/* $OpenBSD: tcpdump.c,v 1.38 2004/06/20 17:51:55 avsm Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -26,7 +26,7 @@ static const char copyright[] = "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] = - "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/tcpdump.c,v 1.37 2004/05/21 05:48:50 brad Exp $ (LBL)"; + "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/tcpdump.c,v 1.38 2004/06/20 17:51:55 avsm Exp $ (LBL)"; #endif /* @@ -92,7 +92,7 @@ extern int esp_init(char *); /* Forwards */ RETSIGTYPE cleanup(int); -extern __dead void usage(void) __attribute__((volatile)); +extern __dead void usage(void); /* Length of saved portion of packet. */ int snaplen = DEFAULT_SNAPLEN; |