uloop: Remove uloop_cancelled variable, it is not used anywhere

[project/libubox.git] / uloop.c

diff --git a/uloop.c b/uloop.c
index d293edb..9fedcce 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -58,7 +58,6 @@ static struct list_head processes = LIST_HEAD_INIT(processes);
 
 static int poll_fd = -1;
 bool uloop_cancelled = false;
-bool uloop_handle_sigchld = true;
 static bool do_sigchld = false;
 
 static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
@@ -385,6 +384,7 @@ int uloop_fd_add(struct uloop_fd *sock, unsigned int flags)
 
        sock->registered = true;
        sock->eof = false;
+       sock->error = false;
 
 out:
        return ret;
@@ -574,9 +574,6 @@ static void uloop_setup_signals(bool add)
 
        sigaction(SIGINT, &s, &old_sigint);
 
-       if (!uloop_handle_sigchld)
-               return;
-
        if (add)
                s.sa_handler = uloop_sigchld;
        else
@@ -645,6 +642,7 @@ void uloop_run(void)
        if (!recursive_calls++)
                uloop_setup_signals(true);
 
+       uloop_cancelled = false;
        while(!uloop_cancelled)
        {
                uloop_gettime(&tv);