X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=6a0ec239bbcbd120efd130b5f8f24c2b136d4516;hp=6525209bff4119a177eb443f154b4f1f5224845b;hb=f0b8296a0635e74aaa58767e513eed226504ec34;hpb=c517cb88ae745c9be06ac5cd99236c4bae8575c9

diff --git a/afh_recv.c b/afh_recv.c
index 6525209b..6a0ec239 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -174,6 +174,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 	char *buf;
 	const char *start;
 	size_t size;
+	uint32_t len;
 	struct timeval chunk_time;
 	unsigned j_given = RECV_CMD_OPT_GIVEN(AFH, JUST_IN_TIME, lpr);
 	unsigned H_given = RECV_CMD_OPT_GIVEN(AFH, NO_HEADER, lpr);
@@ -197,12 +198,12 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 		long unsigned n;
 		for (n = pard->first_chunk; n < pard->last_chunk; n++) {
 			ret = afh_get_chunk(n, afhi, pard->audio_format_num,
-				pard->map, pard->map_size, &start, &size,
+				pard->map, pard->map_size, &start, &len,
 				&pard->afh_context);
 			if (ret < 0)
 				goto out;
-			PARA_DEBUG_LOG("adding %zu bytes\n", size);
-			btr_add_output_dont_free(start, size, btrn);
+			PARA_DEBUG_LOG("adding %u bytes\n", len);
+			btr_add_output_dont_free(start, len, btrn);
 		}
 		ret = -E_RECV_EOF;
 		goto out;
@@ -218,12 +219,12 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 	}
 	ret = afh_get_chunk(pard->current_chunk, afhi,
 		pard->audio_format_num, pard->map,
-		pard->map_size, &start, &size,
+		pard->map_size, &start, &len,
 		&pard->afh_context);
 	if (ret < 0)
 		goto out;
 	PARA_DEBUG_LOG("adding chunk %u\n", pard->current_chunk);
-	btr_add_output_dont_free(start, size, btrn);
+	btr_add_output_dont_free(start, len, btrn);
 	if (pard->current_chunk >= pard->last_chunk) {
 		ret = -E_RECV_EOF;
 		goto out;
@@ -238,9 +239,7 @@ out:
 	return ret;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_afh_user_data = {
-	.init = afh_init,
 	.open = afh_recv_open,
 	.close = afh_recv_close,
 	.pre_select = afh_recv_pre_select,