diff options
| author | Chris Kuethe <ckuethe@cvs.openbsd.org> | 2006-05-30 23:43:47 +0000 |
|---|---|---|
| committer | Chris Kuethe <ckuethe@cvs.openbsd.org> | 2006-05-30 23:43:47 +0000 |
| commit | 919a84d221cc4821636f8f8749aca4159a157736 (patch) | |
| tree | cf983d810a80ea621e8da2d828494601e3792ac4 /usr.sbin/dhcpd | |
| parent | 87fc35398a7e41f5be6b048ee75050b17cbb9281 (diff) | |
This patch renames dhcpd's "struct timeout" to "struct dhcpd_timeout"
so as not to conflict with "struct timeout" from <sys/timeout.h>.
ok henning@
Diffstat (limited to 'usr.sbin/dhcpd')
| -rw-r--r-- | usr.sbin/dhcpd/dhcpd.h | 8 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/dispatch.c | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h index 24af5c36510..e706fd98349 100644 --- a/usr.sbin/dhcpd/dhcpd.h +++ b/usr.sbin/dhcpd/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.17 2006/05/11 01:19:08 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.18 2006/05/30 23:43:46 ckuethe Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998, 1999 @@ -443,8 +443,8 @@ struct hardware_link { struct hardware address; }; -struct timeout { - struct timeout *next; +struct dhcpd_timeout { + struct dhcpd_timeout *next; time_t when; void (*func)(void *); void *what; @@ -711,7 +711,7 @@ extern struct interface_info *interfaces; extern struct protocol *protocols; extern void (*bootp_packet_handler)(struct interface_info *, struct dhcp_packet *, int, unsigned int, struct iaddr, struct hardware *); -extern struct timeout *timeouts; +extern struct dhcpd_timeout *timeouts; void discover_interfaces(void); void dispatch(void); int locate_network(struct packet *); diff --git a/usr.sbin/dhcpd/dispatch.c b/usr.sbin/dhcpd/dispatch.c index c2311dd0db6..4285a1f3d39 100644 --- a/usr.sbin/dhcpd/dispatch.c +++ b/usr.sbin/dhcpd/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.20 2006/05/27 19:52:23 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.21 2006/05/30 23:43:46 ckuethe Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998, 1999 @@ -50,8 +50,8 @@ struct interface_info *interfaces; struct protocol *protocols; -struct timeout *timeouts; -static struct timeout *free_timeouts; +struct dhcpd_timeout *timeouts; +static struct dhcpd_timeout *free_timeouts; static int interfaces_invalidated; void (*bootp_packet_handler)(struct interface_info *, struct dhcp_packet *, int, unsigned int, struct iaddr, struct hardware *); @@ -297,7 +297,7 @@ dispatch(void) another: if (timeouts) { if (timeouts->when <= cur_time) { - struct timeout *t = timeouts; + struct dhcpd_timeout *t = timeouts; timeouts = timeouts->next; (*(t->func))(t->what); t->next = free_timeouts; @@ -487,7 +487,7 @@ locate_network(struct packet *packet) void add_timeout(time_t when, void (*where)(void *), void *what) { - struct timeout *t, *q; + struct dhcpd_timeout *t, *q; /* See if this timeout supersedes an existing timeout. */ t = NULL; @@ -511,7 +511,7 @@ add_timeout(time_t when, void (*where)(void *), void *what) q->func = where; q->what = what; } else { - q = (struct timeout *)malloc(sizeof (struct timeout)); + q = (struct dhcpd_timeout *)malloc(sizeof (struct dhcpd_timeout)); if (!q) error("Can't allocate timeout structure!"); q->func = where; @@ -547,7 +547,7 @@ add_timeout(time_t when, void (*where)(void *), void *what) void cancel_timeout(void (*where)(void *), void *what) { - struct timeout *t, *q; + struct dhcpd_timeout *t, *q; /* Look for this timeout on the list, and unlink it if we find it. */ t = NULL; |