From e0e7a74bde52a1aa02d1da758128722598fb6dd8 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 25 Aug 2019 18:52:53 +0200
Subject: Align with legacy_6x.

* Normalize include order.
* Backport missed bug fixes.
* Remove dead code.
---
 fetchmail.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 80993ccb..5e570154 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -964,7 +964,7 @@ static void optmerge(struct query *h2, struct query *h1, int force)
     list_merge(&h2->domainlist, &h1->domainlist, force);
     list_merge(&h2->antispam, &h1->antispam, force);
 
-#define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld
+#define FLAG_MERGE(fld) do { if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld; } while (0)
     FLAG_MERGE(server.via);
     FLAG_MERGE(server.protocol);
     FLAG_MERGE(server.service);
@@ -1575,6 +1575,7 @@ static int query_host(struct query *ctl)
     default:
 	report(stderr, GT_("unsupported protocol selected.\n"));
 	st = PS_PROTOCOL;
+	break;
     }
 
     /*
-- 
cgit v1.2.3