From dc5d51dc10a29a9b81496e3baa04412b326afdf5 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 1 Oct 2016 19:50:24 +0100
Subject: [PATCH] tidying

---
 src/src/functions.h       | 1 -
 src/src/mime.c            | 6 ++----
 src/src/readconf.c        | 2 +-
 src/src/transports/smtp.c | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/src/functions.h b/src/src/functions.h
index b23c1441b..9b46c953d 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -327,7 +327,6 @@ extern int     readconf_readtime(const uschar *, int, BOOL);
 extern void    readconf_rest(void);
 extern uschar *readconf_retry_error(const uschar *, const uschar *, int *, int *);
 extern void    readconf_save_config(const uschar *);
-extern void    read_macro_assignment(uschar *);
 extern void    read_message_body(BOOL);
 extern void    receive_bomb_out(uschar *, uschar *);
 extern BOOL    receive_check_fs(int);
diff --git a/src/src/mime.c b/src/src/mime.c
index 17643eda3..5ed15b081 100644
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -233,11 +233,9 @@ long f_pos = 0;
 ssize_t size_counter = 0;
 ssize_t (*decode_function)(FILE*, FILE*, uschar*);
 
-if (mime_stream == NULL)
+if (!mime_stream || (f_pos = ftell(mime_stream)) < 0)
   return FAIL;
 
-f_pos = ftell(mime_stream);
-
 /* build default decode path (will exist since MBOX must be spooled up) */
 (void)string_format(decode_path,1024,"%s/scan/%s",spool_directory,message_id);
 
@@ -247,7 +245,7 @@ if ((option = string_nextinlist(&list, &sep,
 				sizeof(option_buffer))) != NULL)
   {
   /* parse 1st option */
-  if ( (Ustrcmp(option,"false") == 0) || (Ustrcmp(option,"0") == 0) )
+  if ((Ustrcmp(option,"false") == 0) || (Ustrcmp(option,"0") == 0))
     /* explicitly no decoding */
     return FAIL;
 
diff --git a/src/src/readconf.c b/src/src/readconf.c
index a452a46d5..5c0c22f53 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -604,7 +604,7 @@ Arguments:
 Returns:       nothing
 */
 
-void
+static void
 read_macro_assignment(uschar *s)
 {
 uschar name[64];
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index f506a75d6..af2d40fa0 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1574,9 +1574,6 @@ lflags.send_quit = TRUE;
 lflags.setting_up = TRUE;
 lflags.esmtp = TRUE;
 lflags.esmtp_sent = FALSE;
-#ifndef DISABLE_PRDR
-lflags.prdr_active;
-#endif
 #ifdef SUPPORT_I18N
 lflags.utf8_needed = FALSE;
 #endif
-- 
2.30.2