From: guy Date: Tue, 18 Nov 2003 23:26:37 +0000 (+0000) Subject: Get rid of unused arguments to "dhcp6_print()". X-Git-Tag: tcpdump-3.9.1~561 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/8a42f11ab081f263d58a2ca752c122848a4b147a Get rid of unused arguments to "dhcp6_print()". --- diff --git a/interface.h b/interface.h index c479a756..fe5bdc3f 100644 --- a/interface.h +++ b/interface.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.218 2003-11-16 09:36:10 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.219 2003-11-18 23:26:37 guy Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -318,7 +318,7 @@ extern void icmp6_print(const u_char *, const u_char *, int); extern void ripng_print(const u_char *, unsigned int); extern int rt6_print(const u_char *, const u_char *); extern void ospf6_print(const u_char *, u_int); -extern void dhcp6_print(const u_char *, u_int, u_int16_t, u_int16_t); +extern void dhcp6_print(const u_char *, u_int); #endif /*INET6*/ extern u_short in_cksum(const u_short *, register u_int, int); extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t); diff --git a/print-dhcp6.c b/print-dhcp6.c index 20c50375..f790d41d 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -37,7 +37,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.30 2003-11-16 09:36:17 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.31 2003-11-18 23:26:37 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -371,7 +371,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep) break; case DH6OPT_RELAY_MSG: printf(" ("); - dhcp6_print((const u_char *)(dh6o + 1), optlen, 0, 0); + dhcp6_print((const u_char *)(dh6o + 1), optlen); printf(")"); break; case DH6OPT_RAPID_COMMIT: /* nothing todo */ @@ -504,8 +504,7 @@ trunc: * Print dhcp6 packets */ void -dhcp6_print(const u_char *cp, u_int length, - u_int16_t sport, u_int16_t dport) +dhcp6_print(const u_char *cp, u_int length) { struct dhcp6 *dh6; struct dhcp6_relay *dh6relay; diff --git a/print-udp.c b/print-udp.c index 69ef39d5..1f7816a6 100644 --- a/print-udp.c +++ b/print-udp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.126 2003-11-16 09:36:41 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.127 2003-11-18 23:26:38 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -654,8 +654,7 @@ udp_print(register const u_char *bp, u_int length, else if (ISPORT(RIPNG_PORT)) ripng_print((const u_char *)(up + 1), length); else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT)) { - dhcp6_print((const u_char *)(up + 1), length, - sport, dport); + dhcp6_print((const u_char *)(up + 1), length); } #endif /*INET6*/ /*