X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Futils_llist.c;h=61c6051b0a2bde817c0ebd31889e1a26b200d462;hp=4265286bdaf899dcb2bba34e97a712876d5455b0;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hpb=49ac868d2346c77335272b8a643bca295db9feaa

diff --git a/src/daemon/utils_llist.c b/src/daemon/utils_llist.c
index 4265286b..61c6051b 100644
--- a/src/daemon/utils_llist.c
+++ b/src/daemon/utils_llist.c
@@ -24,8 +24,6 @@
  *   Florian Forster <octo at collectd.org>
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 
@@ -34,160 +32,138 @@
 /*
  * Private data types
  */
-struct llist_s
-{
-	llentry_t *head;
-	llentry_t *tail;
-	int size;
+struct llist_s {
+  llentry_t *head;
+  llentry_t *tail;
+  int size;
 };
 
 /*
  * Public functions
  */
-llist_t *llist_create (void)
-{
-	llist_t *ret;
-
-	ret = (llist_t *) malloc (sizeof (llist_t));
-	if (ret == NULL)
-		return (NULL);
+llist_t *llist_create(void) {
+  llist_t *ret;
 
-	memset (ret, '\0', sizeof (llist_t));
+  ret = calloc(1, sizeof(*ret));
+  if (ret == NULL)
+    return NULL;
 
-	return (ret);
+  return ret;
 }
 
-void llist_destroy (llist_t *l)
-{
-	llentry_t *e_this;
-	llentry_t *e_next;
+void llist_destroy(llist_t *l) {
+  llentry_t *e_this;
+  llentry_t *e_next;
 
-	if (l == NULL)
-		return;
+  if (l == NULL)
+    return;
 
-	for (e_this = l->head; e_this != NULL; e_this = e_next)
-	{
-		e_next = e_this->next;
-		llentry_destroy (e_this);
-	}
+  for (e_this = l->head; e_this != NULL; e_this = e_next) {
+    e_next = e_this->next;
+    llentry_destroy(e_this);
+  }
 
-	free (l);
+  free(l);
 }
 
-llentry_t *llentry_create (char *key, void *value)
-{
-	llentry_t *e;
+llentry_t *llentry_create(char *key, void *value) {
+  llentry_t *e;
 
-	e = (llentry_t *) malloc (sizeof (llentry_t));
-	if (e)
-	{
-		e->key   = key;
-		e->value = value;
-		e->next  = NULL;
-	}
+  e = malloc(sizeof(*e));
+  if (e) {
+    e->key = key;
+    e->value = value;
+    e->next = NULL;
+  }
 
-	return (e);
+  return e;
 }
 
-void llentry_destroy (llentry_t *e)
-{
-	free (e);
-}
+void llentry_destroy(llentry_t *e) { free(e); }
 
-void llist_append (llist_t *l, llentry_t *e)
-{
-	e->next = NULL;
+void llist_append(llist_t *l, llentry_t *e) {
+  e->next = NULL;
 
-	if (l->tail == NULL)
-		l->head = e;
-	else
-		l->tail->next = e;
+  if (l->tail == NULL)
+    l->head = e;
+  else
+    l->tail->next = e;
 
-	l->tail = e;
+  l->tail = e;
 
-	++(l->size);
+  ++(l->size);
 }
 
-void llist_prepend (llist_t *l, llentry_t *e)
-{
-	e->next = l->head;
-	l->head = e;
+void llist_prepend(llist_t *l, llentry_t *e) {
+  e->next = l->head;
+  l->head = e;
 
-	if (l->tail == NULL)
-		l->tail = e;
+  if (l->tail == NULL)
+    l->tail = e;
 
-	++(l->size);
+  ++(l->size);
 }
 
-void llist_remove (llist_t *l, llentry_t *e)
-{
-	llentry_t *prev;
+void llist_remove(llist_t *l, llentry_t *e) {
+  llentry_t *prev;
 
-	if ((l == NULL) || (e == NULL))
-		return;
+  if ((l == NULL) || (e == NULL))
+    return;
 
-	prev = l->head;
-	while ((prev != NULL) && (prev->next != e))
-		prev = prev->next;
+  prev = l->head;
+  while ((prev != NULL) && (prev->next != e))
+    prev = prev->next;
 
-	if (prev != NULL)
-		prev->next = e->next;
-	if (l->head == e)
-		l->head = e->next;
-	if (l->tail == e)
-		l->tail = prev;
+  if (prev != NULL)
+    prev->next = e->next;
+  if (l->head == e)
+    l->head = e->next;
+  if (l->tail == e)
+    l->tail = prev;
 
-	--(l->size);
+  --(l->size);
 }
 
-int llist_size (llist_t *l)
-{
-	return (l ? l->size : 0);
-}
+int llist_size(llist_t *l) { return l ? l->size : 0; }
 
-static int llist_strcmp (llentry_t *e, void *ud)
-{
-	if ((e == NULL) || (ud == NULL))
-		return (-1);
-	return (strcmp (e->key, (const char *)ud));
+static int llist_strcmp(llentry_t *e, void *ud) {
+  if ((e == NULL) || (ud == NULL))
+    return -1;
+  return strcmp(e->key, (const char *)ud);
 }
 
-llentry_t *llist_search (llist_t *l, const char *key)
-{
-	return (llist_search_custom (l, llist_strcmp, (void *)key));
+llentry_t *llist_search(llist_t *l, const char *key) {
+  return llist_search_custom(l, llist_strcmp, (void *)key);
 }
 
-llentry_t *llist_search_custom (llist_t *l,
-		int (*compare) (llentry_t *, void *), void *user_data)
-{
-	llentry_t *e;
+llentry_t *llist_search_custom(llist_t *l, int (*compare)(llentry_t *, void *),
+                               void *user_data) {
+  llentry_t *e;
 
-	if (l == NULL)
-		return (NULL);
+  if (l == NULL)
+    return NULL;
 
-	e = l->head;
-	while (e != NULL) {
-		llentry_t *next = e->next;
+  e = l->head;
+  while (e != NULL) {
+    llentry_t *next = e->next;
 
-		if (compare (e, user_data) == 0)
-			break;
+    if (compare(e, user_data) == 0)
+      break;
 
-		e = next;
-	}
+    e = next;
+  }
 
-	return (e);
+  return e;
 }
 
-llentry_t *llist_head (llist_t *l)
-{
-	if (l == NULL)
-		return (NULL);
-	return (l->head);
+llentry_t *llist_head(llist_t *l) {
+  if (l == NULL)
+    return NULL;
+  return l->head;
 }
 
-llentry_t *llist_tail (llist_t *l)
-{
-	if (l == NULL)
-		return (NULL);
-	return (l->tail);
+llentry_t *llist_tail(llist_t *l) {
+  if (l == NULL)
+    return NULL;
+  return l->tail;
 }