X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=09d4212610e26f5be064d97097bdff4ed8879055;hp=8a60166fe7e42d5f5762cb46547a9413df6bd342;hb=7a8d90c41b758d1c3ae8530a44ccd9aaa857581e;hpb=965eae5ba6664349ff74977439f3214142a3bc9a

diff --git a/afs.c b/afs.c
index 8a60166f..09d42126 100644
--- 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;
@@ -541,7 +541,7 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else
-			ret = -E_AFS_SYNTAX;
+			return -E_AFS_SYNTAX;
 		if (ret < 0)
 			return ret;
 	}
@@ -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();