diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 1998-06-12 07:06:37 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 1998-06-12 07:06:37 +0000 |
| commit | 130a5b07197819cdc447900f9891988c8f01e9f5 (patch) | |
| tree | d401ea7ba7009207e486ff3bd6f4e283a07103c3 /fetchmail.c | |
| parent | 9a943e1bf3ded13beb5582b48ef99709a4e61179 (diff) | |
| download | fetchmail-130a5b07197819cdc447900f9891988c8f01e9f5.tar.gz fetchmail-130a5b07197819cdc447900f9891988c8f01e9f5.tar.bz2 fetchmail-130a5b07197819cdc447900f9891988c8f01e9f5.zip | |
Ready to ship.
svn path=/trunk/; revision=1935
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fetchmail.c b/fetchmail.c index fda397b3..3e3ecf2a 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -708,13 +708,13 @@ static void optmerge(struct query *h2, struct query *h1, int force) * is nonempty (treat h1 as an override). */ - if (!force) - { - append_str_list(&h2->server.localdomains, &h1->server.localdomains); - append_str_list(&h2->localnames, &h1->localnames); - append_str_list(&h2->mailboxes, &h1->mailboxes); - append_str_list(&h2->smtphunt, &h1->smtphunt); - } +#define LIST_MERGE(fld) if (force ? !!h1->fld : !h2->fld) \ + append_str_list(&h2->fld, &h1->fld) + LIST_MERGE(server.localdomains); + LIST_MERGE(localnames); + LIST_MERGE(mailboxes); + LIST_MERGE(smtphunt); +#undef LIST_MERGE #define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld FLAG_MERGE(server.via); |