diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-24 12:01:28 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-24 12:01:28 +0200 |
commit | de6cb4173466f056f64395e7cc515657d9894685 (patch) | |
tree | 46d9e95fc9d90a3fae8aaf0f99797ca67f0fe133 | |
parent | e34dbc4fdcae6e21bb186c225f76d399d2656d75 (diff) | |
download | busybox-w32-de6cb4173466f056f64395e7cc515657d9894685.tar.gz busybox-w32-de6cb4173466f056f64395e7cc515657d9894685.tar.bz2 busybox-w32-de6cb4173466f056f64395e7cc515657d9894685.zip |
udhcpc[6]: fix messages referring to select() while we use poll()
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/udhcp/d6_dhcpc.c | 4 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index 66bc021e2..5ebd05d01 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c | |||
@@ -1238,7 +1238,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1238 | retval = 0; | 1238 | retval = 0; |
1239 | /* If we already timed out, fall through with retval = 0, else... */ | 1239 | /* If we already timed out, fall through with retval = 0, else... */ |
1240 | if (tv > 0) { | 1240 | if (tv > 0) { |
1241 | log1("waiting on select %u seconds", tv); | 1241 | log1("waiting %u seconds", tv); |
1242 | timestamp_before_wait = (unsigned)monotonic_sec(); | 1242 | timestamp_before_wait = (unsigned)monotonic_sec(); |
1243 | retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX); | 1243 | retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX); |
1244 | if (retval < 0) { | 1244 | if (retval < 0) { |
@@ -1248,7 +1248,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1248 | continue; | 1248 | continue; |
1249 | } | 1249 | } |
1250 | /* Else: an error occured, panic! */ | 1250 | /* Else: an error occured, panic! */ |
1251 | bb_perror_msg_and_die("select"); | 1251 | bb_perror_msg_and_die("poll"); |
1252 | } | 1252 | } |
1253 | } | 1253 | } |
1254 | 1254 | ||
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 932a956af..ccf04993d 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -1455,7 +1455,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
1455 | retval = 0; | 1455 | retval = 0; |
1456 | /* If we already timed out, fall through with retval = 0, else... */ | 1456 | /* If we already timed out, fall through with retval = 0, else... */ |
1457 | if (tv > 0) { | 1457 | if (tv > 0) { |
1458 | log1("waiting on select %u seconds", tv); | 1458 | log1("waiting %u seconds", tv); |
1459 | timestamp_before_wait = (unsigned)monotonic_sec(); | 1459 | timestamp_before_wait = (unsigned)monotonic_sec(); |
1460 | retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX); | 1460 | retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX); |
1461 | if (retval < 0) { | 1461 | if (retval < 0) { |
@@ -1465,7 +1465,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
1465 | continue; | 1465 | continue; |
1466 | } | 1466 | } |
1467 | /* Else: an error occurred, panic! */ | 1467 | /* Else: an error occurred, panic! */ |
1468 | bb_perror_msg_and_die("select"); | 1468 | bb_perror_msg_and_die("poll"); |
1469 | } | 1469 | } |
1470 | } | 1470 | } |
1471 | 1471 | ||