X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=chunk_queue.c;h=84f4a4a88ebfcb5acb4b0cfaf9dc861b87f82947;hp=17d70eace1d1ee1c9a4b3ae17bd80c562c1dc212;hb=054c845e9ac8ee3ab920d91e468eedb7cb1105ba;hpb=a4aada551a8f979918024e28343b90e0690542c2;ds=inline

diff --git a/chunk_queue.c b/chunk_queue.c
index 17d70eac..84f4a4a8 100644
--- a/chunk_queue.c
+++ b/chunk_queue.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -18,14 +18,14 @@
  * allows them to enqueue chunks if they can not be sent out immediately.
  *
  * Chunk queues are "cheap" in the sense that only reference to the audio file
- * data is stored, but not the data itsself.
+ * data is stored, but not the data itself.
  */
 struct chunk_queue {
 	/** The list of pending chunks for this client. */
 	struct list_head q;
 	/** The number of pending bytes for this client. */
 	unsigned long num_pending;
-	/** Enqueueing more than that many bytes is an error. */
+	/** More than that many bytes in the queue is considered an error. */
 	unsigned long max_pending;
 };
 
@@ -62,7 +62,7 @@ int cq_enqueue(struct chunk_queue *cq, long unsigned chunk_num,
 		if (ret < 0)
 			return ret;
 	} else
-		buf = vss_get_header(&len);
+		vss_get_header(&buf, &len);
 	if (cq->num_pending + len > cq->max_pending)
 		return -E_QUEUE;
 	qc = para_malloc(sizeof(struct queued_chunk));
@@ -79,7 +79,7 @@ int cq_enqueue(struct chunk_queue *cq, long unsigned chunk_num,
  *
  * \param cq The chunk queue.
  *
- * \return The next queued chunk, or \p NULL if there is no chunk awailable.
+ * \return The next queued chunk, or \p NULL if there is no chunk available.
  */
 struct queued_chunk *cq_peek(struct chunk_queue *cq)
 {
@@ -102,7 +102,7 @@ void cq_dequeue(struct chunk_queue *cq)
 }
 
 /**
- * Change the number of bytes send for the current queued chunk.
+ * Change the number of bytes sent for the current queued chunk.
  *
  * \param cq The chunk queue.
  * \param sent Number of bytes successfully sent.
@@ -133,7 +133,7 @@ int cq_get(struct queued_chunk *qc, char **buf, size_t *len)
 		if (ret < 0)
 			return ret;
 	} else
-		*buf = vss_get_header(len);
+		vss_get_header(buf, len);
 	assert(*len > qc->sent);
 	*buf += qc->sent;
 	*len -= qc->sent;