[git commit] udhcpc[6]: fix messages referring to select() while we use poll()
Denys Vlasenko
vda.linux at googlemail.com
Mon Jul 24 10:01:28 UTC 2017
commit: https://git.busybox.net/busybox/commit/?id=de6cb4173466f056f64395e7cc515657d9894685
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/udhcp/d6_dhcpc.c | 4 ++--
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 66bc021..5ebd05d 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)
retval = 0;
/* If we already timed out, fall through with retval = 0, else... */
if (tv > 0) {
- log1("waiting on select %u seconds", tv);
+ log1("waiting %u seconds", tv);
timestamp_before_wait = (unsigned)monotonic_sec();
retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
if (retval < 0) {
@@ -1248,7 +1248,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
continue;
}
/* Else: an error occured, panic! */
- bb_perror_msg_and_die("select");
+ bb_perror_msg_and_die("poll");
}
}
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 932a956..ccf0499 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1455,7 +1455,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
retval = 0;
/* If we already timed out, fall through with retval = 0, else... */
if (tv > 0) {
- log1("waiting on select %u seconds", tv);
+ log1("waiting %u seconds", tv);
timestamp_before_wait = (unsigned)monotonic_sec();
retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
if (retval < 0) {
@@ -1465,7 +1465,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
continue;
}
/* Else: an error occurred, panic! */
- bb_perror_msg_and_die("select");
+ bb_perror_msg_and_die("poll");
}
}
More information about the busybox-cvs
mailing list