04_DCCP-socket-functions.diff

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index b9243a4169b16addf95a010ba580ea8170acd24c..09d4212610e26f5be064d97097bdff4ed8879055 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -206,7 +206,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
        if (ret < 0)
                goto out;
        if (ret != sizeof(int)) {
-               ret = -E_RECV;
+               ret = -E_AFS_SHORT_READ;
                goto out;
        }
        ret = *(int *) buf;
@@ -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",