From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 13 Dec 2007 07:16:16 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~62^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a5e97d6e317ee050b0a942e50159473a7d144dc;p=collectd.git

Merge branch 'collectd-4.2'

Conflicts:

	src/utils_llist.c
---

4a5e97d6e317ee050b0a942e50159473a7d144dc
diff --cc src/utils_llist.c
index f7e03c23,d5db9dc0..7fae025d
--- a/src/utils_llist.c
+++ b/src/utils_llist.c
@@@ -106,7 -110,9 +106,11 @@@ void llist_prepend (llist_t *l, llentry
  {
  	e->next = l->head;
  	l->head = e;
+ 
+ 	if (l->tail == NULL)
+ 		l->tail = e;
++
 +	++(l->size);
  }
  
  void llist_remove (llist_t *l, llentry_t *e)