rename also the variables in all other places
Costa Tsaousis (ktsaou) committed
Jan 18, 2018 at 22:03 UTC
be112a599572b21c356aeb846ec4c3d0c11b3b42
1 file changed
+5
-5
src/web_server.c
+5
-5
@@ -415,7 +415,7 @@ static void *multi_threaded_web_client_worker_main(void *ptr) {
415
w->running = 1;
416
417
struct pollfd fds[2], *ifd, *ofd;
418
- int retval, timeout;
418
+ int retval, timeout_ms;
419
nfds_t fdmax = 0;
420
421
while(!netdata_exit) {
@@ -467,8 +467,8 @@ static void *multi_threaded_web_client_worker_main(void *ptr) {
467
468
debug(D_WEB_CLIENT, "%llu: Waiting socket async I/O for %s %s", w->id, web_client_has_wait_receive(w)?"INPUT":"", web_client_has_wait_send(w)?"OUTPUT":"");
469
errno = 0;
470
- timeout = web_client_timeout * 1000;
471
- retval = poll(fds, fdmax, timeout);
470
+ timeout_ms = web_client_timeout * 1000;
471
+ retval = poll(fds, fdmax, timeout_ms);
472
473
if(unlikely(netdata_exit)) break;
474
@@ -640,12 +640,12 @@ void *socket_listen_main_multi_threaded(void *ptr) {
640
info("Listening on '%s'", (api_sockets.fds_names[i])?api_sockets.fds_names[i]:"UNKNOWN");
641
}
642
643
- int timeout = 1 * 1000;
643
+ int timeout_ms = 1 * 1000;
644
645
while(!netdata_exit) {
646
647
// debug(D_WEB_CLIENT, "LISTENER: Waiting...");
648
- retval = poll(socket_listen_main_multi_threaded_fds, api_sockets.opened, timeout);
648
+ retval = poll(socket_listen_main_multi_threaded_fds, api_sockets.opened, timeout_ms);
649
650
if(unlikely(retval == -1)) {
651
error("LISTENER: poll() failed.");