From 39755e5201adec743d22180fb441c47f25511383 Mon Sep 17 00:00:00 2001 From: krw Date: Thu, 15 Jun 2017 16:56:11 +0000 Subject: [PATCH] Nuke unused parameter 'client_addr' from packet_to_lease(). --- sbin/dhclient/dhclient.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 17833796aeb..c73ec232fc3 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.425 2017/06/14 20:27:08 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.426 2017/06/15 16:56:11 krw Exp $ */ /* * Copyright 2004 Henning Brauer @@ -153,7 +153,7 @@ void rewrite_option_db(struct interface_info *, struct client_lease *, char *lease_as_string(struct interface_info *, char *, struct client_lease *); void append_statement(char *, size_t, char *, char *); -struct client_lease *packet_to_lease(struct interface_info *, struct in_addr, +struct client_lease *packet_to_lease(struct interface_info *, struct option_data *); void go_daemon(void); int rdaemon(int); @@ -912,7 +912,7 @@ dhcpack(struct interface_info *ifi, struct in_addr client_addr, log_info("%s", info); - lease = packet_to_lease(ifi, client_addr, options); + lease = packet_to_lease(ifi, options); if (lease->is_invalid) { log_info("Unsatisfactory %s", info); make_decline(ifi, lease); @@ -1138,7 +1138,7 @@ dhcpoffer(struct interface_info *ifi, struct in_addr client_addr, } } - lease = packet_to_lease(ifi, client_addr, options); + lease = packet_to_lease(ifi, options); /* * If this lease was acquired through a BOOTREPLY, record that @@ -1201,8 +1201,7 @@ addressinuse(struct interface_info *ifi, struct in_addr address, char *ifname) * parameters in the specified packet. */ struct client_lease * -packet_to_lease(struct interface_info *ifi, struct in_addr client_addr, - struct option_data *options) +packet_to_lease(struct interface_info *ifi, struct option_data *options) { struct dhcp_packet *packet = &ifi->recv_packet; char ifname[IF_NAMESIZE]; -- 2.20.1