Merge branch 'maint'

diff --combined chunk_queue.c
index ad28190a163d32c4731316a3bd609f626f7871ec,d295b6c0e849cac1657e0fba48b53ee2f5091983..e8ea07d93ff1cc10cfe1888ce283630505642a24
--- 1/chunk_queue.c
--- 2/chunk_queue.c
+++ b/chunk_queue.c
@@@ -1,13 -1,11 +1,13 @@@
  /*
 - * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
 + * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
   *
   * Licensed under the GPL v2. For licencing details see COPYING.
   */
  
  /** \file chunk_queue.c Queuing functions for paraslash senders. */
  
 +#include <regex.h>
 +
  #include "para.h"
  #include "list.h"
  #include "afh.h"
@@@ -82,12 -80,14 +82,14 @@@ struct queued_chunk *cq_peek(struct chu
  /**
   * Remove the current chunk from the queue.
   *
-  * \param cq The chunk to remove.
+  * \param cq The queue to remove from.
   */
  void cq_dequeue(struct chunk_queue *cq)
  {
        struct queued_chunk *qc = cq_peek(cq);
        assert(qc);
+       assert(cq->num_pending >= qc->num_bytes);
+       cq->num_pending -= qc->num_bytes;
        list_del(&qc->node);
        free(qc);
  }