X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=458394b8930186a0e32ff0dc649570a7a57d15b5;hb=343a65bc48b4e0cda4d9a14afcd7e96cca9c5de9;hp=6304fc531d63e5dbbfca69d2bec9bcac60c419d0;hpb=b27f3e8dd53af7209626a9f0e98eb4770602c2e7;p=paraslash.git

diff --git a/vss.c b/vss.c
index 6304fc53..458394b8 100644
--- a/vss.c
+++ b/vss.c
@@ -12,6 +12,7 @@
  */
 
 #include <dirent.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -486,8 +487,7 @@ static void compute_slice_timeout(struct timeval *timeout)
 static void set_eof_barrier(struct vss_task *vsst)
 {
 	struct fec_client *fc;
-	struct timeval timeout = mmd->afd.afhi.eof_tv,
-		*chunk_tv = vss_chunk_time();
+	struct timeval timeout = {1, 0}, *chunk_tv = vss_chunk_time();
 
 	if (!chunk_tv)
 		goto out;
@@ -629,9 +629,6 @@ static void vss_eof(struct vss_task *vsst)
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
 	free(mmd->afd.afhi.chunk_table);
 	mmd->afd.afhi.chunk_table = NULL;
-	free(mmd->afd.afhi.info_string);
-	mmd->afd.afhi.info_string = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
 	make_empty_status_items(mmd->afd.verbose_ls_output);
 	mmd->mtime = 0;
 	mmd->size = 0;
@@ -781,7 +778,6 @@ static void recv_afs_result(struct vss_task *vsst)
 	if (passed_fd < 0)
 		goto err;
 	shmid = afs_data;
-	free(mmd->afd.afhi.info_string);
 	ret = load_afd(shmid, &mmd->afd);
 	if (ret < 0)
 		goto err;