From cfd8ede2b3c7248bd3b78e71ef17bdc9eb819aae Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 21 May 2012 10:13:05 +0200 Subject: Switch to Linux kernel coding style Convert our code base to adhere to Linux kernel coding style using Lindent, with the following exceptions: * Use spaces, instead of tabs, for indentation. * Use 2-character indentations (instead of 8 characters). Rationale: We currently have too much levels of indentation. Using 8-character tabs would make huge code parts unreadable. These need to be cleaned up before we can switch to 8 characters. Signed-off-by: Lukas Fleischer --- src/llist.c | 200 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 86 insertions(+), 114 deletions(-) (limited to 'src/llist.c') diff --git a/src/llist.c b/src/llist.c index c10cde3..847b795 100644 --- a/src/llist.c +++ b/src/llist.c @@ -39,8 +39,7 @@ /* * Initialize a list. */ -void -llist_init (llist_t *l) +void llist_init(llist_t * l) { l->head = NULL; l->tail = NULL; @@ -49,16 +48,14 @@ llist_init (llist_t *l) /* * Free a list, but not the contained data. */ -void -llist_free (llist_t *l) +void llist_free(llist_t * l) { llist_item_t *i, *t; - for (i = l->head; i; i = t) - { - t = i->next; - mem_free (i); - } + for (i = l->head; i; i = t) { + t = i->next; + mem_free(i); + } l->head = NULL; l->tail = NULL; @@ -67,26 +64,22 @@ llist_free (llist_t *l) /* * Free the data contained in a list. */ -void -llist_free_inner (llist_t *l, llist_fn_free_t fn_free) +void llist_free_inner(llist_t * l, llist_fn_free_t fn_free) { llist_item_t *i; - for (i = l->head; i; i = i->next) - { - if (i->data) - { - fn_free(i->data); - i->data = NULL; - } + for (i = l->head; i; i = i->next) { + if (i->data) { + fn_free(i->data); + i->data = NULL; } + } } /* * Get the first item of a list. */ -llist_item_t * -llist_first (llist_t *l) +llist_item_t *llist_first(llist_t * l) { return l->head; } @@ -94,8 +87,7 @@ llist_first (llist_t *l) /* * Get the nth item of a list. */ -llist_item_t * -llist_nth (llist_t *l, int n) +llist_item_t *llist_nth(llist_t * l, int n) { llist_item_t *i; @@ -111,8 +103,7 @@ llist_nth (llist_t *l, int n) /* * Get the successor of a list item. */ -llist_item_t * -llist_next (llist_item_t *i) +llist_item_t *llist_next(llist_item_t * i) { return i ? i->next : NULL; } @@ -121,10 +112,10 @@ llist_next (llist_item_t *i) * Return the successor of a list item if it is matched by some filter * callback. Return NULL otherwise. */ -llist_item_t * -llist_next_filter (llist_item_t *i, long data, llist_fn_match_t fn_match) +llist_item_t *llist_next_filter(llist_item_t * i, long data, + llist_fn_match_t fn_match) { - if (i && i->next && fn_match (i->next->data, data)) + if (i && i->next && fn_match(i->next->data, data)) return i->next; else return NULL; @@ -133,8 +124,7 @@ llist_next_filter (llist_item_t *i, long data, llist_fn_match_t fn_match) /* * Get the actual data of an item. */ -void * -llist_get_data (llist_item_t *i) +void *llist_get_data(llist_item_t * i) { return i ? i->data : NULL; } @@ -142,103 +132,88 @@ llist_get_data (llist_item_t *i) /* * Add an item at the end of a list. */ -void -llist_add (llist_t *l, void *data) +void llist_add(llist_t * l, void *data) { - llist_item_t *o = mem_malloc (sizeof (llist_item_t)); - - if (o) - { - o->data = data; - o->next = NULL; - - if (!l->head) - l->head = l->tail = o; - else - { - l->tail->next = o; - l->tail = o; - } + llist_item_t *o = mem_malloc(sizeof(llist_item_t)); + + if (o) { + o->data = data; + o->next = NULL; + + if (!l->head) + l->head = l->tail = o; + else { + l->tail->next = o; + l->tail = o; } + } } /* * Add an item to a sorted list. */ -void -llist_add_sorted (llist_t *l, void *data, llist_fn_cmp_t fn_cmp) +void llist_add_sorted(llist_t * l, void *data, llist_fn_cmp_t fn_cmp) { - llist_item_t *o = mem_malloc (sizeof (llist_item_t)); + llist_item_t *o = mem_malloc(sizeof(llist_item_t)); llist_item_t *i; - if (o) - { - o->data = data; - o->next = NULL; - - if (!l->head) - l->head = l->tail = o; - else if (fn_cmp(o->data, l->tail->data) >= 0) - { - l->tail->next = o; - l->tail = o; - } - else if (fn_cmp(o->data, l->head->data) < 0) - { - o->next = l->head; - l->head = o; - } - else - { - i = l->head; - while (i->next && fn_cmp(o->data, i->next->data) >= 0) - i = i->next; - o->next = i->next; - i->next = o; - } + if (o) { + o->data = data; + o->next = NULL; + + if (!l->head) + l->head = l->tail = o; + else if (fn_cmp(o->data, l->tail->data) >= 0) { + l->tail->next = o; + l->tail = o; + } else if (fn_cmp(o->data, l->head->data) < 0) { + o->next = l->head; + l->head = o; + } else { + i = l->head; + while (i->next && fn_cmp(o->data, i->next->data) >= 0) + i = i->next; + o->next = i->next; + i->next = o; } + } } /* * Remove an item from a list. */ -void -llist_remove (llist_t *l, llist_item_t *i) +void llist_remove(llist_t * l, llist_item_t * i) { llist_item_t *j = NULL; if (l->head && i == l->head) l->head = i->next; - else - { - for (j = l->head; j && j->next != i; j = j->next) - ; - } - - if (i) - { - if (j) - j->next = i->next; - if (i == l->tail) - l->tail = j; - - mem_free (i); - } + else { + for (j = l->head; j && j->next != i; j = j->next) ; + } + + if (i) { + if (j) + j->next = i->next; + if (i == l->tail) + l->tail = j; + + mem_free(i); + } } /* * Find the first item matched by some filter callback. */ -llist_item_t * -llist_find_first (llist_t *l, long data, llist_fn_match_t fn_match) +llist_item_t *llist_find_first(llist_t * l, long data, + llist_fn_match_t fn_match) { llist_item_t *i; - for (i = l->head; i; i = i->next) - { - if (fn_match (i->data, data)) - return i; - } + for (i = l->head; i; i = i->next) { + if (fn_match(i->data, data)) + return i; + } return NULL; } @@ -246,18 +221,16 @@ llist_find_first (llist_t *l, long data, llist_fn_match_t fn_match) /* * Find the next item matched by some filter callback. */ -llist_item_t * -llist_find_next (llist_item_t *i, long data, llist_fn_match_t fn_match) +llist_item_t *llist_find_next(llist_item_t * i, long data, + llist_fn_match_t fn_match) { - if (i) - { - i = i->next; - for (; i; i = i->next) - { - if (fn_match (i->data, data)) - return i; - } + if (i) { + i = i->next; + for (; i; i = i->next) { + if (fn_match(i->data, data)) + return i; } + } return NULL; } @@ -265,19 +238,18 @@ llist_find_next (llist_item_t *i, long data, llist_fn_match_t fn_match) /* * Find the nth item matched by some filter callback. */ -llist_item_t * -llist_find_nth (llist_t *l, int n, long data, llist_fn_match_t fn_match) +llist_item_t *llist_find_nth(llist_t * l, int n, long data, + llist_fn_match_t fn_match) { llist_item_t *i; if (n < 0) return NULL; - for (i = l->head; i; i = i->next) - { - if (fn_match (i->data, data) && (n-- == 0)) - return i; - } + for (i = l->head; i; i = i->next) { + if (fn_match(i->data, data) && (n-- == 0)) + return i; + } return NULL; } -- cgit v1.2.3-54-g00ecf