diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-17 18:09:33 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-17 18:09:33 +0000 |
| commit | 6f9c67bd4648041973deec526e25353324bd171e (patch) | |
| tree | 74280cc52dd05379afc3423485007370a707f948 | |
| parent | 484cfbed8914c70668e8b771b3fbfbe6f06e5862 (diff) | |
remove ASSERT_STATE() macro which is a NOOP, no binary change; ok henning@
| -rw-r--r-- | sbin/dhclient/dhclient.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 7bca24f6f30..5ffd79de371 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.91 2006/12/15 14:56:38 stevesk Exp $ */ +/* $OpenBSD: dhclient.c,v 1.92 2006/12/17 18:09:32 stevesk Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -77,12 +77,6 @@ struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } }; struct in_addr inaddr_any; struct sockaddr_in sockaddr_broadcast; -/* - * ASSERT_STATE() does nothing now; it used to be - * assert (state_is == state_shouldbe). - */ -#define ASSERT_STATE(state_is, state_shouldbe) {} - #define TIME_MAX 2147483647 struct interface_info *ifi; @@ -475,8 +469,6 @@ state_init(void *ipp) { struct interface_info *ip = ipp; - ASSERT_STATE(state, S_INIT); - /* Make a DHCPDISCOVER packet, and set appropriate per-interface flags. */ make_discover(ip, ip->client->active); @@ -501,8 +493,6 @@ state_selecting(void *ipp) struct interface_info *ip = ipp; struct client_lease *lp, *next, *picked; - ASSERT_STATE(state, S_SELECTING); - /* Cancel state_selecting and send_discover timeouts, since either one could have got us here. */ cancel_timeout(state_selecting, ip); @@ -711,8 +701,6 @@ state_bound(void *ipp) { struct interface_info *ip = ipp; - ASSERT_STATE(state, S_BOUND); - /* T1 has expired. */ make_request(ip, ip->client->active); ip->client->xid = ip->client->packet.xid; |