X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fecdec_filter.c;h=375f4c0afb244b52e5d7b437a6b612c3da9d7f5b;hb=2934ee80367ee9d50b99ed8d7f672d1a397b4ce0;hp=d629603c4b11f37825cd71b7bf5335d65625fa83;hpb=e3a7e12639c34fd86d48a072beb48add8c498d09;p=paraslash.git

diff --git a/fecdec_filter.c b/fecdec_filter.c
index d629603c..375f4c0a 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -225,8 +225,8 @@ static int add_slice(char *buf, struct fecdec_group *fg)
 	}
 	if (fg->num_slices == 0) {
 		fg->num_slices = fg->h.slices_per_group;
-		fg->idx = para_malloc(fg->num_slices * sizeof(int));
-		fg->data = para_calloc(fg->num_slices * sizeof(unsigned char *));
+		fg->idx = arr_alloc(fg->num_slices, sizeof(int));
+		fg->data = arr_zalloc(fg->num_slices, sizeof(unsigned char *));
 	}
 	r = fg->num_received_slices;
 	/* Check if we already have this slice. */
@@ -236,7 +236,7 @@ static int add_slice(char *buf, struct fecdec_group *fg)
 		return 0;
 	}
 	fg->idx[r] = slice_num;
-	fg->data[r] = para_malloc(fg->h.slice_bytes);
+	fg->data[r] = alloc(fg->h.slice_bytes);
 	memcpy(fg->data[r], buf, fg->h.slice_bytes);
 	fg->num_received_slices++;
 	return 1;
@@ -360,7 +360,7 @@ static int read_fec_header(char *buf, size_t len, struct fec_header *h)
 	h->bos = read_u8(buf + 22);
 	h->header_stream = read_u8(buf + 23);
 	if (!memcmp(buf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN))
-		return -E_FECDEC_EOF;
+		return -E_EOF;
 //	PARA_DEBUG_LOG("group %u, slize %u, slices per group: %u\n",
 //		h->group_num, h->slice_num, h->slices_per_group);
 	return 1;
@@ -471,7 +471,7 @@ out:
 static void fecdec_open(struct filter_node *fn)
 {
 	struct private_fecdec_data *pfd;
-	pfd = para_calloc(sizeof(*pfd));
+	pfd = zalloc(sizeof(*pfd));
 	fn->private_data = pfd;
 	fn->min_iqs = FEC_HEADER_SIZE;
 }