From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Dec 2007 11:15:37 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=917abf10c462903cd3bb37faadba68f91f5ca8b1;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2
---

917abf10c462903cd3bb37faadba68f91f5ca8b1
diff --cc src/utils_avltree.c
index 11d3d716,e4609593..83821fe9
--- a/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@@ -575,12 -575,14 +575,12 @@@ int c_avl_remove (c_avl_tree_t *t, cons
  	status = _remove (t, n);
  	verify_tree (t->root);
  	return (status);
- } /* void *avl_remove */
+ } /* void *c_avl_remove */
  
- int avl_get (avl_tree_t *t, const void *key, void **value)
+ int c_avl_get (c_avl_tree_t *t, const void *key, void **value)
  {
- 	avl_node_t *n;
+ 	c_avl_node_t *n;
  
 -	assert (value != NULL);
 -
  	n = search (t, key);
  	if (n == NULL)
  		return (-1);