projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: fix logically inverted FEATURE_EXTRA_QUIET check
[oweals/busybox.git]
/
libbb
/
llist.c
diff --git
a/libbb/llist.c
b/libbb/llist.c
index 63c77fa9ea422994291f711cfcec9eff6c0636b3..51b1ce6c99c979dc9741818fffd64ab341f4598d 100644
(file)
--- a/
libbb/llist.c
+++ b/
libbb/llist.c
@@
-4,17
+4,16
@@
*
* Copyright (C) 2003 Glenn McGrath
* Copyright (C) 2005 Vladimir Oleynik
*
* Copyright (C) 2003 Glenn McGrath
* Copyright (C) 2005 Vladimir Oleynik
- * Copyright (C) 2005 Bernhard Fischer
+ * Copyright (C) 2005 Bernhard
Reutner-
Fischer
* Copyright (C) 2006 Rob Landley <rob@landley.net>
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
* Copyright (C) 2006 Rob Landley <rob@landley.net>
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include <stdlib.h>
#include "libbb.h"
/* Add data to the start of the linked list. */
#include "libbb.h"
/* Add data to the start of the linked list. */
-void
llist_add_to(llist_t **
old_head, void *data)
+void
FAST_FUNC llist_add_to(llist_t **
old_head, void *data)
{
llist_t *new_head = xmalloc(sizeof(llist_t));
{
llist_t *new_head = xmalloc(sizeof(llist_t));
@@
-24,45
+23,46
@@
void llist_add_to(llist_t ** old_head, void *data)
}
/* Add data to the end of the linked list. */
}
/* Add data to the end of the linked list. */
-void
llist_add_to_end(llist_t **
list_head, void *data)
+void
FAST_FUNC llist_add_to_end(llist_t **
list_head, void *data)
{
{
- llist_t *new_item = xmalloc(sizeof(llist_t));
-
- new_item->data = data;
- new_item->link = NULL;
-
- if (!*list_head)
- *list_head = new_item;
- else {
- llist_t *tail = *list_head;
-
- while (tail->link)
- tail = tail->link;
- tail->link = new_item;
- }
+ while (*list_head)
+ list_head = &(*list_head)->link;
+ *list_head = xzalloc(sizeof(llist_t));
+ (*list_head)->data = data;
+ /*(*list_head)->link = NULL;*/
}
/* Remove first element from the list and return it */
}
/* Remove first element from the list and return it */
-void
*llist_pop(llist_t **
head)
+void
* FAST_FUNC llist_pop(llist_t **
head)
{
{
- void *data;
+ void *data = NULL;
+ llist_t *temp = *head;
- if (!*head)
- data = *head;
- else {
- void *next = (*head)->link;
-
- data = (*head)->data;
- free(*head);
- *head = next;
+ if (temp) {
+ data = temp->data;
+ *head = temp->link;
+ free(temp);
}
}
-
return data;
}
return data;
}
+/* Unlink arbitrary given element from the list */
+void FAST_FUNC llist_unlink(llist_t **head, llist_t *elm)
+{
+ if (!elm)
+ return;
+ while (*head) {
+ if (*head == elm) {
+ *head = (*head)->link;
+ break;
+ }
+ head = &(*head)->link;
+ }
+}
+
/* Recursively free all elements in the linked list. If freeit != NULL
* call it on each datum in the list */
/* 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))
+void
FAST_FUNC llist_free(llist_t *
elm, void (*freeit) (void *data))
{
while (elm) {
void *data = llist_pop(&elm);
{
while (elm) {
void *data = llist_pop(&elm);
@@
-72,18
+72,27
@@
void llist_free(llist_t * elm, void (*freeit) (void *data))
}
}
}
}
-/* Reverse list order. Useful since getopt32 saves option params
- * in reverse order */
-llist_t *rev_llist(llist_t * list)
+/* Reverse list order. */
+llist_t* FAST_FUNC llist_rev(llist_t *list)
{
{
- llist_t *
new
= NULL;
+ llist_t *
rev
= NULL;
while (list) {
llist_t *next = list->link;
while (list) {
llist_t *next = list->link;
- list->link =
new
;
-
new
= list;
+ list->link =
rev
;
+
rev
= list;
list = next;
}
list = next;
}
- return new;
+ return rev;
+}
+
+llist_t* FAST_FUNC llist_find_str(llist_t *list, const char *str)
+{
+ while (list) {
+ if (strcmp(list->data, str) == 0)
+ break;
+ list = list->link;
+ }
+ return list;
}
}