summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dhclient.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-07-08 00:36:11 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-07-08 00:36:11 +0000
commit5d2bcf68791461727b19be792b0d92f8384293c6 (patch)
treee89534de7bd0d22d278625794cd264a613831212 /sbin/dhclient/dhclient.c
parentd4bba9b7f2de427abf3f8d76103f579a89d471da (diff)
Always use uintNN_t instead of sometimes u_intNN_t
and sometimes uintNN_t.
Diffstat (limited to 'sbin/dhclient/dhclient.c')
-rw-r--r--sbin/dhclient/dhclient.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index da3f27c491b..84e5007ea77 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.459 2017/07/07 16:58:45 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.460 2017/07/08 00:36:10 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1022,8 +1022,8 @@ bind_lease(struct interface_info *ifi)
flush_routes();
opt = &options[DHO_INTERFACE_MTU];
- if (opt->len == sizeof(u_int16_t)) {
- u_int16_t mtu;
+ if (opt->len == sizeof(uint16_t)) {
+ uint16_t mtu;
memcpy(&mtu, opt->data, sizeof(mtu));
mtu = ntohs(mtu);
/* "The minimum legal value for the MTU is 68." */
@@ -2355,9 +2355,9 @@ cleanup:
void
apply_ignore_list(char *ignore_list)
{
- u_int8_t list[DHO_COUNT];
- char *p;
- int ix, i, j;
+ uint8_t list[DHO_COUNT];
+ char *p;
+ int ix, i, j;
memset(list, 0, sizeof(list));
ix = 0;
@@ -2390,8 +2390,8 @@ apply_ignore_list(char *ignore_list)
void
set_lease_times(struct client_lease *lease)
{
- time_t cur_time, time_max;
- u_int32_t uint32val;
+ time_t cur_time, time_max;
+ uint32_t uint32val;
time(&cur_time);