X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=00d0e90baa60c6310af989396eb841e95d9b587b;hp=27cbdbd9d394e4bcc6f7954c960995903de4592e;hb=d4321859bb9ce5b43fbd8303394cf98ae7720a38;hpb=723f7ae3f24f7881c9ce87abf933cd5bec4ac0bc diff --git a/muttlib.c b/muttlib.c index 27cbdbd..00d0e90 100644 --- a/muttlib.c +++ b/muttlib.c @@ -176,7 +176,7 @@ void mutt_free_body (BODY ** p) a = a->next; if (b->parameter) - parameter_delete(&b->parameter); + parameter_list_wipe(&b->parameter); if (b->unlink && b->filename) { debug_print (1, ("unlinking %s.\n", b->filename)); unlink (b->filename); @@ -216,7 +216,7 @@ HEADER *mutt_dup_header (HEADER * h) } /* returns true if the header contained in "s" is in list "t" */ -int mutt_matches_ignore (const char *s, LIST * t) +int mutt_matches_ignore (const char *s, string_list_t * t) { for (; t; t = t->next) { if (!ascii_strncasecmp (s, t->data, m_strlen(t->data)) @@ -441,7 +441,7 @@ void mutt_delete_parameter (const char *attribute, PARAMETER ** p) if (ascii_strcasecmp (attribute, q->attribute) == 0) { *p = q->next; q->next = NULL; - parameter_delete(&q); + parameter_list_wipe(&q); return; } } @@ -534,7 +534,7 @@ void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra) /* spam and user headers should never be hashed, and the new envelope may * have better values. Use new versions regardless. */ mutt_buffer_free (&base->spam); - mutt_free_list (&base->userhdrs); + string_list_wipe(&base->userhdrs); MOVE_ELEM(spam); MOVE_ELEM(userhdrs); #undef MOVE_ELEM @@ -1272,7 +1272,7 @@ int mutt_cmp_addr (const address_t * a, const address_t * b) return (1); } -int mutt_cmp_list (const LIST * a, const LIST * b) +int mutt_cmp_list (const string_list_t * a, const string_list_t * b) { while (a && b) { if (m_strcmp(a->data, b->data))