X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=93ee76d7377e69a4a84223459d301f694e20da48;hp=0bc2aed48ab3a01e0224946ff689c0268c976a2c;hb=6f06604bbee726916812cc35c4b28b6b2df1b026;hpb=9be5a49b2b24d49de40f87f9aba3378dd04a7b0e

diff --git a/vss.c b/vss.c
index 0bc2aed4..93ee76d7 100644
--- a/vss.c
+++ b/vss.c
@@ -24,7 +24,6 @@
 #include "server.h"
 #include "net.h"
 #include "server.cmdline.h"
-#include "afs_common.h"
 #include "vss.h"
 #include "send.h"
 #include "ipc.h"
@@ -40,7 +39,6 @@ static struct timeval autoplay_barrier;
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
-static int audio_file;
 static char *map;
 
 /**
@@ -194,7 +192,6 @@ static void vss_eof(void)
 	tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
 	map = NULL;
-	close(audio_file);
 	mmd->audio_format = -1;
 	mmd->chunks_sent = 0;
 	mmd->offset = 0;
@@ -205,10 +202,6 @@ static void vss_eof(void)
 		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
 	strcpy(mmd->afi.info_string, tmp);
 	free(tmp);
-	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1],
-		status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]);
-	strcpy(mmd->selector_info, tmp);
-	free(tmp);
 	mmd->filename[0] = '\0';
 	mmd->size = 0;
 	mmd->events++;
@@ -390,6 +383,7 @@ static void recv_afs_result(void)
 		mmd->afd.afhi.chunks_total);
 	ret = fstat(passed_fd, &statbuf);
 	if (ret < 0) {
+		PARA_ERROR_LOG("fstat error:\n");
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
@@ -397,6 +391,7 @@ static void recv_afs_result(void)
 	mmd->mtime = statbuf.st_mtime;
 	map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 		passed_fd, 0);
+	close(passed_fd);
 	strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */
 	mmd->afi.header_len = 0; /* default: no header */
 	mmd->audio_format = mmd->afd.afsi.audio_format_id;