X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=server.c;h=bb80738634d9fb68027e344521b2c806876a9f75;hb=295c14126da50e77a14fe075b71d885a7b469b4a;hp=4ea6df0b2abdd550866a1189fc2c72de48106614;hpb=7a3352c3c6969a3019fd4adb3a957c711441160e;p=paraslash.git

diff --git a/server.c b/server.c
index 4ea6df0b..bb807386 100644
--- a/server.c
+++ b/server.c
@@ -23,8 +23,8 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c,
+ * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
  *	- Volume normalizer: \ref compress.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
@@ -199,7 +199,6 @@ static void shm_init(void)
 	mmd->events = 0;
 	mmd->num_connects = 0;
 	mmd->active_connections = 0;
-	strcpy(mmd->afd.path, "(none)");
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
@@ -309,7 +308,7 @@ static unsigned init_network(void)
 	if (ret < 0)
 		goto err;
 	fd = ret;
-	ret = mark_fd_nonblock(fd);
+	ret = mark_fd_nonblocking(fd);
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(fd); /* child doesn't need the listener */
@@ -364,7 +363,7 @@ static void init_afs(void)
 	}
 	close(afs_server_socket[1]);
 	afs_socket = afs_server_socket[0];
-	ret = mark_fd_nonblock(afs_socket);
+	ret = mark_fd_nonblocking(afs_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	add_close_on_fork_list(afs_socket);