summaryrefslogtreecommitdiff
path: root/usr.sbin/dhcpd
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-11 04:08:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-05-11 04:08:36 +0000
commit7b58cf861554e6b9c09ece510285b23c82f87d7f (patch)
treec27a203ff6aaec2689e080f31f166cd91bdc6dcc /usr.sbin/dhcpd
parent317b2562f6ce8c0e6aed54964453f381d9f03a57 (diff)
knf
Diffstat (limited to 'usr.sbin/dhcpd')
-rw-r--r--usr.sbin/dhcpd/bootp.c6
-rw-r--r--usr.sbin/dhcpd/memory.c8
2 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/dhcpd/bootp.c b/usr.sbin/dhcpd/bootp.c
index c9f975df968..93f2a798cd3 100644
--- a/usr.sbin/dhcpd/bootp.c
+++ b/usr.sbin/dhcpd/bootp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bootp.c,v 1.8 2004/05/04 20:28:40 deraadt Exp $ */
+/* $OpenBSD: bootp.c,v 1.9 2004/05/11 04:08:35 deraadt Exp $ */
/*
* BOOTP Protocol support.
@@ -65,8 +65,8 @@ bootp(struct packet *packet)
note("BOOTREQUEST from %s via %s%s", print_hw_addr(packet->raw->htype,
packet->raw->hlen, packet->raw->chaddr),
packet->raw->giaddr.s_addr ? inet_ntoa(packet->raw->giaddr) :
- packet->interface->name, packet->options_valid ? "" :
- " (non-rfc1048)");
+ packet->interface->name,
+ packet->options_valid ? "" : " (non-rfc1048)");
if (!locate_network(packet))
return;
diff --git a/usr.sbin/dhcpd/memory.c b/usr.sbin/dhcpd/memory.c
index e28d1a609eb..962c01b9060 100644
--- a/usr.sbin/dhcpd/memory.c
+++ b/usr.sbin/dhcpd/memory.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memory.c,v 1.7 2004/05/04 20:28:40 deraadt Exp $ */
+/* $OpenBSD: memory.c,v 1.8 2004/05/11 04:08:35 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
@@ -169,10 +169,8 @@ find_host_for_network(struct host_decl **host, struct iaddr *addr,
}
void
-new_address_range(low, high, subnet, dynamic)
- struct iaddr low, high;
- struct subnet *subnet;
- int dynamic;
+new_address_range(struct iaddr low, struct iaddr high, struct subnet *subnet,
+ int dynamic)
{
struct lease *address_range, *lp, *plp;
struct iaddr net;