Merge commit 'remotes/fml/master'

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 6c60b086c1ca2db90efef9d4a790e4ce376d93f6..e84d9a8839a14b5ec7267b62f2c5065414863276 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -641,7 +641,7 @@ static int setup_command_socket_or_die(void)
                PARA_EMERG_LOG("can not listen on socket\n");
                exit(EXIT_FAILURE);
        }
-       ret = mark_fd_nonblock(socket_fd);
+       ret = mark_fd_nonblocking(socket_fd);
        if (ret < 0) {
                close(socket_fd);
                return ret;
@@ -936,7 +936,7 @@ static void command_post_select(struct sched *s, struct task *t)
                goto out;
        }
        fd = t->ret;
-       t->ret = mark_fd_nonblock(fd);
+       t->ret = mark_fd_nonblocking(fd);
        if (t->ret < 0) {
                PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
                close(fd);
@@ -990,7 +990,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
                exit(EXIT_FAILURE);
        }
        server_socket = socket_fd;
-       ret = mark_fd_nonblock(server_socket);
+       ret = mark_fd_nonblocking(server_socket);
        if (ret < 0)
                exit(EXIT_FAILURE);
        PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
@@ -999,7 +999,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
        register_tasks(cookie);
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 999 * 1000;
-       ret = sched(&s);
+       ret = schedule(&s);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
        close_afs_tables();