de6cb4173
Denys Vlasenko
2017-07-24
Subject
udhcpc[6]: fix messages referring to select() while we use poll()
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/udhcp/d6_dhcpc.c+2 -2
| @@ -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"); |
| } | |
| } | |
networking/udhcp/dhcpc.c+2 -2
| @@ -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"); |
| } | |
| } | |