aboutsummaryrefslogtreecommitdiff
path: root/networking/zcip.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
commit5d61e71c3a8ac3296afbfe9a014c62050c5a9234 (patch)
treee9ab2cd35d1f2d51b26a678551a0439b1719928b /networking/zcip.c
parentc9dc2ac578278e86be248cc21e53081f7054da83 (diff)
downloadbusybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.gz
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.bz2
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.zip
introduce safe_poll (fixes a problem in top)
function old new delta safe_poll - 77 +77 svlogd_main 1470 1466 -4 zcip_main 1530 1524 -6 forkexec 1345 1338 -7 decode_format_string 795 788 -7 collect_blk 474 467 -7 buffer_pread 540 532 -8 tftp 1182 1172 -10 microcom_main 763 749 -14 arpping 441 424 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/9 up/down: 77/-80) Total: -3 bytes text data bss dec hex filename 770162 1034 10404 781600 bed20 busybox_old 770158 1034 10404 781596 bed1c busybox_unstripped
Diffstat (limited to 'networking/zcip.c')
-rw-r--r--networking/zcip.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/networking/zcip.c b/networking/zcip.c
index 2f0b5a7fb..63846ebef 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -300,7 +300,12 @@ int zcip_main(int argc, char **argv)
300 300
301 VDBG("...wait %d %s nprobes=%u, nclaims=%u\n", 301 VDBG("...wait %d %s nprobes=%u, nclaims=%u\n",
302 timeout_ms, intf, nprobes, nclaims); 302 timeout_ms, intf, nprobes, nclaims);
303 switch (poll(fds, 1, timeout_ms)) { 303
304 switch (safe_poll(fds, 1, timeout_ms)) {
305
306 default:
307 /*bb_perror_msg("poll"); - done in safe_poll */
308 return EXIT_FAILURE;
304 309
305 // timeout 310 // timeout
306 case 0: 311 case 0:
@@ -388,6 +393,7 @@ int zcip_main(int argc, char **argv)
388 break; 393 break;
389 } // switch (state) 394 } // switch (state)
390 break; // case 0 (timeout) 395 break; // case 0 (timeout)
396
391 // packets arriving 397 // packets arriving
392 case 1: 398 case 1:
393 // We need to adjust the timeout in case we didn't receive 399 // We need to adjust the timeout in case we didn't receive
@@ -519,13 +525,9 @@ int zcip_main(int argc, char **argv)
519 nclaims = 0; 525 nclaims = 0;
520 break; 526 break;
521 } // switch state 527 } // switch state
522
523 break; // case 1 (packets arriving) 528 break; // case 1 (packets arriving)
524 default:
525 why = "poll";
526 goto bad;
527 } // switch poll 529 } // switch poll
528 } 530 } // while (1)
529 bad: 531 bad:
530 bb_perror_msg("%s, %s", intf, why); 532 bb_perror_msg("%s, %s", intf, why);
531 return EXIT_FAILURE; 533 return EXIT_FAILURE;