X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=oggdec_filter.c;h=708a27e52b68c1c2add01a3b3fe39f721485e39f;hb=HEAD;hp=a6fa056aa9bc354082542563b9d53864e01f390a;hpb=b142089267ef501e438c3dc77ecf19bead3d4e58;p=paraslash.git

diff --git a/oggdec_filter.c b/oggdec_filter.c
index a6fa056a..b1aec4bc 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -88,7 +88,7 @@ static const ov_callbacks ovc = {
 
 static void ogg_open(struct filter_node *fn)
 {
-	fn->private_data = para_calloc(sizeof(struct private_oggdec_data));
+	fn->private_data = zalloc(sizeof(struct private_oggdec_data));
 	fn->min_iqs = 8000;
 }
 
@@ -121,7 +121,7 @@ static int ogg_init(struct filter_node *fn)
 	struct btr_node *btrn = fn->btrn;
 	int ret, oret;
 	size_t iqs;
-	struct OggVorbis_File *vf = para_malloc(sizeof(*vf));
+	struct OggVorbis_File *vf = alloc(sizeof(*vf));
 
 	PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n",
 		btr_get_input_queue_size(btrn), fn->min_iqs);
@@ -211,7 +211,7 @@ static int ogg_post_monitor(__a_unused struct sched *s, void *context)
 
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0) {
-		if (ret != -E_BTR_EOF) /* fatal error */
+		if (ret != -E_EOF) /* fatal error */
 			goto out;
 		if (fn->min_iqs == 0 && !pod->have_more) /* EOF */
 			goto out;
@@ -228,7 +228,7 @@ static int ogg_post_monitor(__a_unused struct sched *s, void *context)
 		goto out;
 	}
 	have = 0;
-	buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+	buf = alloc(OGGDEC_OUTPUT_CHUNK_SIZE);
 	for (;;) {
 		ret = ov_read(pod->vf, buf + have, OGGDEC_OUTPUT_CHUNK_SIZE - have,
 			ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);