@@ -54,7 +54,7 @@ struct Address *mutt_lookup_alias(const char *s)
54
54
return NULL ; /* no such alias */
55
55
}
56
56
57
- static struct Address * expand_aliases_r (struct Address * a , struct STailQHead * expn )
57
+ static struct Address * expand_aliases_r (struct Address * a , struct ListHead * expn )
58
58
{
59
59
struct Address * head = NULL , * last = NULL , * t = NULL , * w = NULL ;
60
60
bool i ;
@@ -69,7 +69,7 @@ static struct Address *expand_aliases_r(struct Address *a, struct STailQHead *ex
69
69
if (t )
70
70
{
71
71
i = false;
72
- struct STailQNode * np = NULL ;
72
+ struct ListNode * np ;
73
73
STAILQ_FOREACH (np , expn , entries )
74
74
{
75
75
if (mutt_strcmp (a -> mailbox , np -> data ) == 0 ) /* alias already found */
@@ -82,7 +82,7 @@ static struct Address *expand_aliases_r(struct Address *a, struct STailQHead *ex
82
82
83
83
if (!i )
84
84
{
85
- mutt_stailq_insert_head (expn , safe_strdup (a -> mailbox ));
85
+ mutt_list_insert_head (expn , safe_strdup (a -> mailbox ));
86
86
w = rfc822_cpy_adr (t , 0 );
87
87
w = expand_aliases_r (w , expn );
88
88
if (head )
@@ -135,11 +135,11 @@ static struct Address *expand_aliases_r(struct Address *a, struct STailQHead *ex
135
135
struct Address * mutt_expand_aliases (struct Address * a )
136
136
{
137
137
struct Address * t = NULL ;
138
- struct STailQHead expn ; /* previously expanded aliases to avoid loops */
138
+ struct ListHead expn ; /* previously expanded aliases to avoid loops */
139
139
140
140
STAILQ_INIT (& expn );
141
141
t = expand_aliases_r (a , & expn );
142
- mutt_stailq_free (& expn );
142
+ mutt_list_free (& expn );
143
143
return (mutt_remove_duplicates (t ));
144
144
}
145
145
0 commit comments