X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=17bd5fbc1a85af362b30bb104f00a82f7190e200;hb=c6873084d11a7214c75a44692d53f0562e76b4b2;hp=0801eeb089b05bf3e0f47aad86d953f5ecc4dee0;hpb=7565af270650435630bf212592286a8c6555d749;p=paraslash.git

diff --git a/vss.c b/vss.c
index 0801eeb0..17bd5fbc 100644
--- a/vss.c
+++ b/vss.c
@@ -139,19 +139,19 @@ static void setup_fec_group(struct fec_client *fc, struct vss_task *vsst)
 {
 	uint32_t num_bytes = 0, chunk_num, max_group_size, last_payload_size;
 	int i, k = fc->fcp->data_slices_per_group;
-	const unsigned char *start_buf = NULL;
+	const char *start_buf = NULL;
 	struct timeval tmp, *chunk_tv = vss_chunk_time();
 
 	assert(chunk_tv);
 	max_group_size = (fc->fcp->max_slice_bytes - FEC_HEADER_SIZE) * k;
 	chunk_num = fc->group.first_chunk;
 	for (;;) {
-		const unsigned char *buf;
+		const char *buf;
 		size_t len;
 
 		if (chunk_num >= mmd->afd.afhi.chunks_total)
 			break;
-		afh_get_chunk(chunk_num, &mmd->afd.afhi, vsst->map, (const char **)&buf, &len);
+		afh_get_chunk(chunk_num, &mmd->afd.afhi, vsst->map, &buf, &len);
 		if (!start_buf)
 			start_buf = buf;
 		if (num_bytes + len > max_group_size)
@@ -179,9 +179,10 @@ static void setup_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		&fc->group.slice_duration);
 
 	for (i = 0; i < k; i++)
-		fc->src_data[i] = start_buf + i * fc->slice.bytes;
+		fc->src_data[i] = (const unsigned char *)start_buf
+			+ i * fc->slice.bytes;
 
-	if ((char *)start_buf + k * fc->slice.bytes > vsst->map + mmd->size) {
+	if (start_buf + k * fc->slice.bytes > vsst->map + mmd->size) {
 		/* can not use last slice as it goes beyond the map */
 		if (fc->extra_src_buf_size < fc->slice.bytes)
 			fc->extra_src_buf = para_realloc(fc->extra_src_buf, fc->slice.bytes);
@@ -334,21 +335,16 @@ static void compute_slice_timeout(struct timeval *timeout)
 	assert(vss_playing());
 	list_for_each_entry(fc, &fec_client_list, node) {
 		struct timeval diff;
-		int ret = next_slice_is_due(fc, &diff);
 
-		// PARA_NOTICE_LOG("diff: %lu, ret: %d\n", tv2ms(&diff), ret);
-		if (ret) {
+		if (next_slice_is_due(fc, &diff)) {
 			timeout->tv_sec = 0;
 			timeout->tv_usec = 0;
-			goto out;
+			return;
 		}
 		/* timeout = min(timeout, diff) */
 		if (tv_diff(&diff, timeout, NULL) < 0)
 			*timeout = diff;
 	}
-out:
-	return;
-	PARA_NOTICE_LOG("slice timeout: %lu:%lu\n", (long unsigned)timeout->tv_sec, (long unsigned)timeout->tv_usec);
 }
 
 /**