Align with legacy_6x.

* Normalize include order.
* Backport missed bug fixes.
* Remove dead code.

1 files changed, 1 insertions, 19 deletions

diff --git a/transact.c b/transact.c
index f73dd0da..c3d8a35d 100644
--- a/transact.c
+++ b/transact.c
@@ -6,6 +6,7 @@
  */
 
 #include  "config.h"
+#include "fetchmail.h"
 #include  <stdio.h>
 #include  <string.h>
 #include  <ctype.h>
@@ -35,7 +36,6 @@
 
 #include "i18n.h"
 #include "socket.h"
-#include "fetchmail.h"
 
 /** Macro to clamp the argument so it is >= INT_MIN. */
 #define _FIX_INT_MIN(x) ((x) < INT_MIN ? INT_MIN : (x))
@@ -888,24 +888,6 @@ eoh:
 	else if (!strncasecmp("Resent-Sender:", line, 14) && (strchr(line, '@') || strchr(line, '!')))
 	    resent_sender_offs = (line - msgblk.headers);
 
-#ifdef __UNUSED__
- 	else if (!strncasecmp("Message-Id:", line, 11))
-	{
-	    if (ctl->server.uidl)
- 	    {
-	        char id[IDLEN+1];
-
-		line[IDLEN+12] = 0;		/* prevent stack overflow */
- 		sscanf(line+12, "%s", id);
- 	        if (!str_find( &ctl->newsaved, num))
-		{
- 		    struct idlist *newl = save_str(&ctl->newsaved,id,UID_SEEN);
-		    newl->val.status.num = num;
-		}
- 	    }
- 	}
-#endif /* __UNUSED__ */
-
 	/* if multidrop is on, gather addressee headers */
 	if (MULTIDROP(ctl))
 	{