tidying

diff --git a/src/src/arc.c b/src/src/arc.c
index 57a6281ef0bf9ad88885f58dcf92c50f5da2b93d..4b6256e28d3c6b76b043bd8a71030061d8b2aa31 100644 (file)
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -1113,11 +1113,6 @@ h->type = 0;
 h->slen = len;
 h->text = US s;
 
 h->slen = len;
 h->text = US s;
 

-/* This works for either NL or CRLF lines; also nul-termination */
-while (*++s)
-  if (*s == '\n' && s[1] != '\t' && s[1] != ' ') break;
-s++;           /* move past end of line */
-

 return r;
 }
 
 return r;
 }
 

diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index 42466875a393ec29709910a7893697e100fbcbe6..211e32810c207cd961eee33f8dd8583f03e7130a 100644 (file)
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -623,7 +623,6 @@ if (text)
 
 if (ff)
   {
 
 if (ff)
   {

-debug_printf("%s %d: ff\n", __FUNCTION__, __LINE__);

   while (Ufgets(big_buffer, big_buffer_size, ff) != NULL)
     {
     if (file_expand)
   while (Ufgets(big_buffer, big_buffer_size, ff) != NULL)
     {
     if (file_expand)


@@ -647,7 +646,6 @@ limit if we are returning the body. */
 
 if (return_message)
   {
 
 if (return_message)
   {

-debug_printf("%s %d: ret msg\n", __FUNCTION__, __LINE__);

   uschar *rubric = tblock->headers_only
     ? US"------ This is a copy of the message's header lines.\n"
     : tblock->body_only
   uschar *rubric = tblock->headers_only
     ? US"------ This is a copy of the message's header lines.\n"
     : tblock->body_only