X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=chunk_queue.c;h=08f57e9d1ecf9bae1cadead0757fe29418c446c3;hb=HEAD;hp=c870d4d2a0d397d17777f09fe3f94ff527cfc86a;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e;p=paraslash.git diff --git a/chunk_queue.c b/chunk_queue.c index c870d4d2..1f11359f 100644 --- a/chunk_queue.c +++ b/chunk_queue.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2007-2013 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2007 Andre Noll , see file COPYING. */ /** \file chunk_queue.c Queuing functions for paraslash senders. */ @@ -13,6 +9,7 @@ #include "afh.h" #include "string.h" #include "error.h" +#include "chunk_queue.h" /** * Senders may use the chunk queue facility to deal with laggy connections. It @@ -55,7 +52,7 @@ int cq_enqueue(struct chunk_queue *cq, const char *buf, size_t num_bytes) if (cq->num_pending + num_bytes > cq->max_pending) return -E_QUEUE; - qc = para_malloc(sizeof(struct queued_chunk)); + qc = alloc(sizeof(struct queued_chunk)); cq->num_pending += num_bytes; qc->buf = buf; qc->num_bytes = num_bytes; @@ -133,8 +130,8 @@ int cq_get(struct queued_chunk *qc, const char **buf, size_t *num_bytes) */ struct chunk_queue *cq_new(size_t max_pending) { - struct chunk_queue *cq = para_malloc(sizeof(*cq)); - INIT_LIST_HEAD(&cq->q); + struct chunk_queue *cq = alloc(sizeof(*cq)); + init_list_head(&cq->q); cq->max_pending = max_pending; cq->num_pending = 0; return cq;