emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change llist_add_* to take the address of the list rather than returning the new

Browse Source 
head, and change all the callers.
This commit is contained in:
Rob Landley
2006-05-26 23:44:51 +00:00
parent 5edc10275e
commit 8bb50782a5
16 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libbb/getopt_ulflags.c
View File

@@ -474,8 +474,7 @@ loop_arg_is_opt:
if(on_off->counter)
(*(on_off->counter))++;
if(on_off->list_flg) {
*(llist_t **)(on_off->optarg) =
llist_add_to(*(llist_t **)(on_off->optarg), optarg);
llist_add_to((llist_t **)(on_off->optarg), optarg);
} else if (on_off->optarg) {
*(char **)(on_off->optarg) = optarg;
}

28
libbb/llist.c
View File

@@ -14,37 +14,29 @@
#ifdef L_llist_add_to
/* Add data to the start of the linked list. */
llist_t *llist_add_to(llist_t *old_head, void *data)
void llist_add_to(llist_t **old_head, void *data)
{
llist_t *new_head;
new_head = xmalloc(sizeof(llist_t));
llist_t *new_head = xmalloc(sizeof(llist_t));
new_head->data = data;
new_head->link = old_head;
return (new_head);
new_head->link = *old_head;
*old_head = new_head;
}
#endif
#ifdef L_llist_add_to_end
/* Add data to the end of the linked list. */
llist_t *llist_add_to_end(llist_t *list_head, void *data)
void llist_add_to_end(llist_t **list_head, void *data)
{
llist_t *new_item;
new_item = xmalloc(sizeof(llist_t));
llist_t *new_item = xmalloc(sizeof(llist_t));
new_item->data = data;
new_item->link = NULL;
if (list_head == NULL) {
list_head = new_item;
} else {
llist_t *tail = list_head;
while (tail->link)
tail = tail->link;
if (!*list_head) *list_head = new_item;
else {
llist_t *tail = *list_head;
while (tail->link) tail = tail->link;
tail->link = new_item;
}
return list_head;
}
#endif