X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=f33b95acd98b2774a29f59d899820fe216e73cd5;hp=3e19b134c2670f6d729609799d4a6a445df989c2;hb=7ddeb416451e763677f1638263e26e0855d79d91;hpb=9d9ef4f91346188baaef1656b861151ea23437d9 diff --git a/vss.c b/vss.c index 3e19b134..f33b95ac 100644 --- a/vss.c +++ b/vss.c @@ -186,8 +186,6 @@ static struct timeval *vss_compute_timeout(struct vss_task *vsst) static void vss_eof(struct vss_task *vsst) { - char *tmp; - mmd->stream_start = *now; if (!vsst->map) return; @@ -203,12 +201,10 @@ 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; - tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO], + 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]); - strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string)); - mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0'; make_empty_status_items(mmd->afd.verbose_ls_output); - free(tmp); mmd->mtime = 0; mmd->size = 0; mmd->events++; @@ -422,7 +418,6 @@ static void vss_send_chunk(struct vss_task *vsst) if (chk_barrier("data send", &vsst->data_send_barrier, &due, 1) < 0) return; - mmd->new_vss_status_flags &= ~VSS_REPOS; if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ mmd->new_vss_status_flags |= VSS_NEXT; return;