Fiddling with llist to make memory management easier. Specifically, the
option to delete the contents of the list when we delete the list is a good thing.
This commit is contained in:
@@ -101,7 +101,7 @@ $(LIBBB_MOBJ5):$(LIBBB_MSRC5)
|
||||
$(compile.c) -DL_$(notdir $*)
|
||||
|
||||
LIBBB_MSRC6:=$(srcdir)/llist.c
|
||||
LIBBB_MOBJ6:=llist_add_to.o llist_add_to_end.o llist_free_one.o llist_free.o
|
||||
LIBBB_MOBJ6:=llist_add_to.o llist_add_to_end.o llist_pop.o llist_free.o
|
||||
LIBBB_MOBJ6:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ6))
|
||||
$(LIBBB_MOBJ6):$(LIBBB_MSRC6)
|
||||
$(compile.c) -DL_$(notdir $*)
|
||||
|
@@ -47,21 +47,32 @@ llist_t *llist_add_to_end(llist_t *list_head, char *data)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef L_llist_free_one
|
||||
/* Free the current list element and advance to the next entry in the list.
|
||||
* Returns a pointer to the next element. */
|
||||
llist_t *llist_free_one(llist_t *elm)
|
||||
#ifdef L_llist_pop
|
||||
/* Remove first element from the list and return it */
|
||||
void *llist_pop(llist_t **head)
|
||||
{
|
||||
llist_t *next = elm ? elm->link : NULL;
|
||||
free(elm);
|
||||
return next;
|
||||
void *data;
|
||||
|
||||
if(!*head) data = *head;
|
||||
else {
|
||||
void *next = (*head)->link;
|
||||
data = (*head)->data;
|
||||
*head = (*head)->link;
|
||||
free(next);
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef L_llist_free
|
||||
/* Recursively free all elements in the linked list. */
|
||||
void llist_free(llist_t *elm)
|
||||
/* Recursively free all elements in the linked list. If freeit != NULL
|
||||
* call it on each datum in the list */
|
||||
void llist_free(llist_t *elm, void (*freeit)(void *data))
|
||||
{
|
||||
while ((elm = llist_free_one(elm)));
|
||||
while (elm) {
|
||||
void *data = llist_pop(&elm);
|
||||
if (freeit) freeit(data);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user