X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Flist.c;fp=lib-lib%2Flist.c;h=39ad786012bc727fc0470ccc0f1c4a1e6b5b46ad;hp=74c60c7ca1447353bc0e3d9ace3d780d4dcc7e34;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=0f6739c5be4203bec0fa32962e6ab13349da703b diff --git a/lib-lib/list.c b/lib-lib/list.c index 74c60c7..39ad786 100644 --- a/lib-lib/list.c +++ b/lib-lib/list.c @@ -29,33 +29,29 @@ #include "str.h" #include "list.h" -LIST *mutt_copy_list(LIST *p) { - LIST *t, *r = NULL, *l = NULL; +string_list_t *string_list_dup(const string_list_t *p) { + string_list_t *res = NULL; + string_list_t **last = &res; for (; p; p = p->next) { - t = p_new(LIST, 1); - t->data = m_strdup(p->data); - t->next = NULL; - if (l) { - r->next = t; - r = r->next; - } else { - l = r = t; - } + *last = string_item_new(); + (*last)->data = m_strdup(p->data); + last = &(*last)->next; } - return l; + + return res; } -LIST *mutt_add_list_n(LIST *head, const void *data, size_t len) { - LIST *tmp; +string_list_t *mutt_add_list_n(string_list_t *head, const void *data, size_t len) { + string_list_t *tmp; for (tmp = head; tmp && tmp->next; tmp = tmp->next); if (tmp) { - tmp->next = p_new(LIST, 1); + tmp->next = p_new(string_list_t, 1); tmp = tmp->next; } else { - head = tmp = p_new(LIST, 1); + head = tmp = p_new(string_list_t, 1); } tmp->data = p_dup((const char *)data, len); @@ -63,15 +59,3 @@ LIST *mutt_add_list_n(LIST *head, const void *data, size_t len) { return head; } -void mutt_free_list(LIST **list) { - LIST *p; - - if (list) { - while (*list) { - p = *list; - *list = (*list)->next; - p_delete(&p->data); - p_delete(&p); - } - } -}