X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=2a24a50068b47b96c16fe287e456aeaf51c55473;hp=2cd0a1632922b0b2272aa183c0ddba8c4b4a3d30;hb=e3dfede17fa6c297f89a34cb997b7276c884497a;hpb=53af5c6efb309565990203fd8504a812ec9166c9 diff --git a/vss.c b/vss.c index 2cd0a163..2a24a500 100644 --- a/vss.c +++ b/vss.c @@ -35,11 +35,6 @@ #include "fd.h" extern struct misc_meta_data *mmd; - -extern void dccp_send_init(struct sender *); -extern void http_send_init(struct sender *); -extern void udp_send_init(struct sender *); - extern const struct sender udp_sender, dccp_sender, http_sender; const struct sender * const senders[] = { &http_sender, &dccp_sender, &udp_sender, NULL}; @@ -946,6 +941,7 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data) } #ifndef MAP_POPULATE +/** As of 2018, neither FreeBSD-11.2 nor NetBSD-8.0 have MAP_POPULATE. */ #define MAP_POPULATE 0 #endif @@ -963,11 +959,12 @@ static void recv_afs_result(struct vss_task *vsst, fd_set *rfds) if (ret < 0) goto err; vsst->afsss = AFS_SOCKET_READY; - PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code, - afs_data); ret = -E_NOFD; - if (afs_code != NEXT_AUDIO_FILE) + if (afs_code != NEXT_AUDIO_FILE) { + PARA_ERROR_LOG("afs code: %u, expected: %d\n", afs_code, + NEXT_AUDIO_FILE); goto err; + } if (passed_fd < 0) goto err; shmid = afs_data; @@ -1194,7 +1191,7 @@ void vss_init(int afs_socket, struct sched *s) /** * Turn off the virtual streaming system. * - * This is only executed on exit. It calls the ->shutdowwn method of all senders. + * This is only executed on exit. It calls the ->shutdown method of all senders. */ void vss_shutdown(void) {