Skip to content

Commit 1b98b31

Browse files
gahrflatcap
authored andcommittedAug 5, 2017
Restore naming sanity: s/STailQ/List/g
Issue neomutt#374
1 parent 18d9e0e commit 1b98b31

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+262
-260
lines changed
 

‎alias.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct Address *mutt_lookup_alias(const char *s)
5454
return NULL; /* no such alias */
5555
}
5656

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)
5858
{
5959
struct Address *head = NULL, *last = NULL, *t = NULL, *w = NULL;
6060
bool i;
@@ -69,7 +69,7 @@ static struct Address *expand_aliases_r(struct Address *a, struct STailQHead *ex
6969
if (t)
7070
{
7171
i = false;
72-
struct STailQNode *np = NULL;
72+
struct ListNode *np;
7373
STAILQ_FOREACH(np, expn, entries)
7474
{
7575
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
8282

8383
if (!i)
8484
{
85-
mutt_stailq_insert_head(expn, safe_strdup(a->mailbox));
85+
mutt_list_insert_head(expn, safe_strdup(a->mailbox));
8686
w = rfc822_cpy_adr(t, 0);
8787
w = expand_aliases_r(w, expn);
8888
if (head)
@@ -135,11 +135,11 @@ static struct Address *expand_aliases_r(struct Address *a, struct STailQHead *ex
135135
struct Address *mutt_expand_aliases(struct Address *a)
136136
{
137137
struct Address *t = NULL;
138-
struct STailQHead expn; /* previously expanded aliases to avoid loops */
138+
struct ListHead expn; /* previously expanded aliases to avoid loops */
139139

140140
STAILQ_INIT(&expn);
141141
t = expand_aliases_r(a, &expn);
142-
mutt_stailq_free(&expn);
142+
mutt_list_free(&expn);
143143
return (mutt_remove_duplicates(t));
144144
}
145145

‎attach.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void mutt_check_lookup_list(struct Body *b, char *type, int len)
309309
{
310310
int i;
311311

312-
struct STailQNode *np;
312+
struct ListNode *np;
313313
STAILQ_FOREACH(np, &MimeLookupList, entries)
314314
{
315315
i = mutt_strlen(np->data) - 1;

0 commit comments

Comments
 (0)
Please sign in to comment.